wip

Author: mamiksik

pyodata/model/build_functions.py

@@ -4,7 +4,7 @@
 import copy
 import logging
 
-import pyodata.config as pyodata
+import pyodata.config as conf
 import pyodata.policies as policies
 import pyodata.exceptions as exceptions
 import pyodata.model.elements as elements
@@ -18,7 +18,7 @@ def modlog():
     return logging.getLogger("callbacks")
 
 
-def build_struct_type_property(config: pyodata.Config, entity_type_property_node):
+def build_struct_type_property(config: conf.Config, entity_type_property_node):
     return elements.StructTypeProperty(
         entity_type_property_node.get('Name'),
         elements.Types.parse_type_name(entity_type_property_node.get('Type')),
@@ -42,7 +42,7 @@ def build_struct_type_property(config: pyodata.Config, entity_type_property_node
 
 
 # pylint: disable=protected-access
-def build_struct_type(config: pyodata.Config, type_node, typ, schema=None):
+def build_struct_type(config: conf.Config, type_node, typ, schema=None):
     name = type_node.get('Name')
     base_type = type_node.get('BaseType')
 
@@ -80,7 +80,7 @@ def build_struct_type(config: pyodata.Config, type_node, typ, schema=None):
     return stype
 
 
-def build_complex_type(config: pyodata.Config, type_node, schema=None):
+def build_complex_type(config: conf.Config, type_node, schema=None):
     try:
         return elements.build_element(elements.StructType, config, type_node=type_node, typ=elements.ComplexType,
                                       schema=schema)
@@ -90,7 +90,7 @@ def build_complex_type(config: pyodata.Config, type_node, schema=None):
 
 
 # pylint: disable=protected-access
-def build_entity_type(config: pyodata.Config, type_node, schema=None):
+def build_entity_type(config: conf.Config, type_node, schema=None):
     try:
         etype = elements.build_element(elements.StructType, config, type_node=type_node, typ=elements.EntityType,
                                        schema=schema)
@@ -113,7 +113,7 @@ def build_entity_type(config: pyodata.Config, type_node, schema=None):
 
 
 # pylint: disable=protected-access, too-many-locals
-def build_enum_type(config: pyodata.Config, type_node, namespace):
+def build_enum_type(config: conf.Config, type_node, namespace):
     try:
         ename = type_node.get('Name')
         is_flags = type_node.get('IsFlags')
@@ -263,7 +263,7 @@ def build_value_helper_parameter(config, value_help_parameter_node):
 
 
 # pylint: disable=too-many-locals
-def build_function_import(config: pyodata.Config, function_import_node):
+def build_function_import(config: conf.Config, function_import_node):
     name = function_import_node.get('Name')
     entity_set = function_import_node.get('EntitySet')
     http_method = elements.metadata_attribute_get(function_import_node, 'HttpMethod')

pyodata/model/builder.py

@@ -3,7 +3,7 @@
 import io
 from lxml import etree
 
-import pyodata.config as pyodata
+import pyodata.config as conf
 import pyodata.exceptions as exceptions
 import pyodata.model.elements as elements
 import pyodata.v2 as odata_v2
@@ -44,12 +44,12 @@ def __init__(self, xml, config=None):
         self._xml = xml
 
         if config is None:
-            config = pyodata.Config(odata_v2.ODataV2)
+            config = conf.Config(odata_v2.ODataV2)
         self._config = config
 
     # pylint: disable=missing-docstring
     @property
-    def config(self) -> pyodata.Config:
+    def config(self) -> conf.Config:
         return self._config
 
     def build(self):
@@ -103,7 +103,7 @@ def build(self):
         return elements.build_element(elements.Schema, self._config, schema_nodes=edm_schemas)
 
     @staticmethod
-    def get_aliases(edmx, config: pyodata.Config):
+    def get_aliases(edmx, config: conf.Config):
         """Get all aliases"""
 
         # aliases = collections.defaultdict(set)
@@ -121,7 +121,7 @@ def get_aliases(edmx, config: pyodata.Config):
         return aliases
 
     @staticmethod
-    def update_alias(aliases, config: pyodata.Config):
+    def update_alias(aliases, config: conf.Config):
         """Update config with aliases"""
         config.aliases = aliases
         helper_direction_keys = list(config.sap_value_helper_directions.keys())
@@ -139,7 +139,7 @@ def schema_from_xml(metadata_xml, namespaces=None):
 
     meta = MetadataBuilder(
         metadata_xml,
-        config=pyodata.Config(
+        config=conf.Config(
             odata_v2.ODataV2,
             xml_namespaces=namespaces,
         ))

pyodata/model/elements.py

@@ -9,7 +9,7 @@
 from typing import Union
 
 
-import pyodata.config as pyodata
+import pyodata.config as conf
 import pyodata.policies as policies
 import pyodata.exceptions as exceptions
 import pyodata.model.type_traits as base_traits
@@ -23,7 +23,7 @@ def modlog():
     return logging.getLogger("Elements")
 
 
-def build_element(element_name: Union[str, type], config: pyodata.Config, **kwargs):
+def build_element(element_name: Union[str, type], config: conf.Config, **kwargs):
     """
     This function is responsible for resolving which implementation is to be called for parsing EDM element. It's a
     primitive implementation of dynamic dispatch, thus there exist table where all supported elements are assigned
@@ -52,7 +52,7 @@ def build_element(element_name: Union[str, type], config: pyodata.Config, **kwar
     raise exceptions.PyODataParserError(f'{element_name} is unsupported in {config.odata_version.__name__}')
 
 
-def build_annotation(term: str, config: pyodata.Config, **kwargs):
+def build_annotation(term: str, config: conf.Config, **kwargs):
     """
     Similarly to build_element this function purpoas is to resolve build function for annotations. There are two
     main differences:
@@ -143,7 +143,7 @@ class Types:
     """
 
     @staticmethod
-    def register_type(typ: 'Typ', config: pyodata.Config):
+    def register_type(typ: 'Typ', config: conf.Config):
         """Add new type to the ODATA version type repository as well as its collection variant"""
 
         o_version = config.odata_version
@@ -159,7 +159,7 @@ def register_type(typ: 'Typ', config: pyodata.Config):
             o_version.Types[collection_name] = collection_typ
 
     @staticmethod
-    def from_name(name, config: pyodata.Config) -> 'Typ':
+    def from_name(name, config: conf.Config) -> 'Typ':
         o_version = config.odata_version
 
         # build types hierarchy on first use (lazy creation)
@@ -426,7 +426,7 @@ def __getitem__(self, key):
             except KeyError:
                 raise KeyError('There is no Schema Namespace {}'.format(key))
 
-    def __init__(self, config: pyodata.Config):
+    def __init__(self, config: conf.Config):
         super(Schema, self).__init__()
 
         self._decls = Schema.Declarations()

pyodata/v2/__init__.py

@@ -3,7 +3,7 @@
 import logging
 from typing import List
 
-import pyodata.config as pyodata
+import pyodata.config as conf
 
 import pyodata.model.type_traits as base_traits
 import pyodata.v2.type_traits as v2_traits
@@ -20,7 +20,7 @@ def modlog():
     return logging.getLogger("v2")
 
 
-class ODataV2(pyodata.ODATAVersion):
+class ODataV2(conf.ODATAVersion):
     """ Definition of OData V2 """
 
     @staticmethod

pyodata/v2/build_functions.py

@@ -7,7 +7,7 @@
 import logging
 from typing import List
 
-import pyodata.config as pyodata
+import pyodata.config as conf
 import pyodata.exceptions as exceptions
 import pyodata.policies as policies
 
@@ -23,7 +23,7 @@ def modlog():
 # pylint: disable=protected-access,too-many-locals, too-many-branches,too-many-statements
 # While building schema it is necessary to set few attributes which in the rest of the application should remain
 # constant. As for now, splitting build_schema into sub-functions would not add any benefits.
-def build_schema(config: pyodata.Config, schema_nodes):
+def build_schema(config: conf.Config, schema_nodes):
     schema = v2_elements.Schema(config)
 
     # Parse Schema nodes by parts to get over the problem of not-yet known
@@ -205,12 +205,12 @@ def build_schema(config: pyodata.Config, schema_nodes):
     return schema
 
 
-def build_navigation_type_property(config: pyodata.Config, node):
+def build_navigation_type_property(config: conf.Config, node):
     return v2_elements.NavigationTypeProperty(
         node.get('Name'), node.get('FromRole'), node.get('ToRole'), elements.Identifier.parse(node.get('Relationship')))
 
 
-def build_end_role(config: pyodata.Config, end_role_node):
+def build_end_role(config: conf.Config, end_role_node):
     entity_type_info = elements.Types.parse_type_name(end_role_node.get('Type'))
     multiplicity = end_role_node.get('Multiplicity')
     role = end_role_node.get('Role')
@@ -219,7 +219,7 @@ def build_end_role(config: pyodata.Config, end_role_node):
 
 
 # pylint: disable=protected-access
-def build_association(config: pyodata.Config, association_node):
+def build_association(config: conf.Config, association_node):
     name = association_node.get('Name')
     association = v2_elements.Association(name)
 
@@ -247,14 +247,14 @@ def build_association(config: pyodata.Config, association_node):
     return association
 
 
-def build_association_set_end_role(config: pyodata.Config, end_node):
+def build_association_set_end_role(config: conf.Config, end_node):
     role = end_node.get('Role')
     entity_set = end_node.get('EntitySet')
 
     return v2_elements.AssociationSetEndRole(role, entity_set)
 
 
-def build_association_set(config: pyodata.Config, association_set_node):
+def build_association_set(config: conf.Config, association_set_node):
     end_roles: List[v2_elements.AssociationSetEndRole] = []
     name = association_set_node.get('Name')
     association = elements.Identifier.parse(association_set_node.get('Association'))
@@ -269,7 +269,7 @@ def build_association_set(config: pyodata.Config, association_set_node):
     return v2_elements.AssociationSet(name, association.name, association.namespace, end_roles)
 
 
-def build_referential_constraint(config: pyodata.Config, referential_constraint_node):
+def build_referential_constraint(config: conf.Config, referential_constraint_node):
     principal = referential_constraint_node.xpath('edm:Principal', namespaces=config.namespaces)
     if len(principal) != 1:
         raise RuntimeError('Referential constraint must contain exactly one principal element')

pyodata/v4/__init__.py

@@ -2,7 +2,7 @@
 
 from typing import List
 
-import pyodata.config as pyodata
+import pyodata.config as conf
 
 import pyodata.model.elements as base_elements
 import pyodata.v4.elements as v4_elements
@@ -14,7 +14,7 @@
 import pyodata.v4.build_functions as v4_build_functions
 
 
-class ODataV4(pyodata.ODATAVersion):
+class ODataV4(conf.ODATAVersion):
     """ Definition of OData V4 """
 
     @staticmethod

pyodata/v4/build_functions.py

@@ -6,7 +6,7 @@
 import itertools
 import copy
 
-import pyodata.config as pyodata
+import pyodata.config as conf
 import pyodata.exceptions as exceptions
 import pyodata.policies as policies
 
@@ -17,7 +17,7 @@
 # pylint: disable=protected-access,too-many-locals,too-many-branches,too-many-statements
 # While building schema it is necessary to set few attributes which in the rest of the application should remain
 # constant. As for now, splitting build_schema into sub-functions would not add any benefits.
-def build_schema(config: pyodata.Config, schema_nodes):
+def build_schema(config: conf.Config, schema_nodes):
     schema = elements.Schema(config)
 
     # Parse Schema nodes by parts to get over the problem of not-yet known
@@ -125,7 +125,7 @@ def build_schema(config: pyodata.Config, schema_nodes):
     return schema
 
 
-def build_navigation_type_property(config: pyodata.Config, node):
+def build_navigation_type_property(config: conf.Config, node):
     partner = elements.Types.parse_type_name(node.get('Partner')) if node.get('Partner') else None
     ref_cons = []
 
@@ -141,16 +141,16 @@ def build_navigation_type_property(config: pyodata.Config, node):
         ref_cons)
 
 
-def build_navigation_property_binding(config: pyodata.Config, node, et_info):
+def build_navigation_property_binding(config: conf.Config, node, et_info):
     return v4_elements.NavigationPropertyBinding(v4_elements.to_path_info(node.get('Path'), et_info),
                                                  node.get('Target'))
 
 
-def build_unit_annotation(config: pyodata.Config, target: elements.Typ, annotation_node):
+def build_unit_annotation(config: conf.Config, target: elements.Typ, annotation_node):
     target.annotation = v4_elements.Unit(f'self.{target.name}', annotation_node.get('String'))
 
 
-def build_type_definition(config: pyodata.Config, node):
+def build_type_definition(config: conf.Config, node):
     typ = copy.deepcopy(elements.Types.from_name(node.get('UnderlyingType'), config))
     typ.name = node.get('Name')