syncmodels 0.1.347__py2.py3-none-any.whl → 0.1.349__py2.py3-none-any.whl

syncmodels/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Asterio Gonzalez"""
 __email__ = "asterio.gonzalez@gmail.com"
-__version__ = "0.1.347"
+__version__ = "0.1.348"

syncmodels/helpers/orion.py

@@ -221,7 +221,7 @@ class OrionInjector:
                         if response.status_code < 300:
                             orion_item = response.json()
                         else:
-                            log.warning(
+                            log.debug(
                                 "It seems that [%s] doesn't exist in Orion (is a new entity for Orion)",
                                 url,
                             )
@@ -460,17 +460,15 @@ class OrionInjector:
             # https://fiware-orion.readthedocs.io/en/2.4.0/user/forbidden_characters/index.html
             # https://telefonicaid.github.io/fiware-orion/archive/api/v2/
             if isinstance(value, str):
-
                 if self.REG_FORBIDDEN_CHARS.search(value):
                     data[key] = self.REG_FORBIDDEN_CHARS.sub("", value)
-                    log.warning(
+                    log.info(
                         "[%s] replacing illegal characters in %s: %s -> %s",
                         data["id"],
                         key,
                         value,
                         data[key],
                     )
-                    foo = 1
                 else:
                     data[key] = value = replace(value)
 

syncmodels/session/sql.py

@@ -96,14 +96,16 @@ class iSQLSession(iSession):
         data = data or await self.get_samples(uri, N, **kw)
         if data:
             struct = self._map_result_structure(data, rows=N)
-
-            names, types, d_fields, monotonic_since_key = self.guess_schema(
-                data[struct["names"]], data[struct["data"]]
-            )
-            schema = StructShema(names, types, d_fields, monotonic_since_key, struct)
-        else:
-            schema = await super()._inspect_schema(uri, data, **kw)
-
+            if struct.get("data"):
+                names, types, d_fields, monotonic_since_key = self.guess_schema(
+                    data[struct["names"]], data[struct["data"]]
+                )
+                schema = StructShema(
+                    names, types, d_fields, monotonic_since_key, struct
+                )
+                return schema
+
+        schema = await super()._inspect_schema(uri, data, **kw)
         return schema
 
     async def update_params(self, url: URI, params: JSON, context: JSON):
@@ -153,19 +155,19 @@ class iSQLSession(iSession):
         # schema = self._schema(self.context)
         struct = schema.struct
 
-        data_key = struct["data"]
-        rows = stream.pop(data_key)
-
-        # map the remaing info into meta
-        for key, value in struct.items():
-            if value in stream:
-                meta[key] = stream[value]
-        cols = meta["names"]
-
         _stream = []
-        for row in rows:
-            item = {cols[i]: value for i, value in enumerate(row)}
-            _stream.append(item)
+        if data_key := struct.get("data"):
+            rows = stream.pop(data_key)
+
+            # map the remaing info into meta
+            for key, value in struct.items():
+                if value in stream:
+                    meta[key] = stream[value]
+            cols = meta["names"]
+
+            for row in rows:
+                item = {cols[i]: value for i, value in enumerate(row)}
+                _stream.append(item)
 
         meta["count"] = len(_stream)
         return _stream, meta

syncmodels/storage.py

@@ -1459,7 +1459,10 @@ class WaveStorage(iWaves, iStorage):
         # so gobal search must loop over all/wanted namespaces
         _uri = parse_duri(tube)
         _uri["path"] = f"/{TUBE_META}"
-        _uri["id"] = _uri.pop("_path")
+        id = _uri.pop("_path")
+        if isinstance(id, str):
+            id = id.replace("/", "_")
+        _uri["id"] = id
         holder = build_uri(**_uri)
 
         # query = f"{holder}?{ORG_KEY}={tube}"

{syncmodels-0.1.347.dist-info → syncmodels-0.1.349.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: syncmodels
-Version: 0.1.347
+Version: 0.1.349
 Summary: Synchronizable Models
 Home-page: https://github.com/asterio.gonzalez/syncmodels
 Author: Asterio Gonzalez
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.6
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: agptools>=0.1.347
+Requires-Dist: agptools>=0.1.349
 Requires-Dist: aiocache
 Requires-Dist: aiohttp
 Requires-Dist: Click

{syncmodels-0.1.347.dist-info → syncmodels-0.1.349.dist-info}/RECORD

@@ -1,4 +1,4 @@
-syncmodels/__init__.py,sha256=gzVDRfhD5jxqSmbFoEkH0JtQiWj1v0xeF8a7zDZx9pc,146
+syncmodels/__init__.py,sha256=zRskcOy0OBfyNpVc1dXZ89VD42tDgHQ5s_KX02h-_OU,146
 syncmodels/context.py,sha256=k1Gs_ip9BfyRFpyRnzqYvRDKo0sYBqJsh6z9sWln9oE,451
 syncmodels/crawler.py,sha256=lx0IU586JD0qcdozWiv0y7970CkUEg3SzFB6gOYDS6I,94540
 syncmodels/crud.py,sha256=oZIcwEKR2i-lesEF_059Y4yThohd9m7gs6R6xYgLH-I,15351
@@ -11,7 +11,7 @@ syncmodels/registry.py,sha256=YaQtgbSwa0je1MpCcVHALI3_b85vrddyOlhsnrUcKZs,8224
 syncmodels/requests.py,sha256=wWoC5hPDm1iBM_zrlyKRauzhXgdKR3pT5RqyC-5UZhQ,538
 syncmodels/runner.py,sha256=Tb5KTu_XFxCphrtfcnmIqTItG91el7P-9B5WaDTMp18,5928
 syncmodels/schema.py,sha256=HMr0LcB40se5sqHF4WYQIdzXUphLa2fhf0KFFUMzpDM,2726
-syncmodels/storage.py,sha256=x01TmpETMrHvQvliL3TXfUp18RKr6Huz6DmrRZWD1DU,76418
+syncmodels/storage.py,sha256=Egc9TynxjqfGHcdOW8bv-uiU6iTymHoIlj8XpD_mk6U,76504
 syncmodels/syncmodels.py,sha256=jcUxVbv1hrx5hI81VCO1onIM6WyORTqJVPwIqlPocOc,10596
 syncmodels/timequeue.py,sha256=YRd3ULRaIhoszaBsYhfr0epMqAbL6-NwVEtScjUYttM,595
 syncmodels/wave.py,sha256=Gra22BLiA9z2nF-6diXpjAc4GZv9nebmyvHxdAfXec4,7764
@@ -32,7 +32,7 @@ syncmodels/helpers/geojson.py,sha256=9VZjdEw19fLS_Q9topapUOPGxRg2D4GOqm2tlx11W7M
 syncmodels/helpers/importers.py,sha256=KImR9pQu4ir6EI6Ipta0q3RWloFT_VTJi67kM0lZsKQ,3919
 syncmodels/helpers/loaders.py,sha256=aus0aRcbU1vVa_zWo42aX6uV3B0fQ0aQpkTWlR9xGLA,4325
 syncmodels/helpers/models.py,sha256=c_ATzmiw5mVY1IGnwmyhjIuu5d2idHU-XeRigZSMkOQ,719
-syncmodels/helpers/orion.py,sha256=6lRp1w3yaq_rxOI7nJIjuHdsgBjQu92y0bW0IX_gq44,30719
+syncmodels/helpers/orion.py,sha256=RY3hEVusUJDuSBN8YBy--RWnZ4TtP0jOUtNuHC1ySjg,30685
 syncmodels/helpers/surreal.py,sha256=-K7d0JjoSwquSLwIW18Ae4GEL3eI0FTmq2fJKUJd9TA,10912
 syncmodels/helpers/units.py,sha256=g50m5DQrAyP_qpDRa4LCEA5Rz2UZUmlIixfWG_ddw9I,3571
 syncmodels/logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -300,13 +300,13 @@ syncmodels/model/schema_org/xpathtype.py,sha256=D8gKiCrGSSuUVYw7BIWmOIUbKATfv2Ip
 syncmodels/session/__init__.py,sha256=89o6oeJsUaaiZENZDYJ2lP2PQBWX6OZPIzQacWjNh2k,15606
 syncmodels/session/http.py,sha256=tf7z0ccAEYoCOZT4Ukv3NBXz9hUO3vs2s9bm491pCj8,1480
 syncmodels/session/postgresql.py,sha256=ZMIu1Rv93pKfvFlovFBmWArzlrT2xaQWNYGZT_LW61k,175
-syncmodels/session/sql.py,sha256=auZ_3RZTSWViED4UrExYaes42Y2bTZKixEsfOpa_zaU,7036
+syncmodels/session/sql.py,sha256=Ia-Yrs_hOhAIZ4IcoVB5i8mQZVCULfnV9-TQz49knZU,7181
 syncmodels/session/sqlite.py,sha256=nCDjopLiBpX1F10qkKoARM7JrVdIpJ1WdGOduFVxaiA,2080
 syncmodels/source/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syncmodels-0.1.347.dist-info/AUTHORS.rst,sha256=3ZPoqg8Aav8DSYKd0fwcwn4_5HwSiMLart0E5Un00-U,168
-syncmodels-0.1.347.dist-info/LICENSE,sha256=uzMOYtIiUsnsD0xHJR7aJWJ4v_bvan0kTnvufy5eNoA,1075
-syncmodels-0.1.347.dist-info/METADATA,sha256=6DDbCRO4MbKxyD95HpFrpPkTwQm_THh6vdJ7HPTWr3E,2700
-syncmodels-0.1.347.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
-syncmodels-0.1.347.dist-info/entry_points.txt,sha256=dMnigjZsHMxTwXiiZyBZdBbMYE0-hY3L5cG15EcDAzw,51
-syncmodels-0.1.347.dist-info/top_level.txt,sha256=2DfQ9NuAhKMjY3BvQGVBA7GfqTm7EoHNbaehSUiqiHQ,11
-syncmodels-0.1.347.dist-info/RECORD,,
+syncmodels-0.1.349.dist-info/AUTHORS.rst,sha256=3ZPoqg8Aav8DSYKd0fwcwn4_5HwSiMLart0E5Un00-U,168
+syncmodels-0.1.349.dist-info/LICENSE,sha256=uzMOYtIiUsnsD0xHJR7aJWJ4v_bvan0kTnvufy5eNoA,1075
+syncmodels-0.1.349.dist-info/METADATA,sha256=IzZuWNDk71THUm5-pIXp3_l24hZ6Q28zTD_hXGp8j6E,2700
+syncmodels-0.1.349.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
+syncmodels-0.1.349.dist-info/entry_points.txt,sha256=dMnigjZsHMxTwXiiZyBZdBbMYE0-hY3L5cG15EcDAzw,51
+syncmodels-0.1.349.dist-info/top_level.txt,sha256=2DfQ9NuAhKMjY3BvQGVBA7GfqTm7EoHNbaehSUiqiHQ,11
+syncmodels-0.1.349.dist-info/RECORD,,