syncmodels 0.1.337__py2.py3-none-any.whl → 0.1.339__py2.py3-none-any.whl

syncmodels/__init__.py

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

syncmodels/session/__init__.py

@@ -399,7 +399,7 @@ class iSession(iContext, iSchema, iRegistry):  # , iAuthenticator):
             if resuming_info := _wave.get(WAVE_RESUMING_INFO_KEY):
                 assert (
                     len(resuming_info) == 1
-                ), "multiples resuming keys are not alloewd (review storage.put())"
+                ), "multiples resuming keys are not allowed (review storage.put())"
                 key, value = resuming_info.popitem()
                 params[MONOTONIC_SINCE_KEY] = key
                 params[MONOTONIC_SINCE_VALUE] = value
@@ -418,6 +418,7 @@ class iSession(iContext, iSchema, iRegistry):  # , iAuthenticator):
                     call_kw[self.QUERY_BODY_KEY] = body
         elif self.PARAMS_KEY:
             call_kw[self.PARAMS_KEY] = params
+
         return call_kw
 
 

syncmodels/storage.py

@@ -360,8 +360,10 @@ class StoragePort(Storage):
         "Returns storage info: *tables*, etc"
         _uri = parse_duri(pattern)
         simplified = "{fscheme}/{xhost}/{_path}".format_map(_uri)
-
-        example = self._file("example/foo/bar")
+        # example = self._file("example/foo/bar") # pickle
+        example = self.other._file(
+            "example/foo/bar"
+        )  # yaml is safer when finding files
         ext = os.path.splitext(example)[-1]
         regexp = f"{simplified}.*{ext}$"
         top = "."
@@ -1225,86 +1227,84 @@ class WaveStorage(iWaves, iStorage):
                     res2 = True
 
                 # save Snapshot of the object
-                if push:
-                    # long fquid version
-                    # data[ID_KEY] = data[ORG_KEY]
-                    # short version
-                    # data[ID_KEY] = "{thing}:{id}".format_map(_uri)
-                    if _uri["id"] is None:
-                        __id = data.get(ORG_KEY, "")
-                        _id = parse_duri(__id)
-                        if _id["id"] is None:
-                            _uri["id"] = __id
-                        else:
-                            _uri["id"] = _id["id"]
-                        data[ORG_KEY] = build_uri(**_uri)
-
-                    data[ID_KEY] = "{thing}:{id}".format_map(_uri)
-                    query = f"{namespace}://{database}/{TUBE_SNAPSHOT}"
-                    # resuming_info = {k: kw[k] for k in kw.get(REVERSE_SORT_KEY, [])}
-                    # resuming_info = {k: kw[k] for k in kw.get(SORT_KEY) or []}
-                    resuming_info = {
-                        k: kw.get(k, data.get(k)) for k in kw.get(SORT_KEY) or []
-                    }
-                    # force to be json compatible
-                    resuming_info = JSONVerter.to_json(resuming_info)
+                # long fquid version
+                # data[ID_KEY] = data[ORG_KEY]
+                # short version
+                # data[ID_KEY] = "{thing}:{id}".format_map(_uri)
+                if _uri["id"] is None:
+                    __id = data.get(ORG_KEY, "")
+                    _id = parse_duri(__id)
+                    if _id["id"] is None:
+                        _uri["id"] = __id
+                    else:
+                        _uri["id"] = _id["id"]
+                    data[ORG_KEY] = build_uri(**_uri)
 
-                    res0 = await self.storage.put(
-                        query,
-                        data,
-                    )
-                    # 3. finally add the wave info into tube
-                    data.pop(MONOTONIC_KEY)
+                data[ID_KEY] = "{thing}:{id}".format_map(_uri)
+                query = f"{namespace}://{database}/{TUBE_SNAPSHOT}"
+                # resuming_info = {k: kw[k] for k in kw.get(REVERSE_SORT_KEY, [])}
+                # resuming_info = {k: kw[k] for k in kw.get(SORT_KEY) or []}
+                resuming_info = {
+                    k: kw.get(k, data.get(k)) for k in kw.get(SORT_KEY) or []
+                }
+                # force to be json compatible
+                resuming_info = JSONVerter.to_json(resuming_info)
+
+                res0 = await self.storage.put(
+                    query,
+                    data,
+                )
+                # 3. finally add the wave info into tube
+                data.pop(MONOTONIC_KEY)
 
                 # update the TUBE_WAVE due the insertion of this object
