Merge pull request #151 from NavAbility/23Q2/fix/getfactorb64

getFactor when .data is b64 or not

Author: dehann

src/navability/entities/factor/factor.py

@@ -5,7 +5,7 @@
 import json
 import base64
 
-from marshmallow import EXCLUDE, Schema, fields, post_load
+from marshmallow import EXCLUDE, Schema, fields, post_load, pre_load
 
 from navability.common.timestamps import TS_FORMAT
 from navability.common.versions import payload_version
@@ -21,7 +21,7 @@ class FactorSkeleton:
     def __repr__(self):
         return (
             f"<FactorSkeleton(label={self.label},"
-            f"variableOrderSymbols={self.variableOrderSymbols},tags={self.tags})>"
+            f"variableOrderSymbols={self._variableOrderSymbols},tags={self.tags})>"
         )
 
     def dump(self):
@@ -63,7 +63,7 @@ class FactorSummary:
     def __repr__(self):
         return (
             f"<FactorSkeleton(label={self.label},"
-            f"variableOrderSymbols={self.variableOrderSymbols},tags={self.tags})>"
+            f"variableOrderSymbols={self._variableOrderSymbols},tags={self.tags})>"
         )
 
     def dump(self):
@@ -160,7 +160,7 @@ def marshal(self, data, **kwargs):
 class Factor:
     label: str
     fnctype: str
-    variableOrderSymbols: List[str]
+    _variableOrderSymbols: List[str]
     data: str
     metadata: str = "e30="
     tags: List[str] = field(default_factory=lambda: ["FACTOR"])
@@ -174,7 +174,7 @@ def __repr__(self):
         return (
             f"<{self.__class__.__name__}"
             f"(label={self.label},"
-            f"variables={self.variableOrderSymbols})>"
+            f"variables={self._variableOrderSymbols})>"
         )
 
     def dump(self):
@@ -193,7 +193,7 @@ class FactorSchema(Schema):
     id = fields.UUID(required=True)
     label = fields.Str(required=True)
     _version = fields.Str(required=True)
-    variableOrderSymbols = fields.List(
+    _variableOrderSymbols = fields.List(
         fields.Str, data_key="_variableOrderSymbols", required=True
     )
     data = fields.Method("get_data", "set_data", required=True)
@@ -204,6 +204,19 @@ class FactorSchema(Schema):
     metadata = fields.Method("get_metadata", "set_metadata")
     solvable = fields.Int(required=True)
 
+    @pre_load
+    def b64_data_duel(self, factor, many=None, partial=None):
+        # print(type(factor['data']), isinstance(factor['data'], dict))
+        # yes, it's a duel here in SDK.py@v0.6.0
+        try:
+            json.loads(factor['data'])
+        except json.JSONDecodeError as err:
+            # discrepancy between DFG@v0.21.1 and SDK.jl@v0.6.0 in 
+            #  assume .data was b64 encoded by one of the other SDKs (expected in future)
+            factor['data'] = base64.b64decode(factor['data'])
+
+        return factor
+
     class Meta:
         ordered = True
         unknown = EXCLUDE  # Note: This is because of _version, remote and fix later.

src/navability/services/factor.py

@@ -40,7 +40,7 @@
 logger = logging.getLogger(__name__)
 
 
-async def getFactorAsync(fgclient: DFGClient, label: str):
+async def getFactorAsync(fgclient: DFGClient, label: str, debug=False):
 
     client = fgclient.client
     context = fgclient.context
@@ -78,11 +78,13 @@ async def getFactorAsync(fgclient: DFGClient, label: str):
         return None
     if len(fs) > 1:
         raise Exception(f"More than one factor named {label} returned")
+    if debug:
+        return fs[0]
     return Factor.load(fs[0])
 
 
-def getFactor(fgclient: DFGClient, label: str):
-    tsk = getFactorAsync(fgclient, label)
+def getFactor(fgclient: DFGClient, label: str, debug=False):
+    tsk = getFactorAsync(fgclient, label, debug=debug)
     return asyncio.run(tsk)
 
 
@@ -166,7 +168,7 @@ async def _addFactorAsync(
                     }
                 }
             }
-            for vlink in f.variableOrderSymbols
+            for vlink in f._variableOrderSymbols
         ]
     }
 
@@ -177,7 +179,7 @@ async def _addFactorAsync(
         'tags': f.tags,
         'solvable': f.solvable,
         'data': FactorSchema().get_data(f),
-        '_variableOrderSymbols': f.variableOrderSymbols,
+        '_variableOrderSymbols': f._variableOrderSymbols,
         'timestamp': FactorSchema().get_timestamp(f),
         '_type': f.fnctype,
         '_version': f._version,