fix bugs in pydrepr

Author: Binh Vu

pydrepr/.gitignore

@@ -5,4 +5,5 @@ __pycache__
 .*
 !.gitignore
 drepr.egg-info
-dist
+dist
+download-executed-*.txt

pydrepr/Pipfile

@@ -83,7 +83,7 @@ def dump(cls, drepr: 'DRepr', simplify: bool = True, use_json_path: bool = False
 
         for node in drepr.sm.nodes.values():
             if isinstance(node, DataNode):
-                edge = [e for e in drepr.sm.edges if e.target_id == node.node_id][0]
+                edge = [e for e in drepr.sm.edges.values() if e.target_id == node.node_id][0]
                 sm['data_nodes'][
                     node.
                     attr_id] = f"{class_ids[drepr.sm.nodes[edge.source_id].label][edge.source_id]}--{edge.label}"
@@ -98,7 +98,7 @@ def dump(cls, drepr: 'DRepr', simplify: bool = True, use_json_path: bool = False
                 if node.data_type is not None:
                     sm['literal_nodes'][-1] += f"^^{node.data_type.value}"
 
-        for edge in drepr.sm.edges:
+        for edge in drepr.sm.edges.values():
             if isinstance(drepr.sm.nodes[edge.source_id], ClassNode) and isinstance(
                     drepr.sm.nodes[edge.target_id], ClassNode):
                 sm['relations'].append(

pydrepr/Pipfile.lock

@@ -1,3 +1,3 @@
-__version__ = "2.4"   # ___PKG_VERSION___: DO NOT MODIFY the version here. Update it via version_manager.py!
+__version__ = "2.5"   # ___PKG_VERSION___: DO NOT MODIFY the version here. Update it via version_manager.py!
 __engine_version__ = "1.0.6"   # ___PKG_VERSION___: DO NOT MODIFY the version here. Update it via version_manager.py!
 __engine_release_tag__ = "2.3"   # ___PKG_VERSION___: DO NOT MODIFY the version here. Update it via version_manager.py!

pydrepr/drepr/models/parse_v1/__init__.py

@@ -44,5 +44,6 @@
       python_requires='>3.6',
       license="MIT",
       install_requires=['ujson', 'ruamel.yaml>=0.15.0',
-                        'dataclasses;python_version<"3.7"', 'xmltodict'],
+                        'dataclasses;python_version<"3.7"', 'xmltodict', 'netcdf4',
+                        'pillow'],
       package_data={'': ['*.so', '*.pyd']})

pydrepr/drepr/version.py

@@ -209,32 +209,40 @@ def test_serialize():
             }
         ],
         'sm': {
-            'edges': [
-                {
+            'edges': {
+                0: {
+                    'edge_id': 0,
+                    'is_required': False,
                     'is_subject': False,
                     'label': 'eg:refArea',
                     'source_id': 'qb:Observation:1',
                     'target_id': 'dnode:area'
                 },
-                {
+                1: {
+                    'edge_id': 1,
+                    'is_required': False,
                     'is_subject': False,
                     'label': 'eg:gender',
                     'source_id': 'qb:Observation:1',
                     'target_id': 'dnode:gender'
                 },
-                {
+                2: {
+                    'edge_id': 2,
+                    'is_required': False,
                     'is_subject': False,
                     'label': 'eg:refPeriod',
                     'source_id': 'qb:Observation:1',
                     'target_id': 'dnode:period'
                 },
-                {
+                3: {
+                    'edge_id': 3,
+                    'is_required': False,
                     'is_subject': False,
                     'label': 'smdx-measure:obsValue',
                     'source_id': 'qb:Observation:1',
                     'target_id': 'dnode:obs'
                 }
-            ],
+            },
             'nodes': {
                 'dnode:area': {
                     'type': 'data_node',

pydrepr/setup.py

@@ -4,7 +4,7 @@
 
 # ================================================================================
 # Note: update the version by changing variables before the `=...=` line
-DREPR_PYLIB_VESRION = "2.4"
+DREPR_PYLIB_VESRION = "2.5"
 DREPR_ENGINE_VERSION = "1.0.6"
 # this tag marks the release which contains the pre-built engine in it.
 DREPR_ENGINE_RELEASE_TAG = "2.3"