-                if push:
-                    # 2. save last Wave from this particular tube
-                    # AVOID_KEYS contains all keys that aren't json serializable
-                    # wave = {
-                    #     k: v for k, v in kw.items() if k not in self.AVOID_KEYS
-                    # }
-                    # try to recover the 'intact' bootstrap that we've using
-                    for wave0 in kw.get(WAVE_LAST_KEY, []):
-                        wave = wave0.get("wave")  # TODO: use a define
-                        if wave:
-                            break
-                    else:
-                        # otherwise, its the 1st time and we need to create the 1st
-                        # bootstrap-wave info
-                        wave_keys = set(kw.get(WAVE_INFO_KEY, []))
-                        wave_keys.update([KIND_KEY, PREFIX_URL, PARAMS_KEY])
-                        # task = kw[TASK_KEY]
-                        wave = {k: kw[k] for k in wave_keys.intersection(kw)}
-
+                # 2. save last Wave from this particular tube
+                # AVOID_KEYS contains all keys that aren't json serializable
+                # wave = {
+                #     k: v for k, v in kw.items() if k not in self.AVOID_KEYS
+                # }
+                # try to recover the 'intact' bootstrap that we've using
+                for wave0 in kw.get(WAVE_LAST_KEY, []):
+                    wave = wave0.get("wave")  # TODO: use a define
                     if wave:
-                        # wave must be json compatible and do not use any reserved
-                        # keyword for storage (i.e. 'scope' in Surreal)
-                        query = f"{namespace}://{database}/{TUBE_WAVE}"
-
-                        # query can't containg MONOTONIC_KEY
-                        wave.pop(MONOTONIC_KEY, None)
-                        wave.pop(WAVE_RESUMING_INFO_KEY, None)
-                        exists = await self.storage.query(query, **wave)
-                        assert len(exists) <= 1
-
-                        if len(exists):
-                            # use the same record_id
-                            # otherwise a new record will be created
-                            wave = exists[0]
-                        # stamp current wave
-                        _wave = {
-                            **wave,
-                            MONOTONIC_KEY: monotonic,
-                            WAVE_RESUMING_INFO_KEY: resuming_info,
-                        }
-                        res1 = await self.storage.put(query, _wave)
-                    else:
-                        # wave is empty, maybe because is not a resuming crawling task
-                        log.debug(
-                            "wave is empty, maybe because is not a resuming crawling task"
-                        )
-                        # log.info("Saving: %s", data)
-                        res1 = True
+                        break
+                else:
+                    # otherwise, its the 1st time and we need to create the 1st
+                    # bootstrap-wave info
+                    wave_keys = set(kw.get(WAVE_INFO_KEY, []))
+                    wave_keys.update([KIND_KEY, PREFIX_URL, PARAMS_KEY])
+                    # task = kw[TASK_KEY]
+                    wave = {k: kw[k] for k in wave_keys.intersection(kw)}
+
+                if wave:
+                    # wave must be json compatible and do not use any reserved
+                    # keyword for storage (i.e. 'scope' in Surreal)
+                    query = f"{namespace}://{database}/{TUBE_WAVE}"
+
+                    # query can't containg MONOTONIC_KEY
+                    wave.pop(MONOTONIC_KEY, None)
+                    wave.pop(WAVE_RESUMING_INFO_KEY, None)
+                    exists = await self.storage.query(query, **wave)
+                    assert len(exists) <= 1
+
+                    if len(exists):
+                        # use the same record_id
+                        # otherwise a new record will be created
+                        wave = exists[0]
+                    # stamp current wave
+                    _wave = {
+                        **wave,
+                        MONOTONIC_KEY: monotonic,
+                        WAVE_RESUMING_INFO_KEY: resuming_info,
+                    }
+                    res1 = await self.storage.put(query, _wave)
+                else:
+                    # wave is empty, maybe because is not a resuming crawling task
+                    log.debug(
+                        "wave is empty, maybe because is not a resuming crawling task"
+                    )
+                    # log.info("Saving: %s", data)
+                    res1 = True
 
                 return all([res0, res1, res2])
             else:

