Merge pull request #5 from AM1729/main

fixes geometry defn &comma with ,

Author: AM1729

klab/engine.py

@@ -152,6 +152,7 @@ def post(self, endpoint:str, request: any, pathVariables:list = None):
             jsonResponse = response.json()
             return jsonResponse
 
+    
     def makeUrl(self, endpoint, parameters=[]):
         parms = ""
         if parameters:

klab/geometry.py

@@ -506,7 +506,7 @@ def encodeVal(val: any):
                 ret += sp + str(v)
             ret += "]"
         else:
-            ret = str(val)
+            ret = KlabGeometry.decodeForSerialization(str(val))
 
         return ret
 

klab/observation.py

@@ -165,6 +165,23 @@ def __init__(self, urn: str = None, contextId: str = None, contextSearchId: str
         self._states = {}
         self._objects = {}
 
+    def toDict(self):
+        ret = {
+            "urn": self._urn,
+            "contextId": self._contextId,
+            "estimate": self._estimate,
+            "estimatedCost": self._estimatedCost,
+            "scenarios": list(self._scenarios),  # ensure it's a list
+            "states": list(self._states),
+            "objects": list(self._objects)
+        }
+
+        # Include searchContextId if present
+        if getattr(self, "searchContextId", None):
+            ret["contextSearchId"] = self.searchContextId
+
+        return ret
+
     def toJson(self):
         es = str(self._estimate).lower()
 
@@ -263,17 +280,28 @@ def __init__(self) -> None:
         self._estimate = False
         self._estimatedCost = -1
 
+    def toDict(self):
+        return {
+            "urn": self._urn,
+            "geometry": self._geometry,
+            "contextType": self._contextType,
+            "observables": [str(o) for o in self._observables],
+            "scenarios": [str(s) for s in self._scenarios],
+            "estimate": self._estimate,
+            "estimatedCost": self._estimatedCost
+    }
+        
     def toJson(self):
         es = str(self._estimate).lower()
-
         obs = [str(o) for o in self._observables]
         obs = str(obs).replace("'", "\"")
         scen = [str(s) for s in self._scenarios]
         scen = str(scen).replace("'", "\"")
+        urn = "null" if self._urn is None else self._urn
 
-        ret = """{{"geometry":"{0}","contextType":"{1}","observables":{2},"scenarios":{3},"estimate":{4},"estimatedCost":{5}}}"""
+        ret = """{{"geometry":"{0}","contextType":"{1}","observables":{2},"scenarios":{3},"estimate":{4},"estimatedCost":{5}, "urn": {6}}}"""
         ret = ret.format(self._geometry, self._contextType,
-                         obs, scen, es, self._estimatedCost)
+                         obs, scen, es, self._estimatedCost, urn)
 
         ret = ret.encode('utf-8').decode('unicode-escape')
         return ret

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "klab-client-py"
-version = "0.2.0"
+version = "0.2.1"
 description = "Python client to interact with a running k.LAB Engine."
 authors = [
     {name = "Ferdinando Villa"},