Update import paths to prepare for async

Use relative imports to prepare for generating additional services

Author: mvantellingen

codegen/generate_services.py

@@ -40,10 +40,11 @@ def get_module_nodes(self):
         for module in modules:
             self.add_import_statement(module, "typing")
 
+            self.add_import_statement(module, ".", "abstract")
+            self.add_import_statement(module, ".", "traits")
             self.add_import_statement(module, "commercetools", "schemas")
             self.add_import_statement(module, "commercetools", "types")
-            self.add_import_statement(module, "commercetools.services", "abstract")
-            self.add_import_statement(module, "commercetools.services", "traits")
+            self.add_import_statement(module, "commercetools.helpers", "RemoveEmptyValuesMixin")
             self.add_import_statement(module, "commercetools.typing", "OptionalListStr")
 
             all_nodes = (
@@ -508,7 +509,7 @@ def make_serialize_query_params(
 
                 bases = [
                     ast.Name(id="marshmallow.Schema"),
-                    ast.Name(id="abstract.RemoveEmptyValuesMixin"),
+                    ast.Name(id="RemoveEmptyValuesMixin"),
                 ]
 
             schema_node = ast.ClassDef(
@@ -577,14 +578,14 @@ def _generate_init_file(self, modules):
             service_name = service.context_name + "Service"
             info = modules[module_name]
 
-            key = "commercetools.services.%s" % info["name"]
+            key = ".%s" % info["name"]
             submodules[key] = {
                 "class_name": service.context_name + "Service",
                 "var_name": snakeit(service.context_name),
             }
 
         # Add manual generated files (TODO)
-        submodules["commercetools.services.project"] = {
+        submodules[".project"] = {
             "class_name": "ProjectService",
             "var_name": "project",
         }
@@ -668,8 +669,8 @@ def _generate_trait_file(self):
                 level=0,
             ),
             ast.ImportFrom(
-                module="commercetools.services",
-                names=[ast.alias(name="abstract", asname=None)],
+                module="commercetools.helpers",
+                names=[ast.alias(name="RemoveEmptyValuesMixin", asname=None)],
                 level=0,
             ),
             ast.ImportFrom(
@@ -696,7 +697,7 @@ def _create_trait_schema(trait: TraitInfo) -> ast.ClassDef:
         name=schema_name,
         bases=[
             ast.Name(id="marshmallow.Schema"),
-            ast.Name(id="abstract.RemoveEmptyValuesMixin"),
+            ast.Name(id="RemoveEmptyValuesMixin"),
         ],
         keywords=[],
         decorator_list=[],

src/commercetools/helpers.py

@@ -1,6 +1,6 @@
 import typing
 
-from marshmallow import class_registry, fields, missing
+from marshmallow import class_registry, fields, missing, post_dump
 from marshmallow.exceptions import StringNotCollectionError, ValidationError
 from marshmallow.fields import Field
 from marshmallow.utils import RAISE, is_collection
@@ -32,6 +32,27 @@ def _serialize(self, nested_obj, attr, obj):
         return result
 
 
+
+class RemoveEmptyValuesMixin:
+    @post_dump
+    def remove_empty_values(self, data, **kwargs):
+        """Remove the key, value pairs for which the value is None.
+
+        This doesn't work if allow_none is set. And in the future we might also
+        want to remove values which are already the default to minimise the
+        params.
+
+        """
+        result = {}
+        for k, v in data.items():
+            if isinstance(v, list):
+                result[k] = [x for x in v if x is not None]
+            elif v is not None:
+                result[k] = v
+        return result
+
+
+
 class RegexField(Field):
     def _serialize(self, nested_obj, attr, obj):
         result = {}

src/commercetools/services/abstract.py

@@ -1,9 +1,5 @@
 import typing
 
-from marshmallow import Schema, fields, post_dump
-
-from commercetools.helpers import OptionalList
-
 if typing.TYPE_CHECKING:
     from commercetools import Client
 
@@ -17,33 +13,3 @@ def _serialize_params(self, params, schema):
         if schema not in self._schemas:
             self._schemas[schema] = schema()
         return self._schemas[schema].dump(params)
-
-
-class RemoveEmptyValuesMixin:
-    @post_dump
-    def remove_empty_values(self, data, **kwargs):
-        """Remove the key, value pairs for which the value is None.
-
-        This doesn't work if allow_none is set. And in the future we might also
-        want to remove values which are already the default to minimise the
-        params.
-
-        """
-        result = {}
-        for k, v in data.items():
-            if v is not None:
-                result[k] = v
-        return result
-
-
-class AbstractDeleteSchema(Schema, RemoveEmptyValuesMixin):
-    version = fields.Integer()
-    expand = OptionalList(fields.String())
-
-
-class AbstractQuerySchema(Schema, RemoveEmptyValuesMixin):
-    where = OptionalList(fields.String())
-    sort = OptionalList(fields.String())
-    expand = OptionalList(fields.String())
-    limit = fields.Int()
-    offset = fields.Int()

src/commercetools/testing/abstract.py

@@ -4,11 +4,13 @@
 import uuid
 
 import marshmallow
+from marshmallow import fields
 from requests_mock.request import _RequestObjectProxy
 
 from commercetools import CommercetoolsError, schemas, types
+from commercetools.helpers import OptionalList
 from commercetools.schemas import BaseResourceSchema
-from commercetools.services import abstract
+from commercetools.services import traits
 from commercetools.testing import utils
 from commercetools.testing.predicates import PredicateFilter
 from commercetools.testing.utils import create_commercetools_response
@@ -164,13 +166,21 @@ def _matcher(self, request, skip_port_check=False):
             return create_commercetools_response(request, status_code=404)
 
 
+class GenericSchema(traits.QuerySchema, traits.SortableSchema, traits.PagingSchema):
+    where = OptionalList(fields.String())
+    sort = OptionalList(fields.String())
+    expand = OptionalList(fields.String())
+    limit = fields.Int()
+    offset = fields.Int()
+
+
 class ServiceBackend(BaseBackend):
     hostnames = ["api.sphere.io", "localhost"]
     model_class: typing.Any = None
     _schema_draft: typing.Optional[marshmallow.Schema] = None
     _schema_update: typing.Optional[marshmallow.Schema] = None
     _schema_query_response: typing.Optional[marshmallow.Schema] = None
-    _schema_query_params: marshmallow.Schema = abstract.AbstractQuerySchema
+    _schema_query_params: marshmallow.Schema = GenericSchema
 
     _verify_version: bool = True