{syncmodels-0.1.337.dist-info → syncmodels-0.1.339.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: syncmodels
-Version: 0.1.337
+Version: 0.1.339
 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.337
+Requires-Dist: agptools>=0.1.339
 Requires-Dist: aiocache
 Requires-Dist: aiohttp
 Requires-Dist: Click

{syncmodels-0.1.337.dist-info → syncmodels-0.1.339.dist-info}/RECORD

@@ -1,4 +1,4 @@
-syncmodels/__init__.py,sha256=wxh70wmmEoZXPQtF4CkEmIPd_3MipY4lXmWzRiYWVKs,142
+syncmodels/__init__.py,sha256=i0JzNcq2trLiNdW2FJGXvp96SPoehnj8TJU76ZrMHjM,142
 syncmodels/context.py,sha256=k1Gs_ip9BfyRFpyRnzqYvRDKo0sYBqJsh6z9sWln9oE,451
 syncmodels/crawler.py,sha256=DAD2tL93iG-LjNQRCg2h_snusjGhQyhdZyMPOCEyvNU,94499
 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=IHDKuQ3yJ1DN9wktMiIrerPepYX61tc3AzbFfuUqEFw,5454
 syncmodels/schema.py,sha256=uinUt8Asq_x7xa6MKWVXNyoWO6gKocjGPppjimaXzEU,2492
-syncmodels/storage.py,sha256=J_Y7Xj2FRgIFK8W1BpPA-YpvJEg6bw8y0PKXOk5FAvw,75037
+syncmodels/storage.py,sha256=8Gt2iEoMdMfv_AljsrBggKXnCKzKkAaYVWRF9PdcKh0,74825
 syncmodels/syncmodels.py,sha256=jcUxVbv1hrx5hI81VCO1onIM6WyORTqJVPwIqlPocOc,10596
 syncmodels/timequeue.py,sha256=YRd3ULRaIhoszaBsYhfr0epMqAbL6-NwVEtScjUYttM,595
 syncmodels/wave.py,sha256=Gra22BLiA9z2nF-6diXpjAc4GZv9nebmyvHxdAfXec4,7764
@@ -297,16 +297,16 @@ syncmodels/model/schema_org/webpage.py,sha256=-bqKOpEs_2lW7qrey2nHtvOZ9xbmmwcviN
 syncmodels/model/schema_org/webpageelement.py,sha256=brXfhU3l3FBXpy8qnR1Ve-EckjHW8VGoyR2IsnT7t2Y,1104
 syncmodels/model/schema_org/website.py,sha256=48Rox27BbFIg1u3wDlOtX-lLCPoFgvvrCw5Hrdf6uRU,912
 syncmodels/model/schema_org/xpathtype.py,sha256=D8gKiCrGSSuUVYw7BIWmOIUbKATfv2IpbkV1B2TmjC0,484
-syncmodels/session/__init__.py,sha256=2I4v_HC1LL0QEepIUF_3pu7vtaSooLuug7nGoyEX2YU,15580
+syncmodels/session/__init__.py,sha256=pjn-IOG3IZmnHZEvkDIAG8YtElHk3aYi13f2uBUZDHs,15581
 syncmodels/session/http.py,sha256=tf7z0ccAEYoCOZT4Ukv3NBXz9hUO3vs2s9bm491pCj8,1480
 syncmodels/session/postgresql.py,sha256=ZMIu1Rv93pKfvFlovFBmWArzlrT2xaQWNYGZT_LW61k,175
 syncmodels/session/sql.py,sha256=17C8EHn_1twHezhMlD5esMvx4m0iIrnD7JK-TuBswgU,6573
 syncmodels/session/sqlite.py,sha256=nCDjopLiBpX1F10qkKoARM7JrVdIpJ1WdGOduFVxaiA,2080
 syncmodels/source/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syncmodels-0.1.337.dist-info/AUTHORS.rst,sha256=3ZPoqg8Aav8DSYKd0fwcwn4_5HwSiMLart0E5Un00-U,168
-syncmodels-0.1.337.dist-info/LICENSE,sha256=uzMOYtIiUsnsD0xHJR7aJWJ4v_bvan0kTnvufy5eNoA,1075
-syncmodels-0.1.337.dist-info/METADATA,sha256=ZxBHwT48pDhUmxCPUR7BKjA4IlnxjilVoeaQWOPgUQ0,2700
-syncmodels-0.1.337.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
-syncmodels-0.1.337.dist-info/entry_points.txt,sha256=dMnigjZsHMxTwXiiZyBZdBbMYE0-hY3L5cG15EcDAzw,51
-syncmodels-0.1.337.dist-info/top_level.txt,sha256=2DfQ9NuAhKMjY3BvQGVBA7GfqTm7EoHNbaehSUiqiHQ,11
-syncmodels-0.1.337.dist-info/RECORD,,
+syncmodels-0.1.339.dist-info/AUTHORS.rst,sha256=3ZPoqg8Aav8DSYKd0fwcwn4_5HwSiMLart0E5Un00-U,168
+syncmodels-0.1.339.dist-info/LICENSE,sha256=uzMOYtIiUsnsD0xHJR7aJWJ4v_bvan0kTnvufy5eNoA,1075
+syncmodels-0.1.339.dist-info/METADATA,sha256=L3I2KBAFvPiBYOM93PLqdaxUTm2djGQbKtObIh2atPU,2700
+syncmodels-0.1.339.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
+syncmodels-0.1.339.dist-info/entry_points.txt,sha256=dMnigjZsHMxTwXiiZyBZdBbMYE0-hY3L5cG15EcDAzw,51
+syncmodels-0.1.339.dist-info/top_level.txt,sha256=2DfQ9NuAhKMjY3BvQGVBA7GfqTm7EoHNbaehSUiqiHQ,11
+syncmodels-0.1.339.dist-info/RECORD,,