syncmodels 0.1.343__py2.py3-none-any.whl → 0.1.345__py2.py3-none-any.whl

syncmodels/__init__.py

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

syncmodels/helpers/crawler.py

@@ -35,8 +35,8 @@ class SortKeyFinder:
     # )
     DATE_KEYS = [
         # ".*date", # keys that does not belongs to Pydantic models
-        # "id",
-        # "record_id",
+        "id",
+        "record_id",
         "time",
         "year",
         "ts",

syncmodels/schema.py

@@ -7,8 +7,13 @@ def most_common(sample):
     for value in sample:
         stats[value] = stats.get(value, 0) + 1
 
-    stats = [(v, k) for k, v in stats.items()]
+    # types can't compare themselves, so add a trick with str(k)
+    stats = [(v, str(k), k) for k, v in stats.items()]
+
     stats.sort(reverse=True)
+
+    # remove str(k)
+    stats = [(a, c) for (a, _, c) in stats]
     return stats
 
 
@@ -57,6 +62,8 @@ class iSchema:
         d_fields = {}
         for row in data:
             for i, value in enumerate(row):
+                if value is None:
+                    continue
                 name = names[i]
                 type_ = value.__class__
                 d_fields.setdefault(name, []).append(type_)
@@ -75,8 +82,11 @@ class iSchema:
             # direct search has failed
             # try to guess the column by value class
             for key, klass in d_fields.items():
-                if issubclass(klass, (datetime,)):
-                    return key
+                try:
+                    if issubclass(klass, (datetime,)):
+                        return key
+                except Exception as why:
+                    pass
 
         monotonic_since_key = best()
         return names, types, d_fields, monotonic_since_key

syncmodels/storage.py

@@ -1025,20 +1025,24 @@ class WaveStorage(iWaves, iStorage):
 
                     # TODO: try to create only a single query
                     # TODO: review different structures case
-                    similar_bp = {
-                        LIMIT_KEY: kw.get(
-                            LIMIT_KEY, 25  # TODO: agp: set in definition?
-                        ),  # TODO: this is temporal, ideally None
-                        # ORDER_KEY: MONOTONIC_KEY,
-                        # DIRECTION_KEY: DIRECTION_DESC,
-                        ORG_KEY: uid,
-                        **data_sort_blueprint,  # implies sv = True
-                    }
-                    similar = await self.storage.query(
-                        query,
-                        **similar_bp,
-                        **data_sort_bp,
-                    )
+                    if is_sort_key_id(sort_keys):
+                        # using record_id style doesn't require search for similars object
+                        similar = []
+                    else:
+                        similar_bp = {
+                            LIMIT_KEY: kw.get(
+                                LIMIT_KEY, 25  # TODO: agp: set in definition?
+                            ),  # TODO: this is temporal, ideally None
+                            # ORDER_KEY: MONOTONIC_KEY,
+                            # DIRECTION_KEY: DIRECTION_DESC,
+                            ORG_KEY: uid,
+                            **data_sort_blueprint,  # implies sv = True
+                        }
+                        similar = await self.storage.query(
+                            query,
+                            **similar_bp,
+                            **data_sort_bp,
+                        )
                     t1 = time.time()
                     _elapsed = t1 - t0
                     existing = identical + similar

{syncmodels-0.1.343.dist-info → syncmodels-0.1.345.dist-info}/METADATA

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

{syncmodels-0.1.343.dist-info → syncmodels-0.1.345.dist-info}/RECORD

@@ -1,4 +1,4 @@
-syncmodels/__init__.py,sha256=Mpde6Eca9MTKd_YLLbuJt4XCAjhQkFJWIMHIgyNtej0,142
+syncmodels/__init__.py,sha256=97auPMo5GK08H9FvKR4gS9kncSRmilKyekZWQqVvVzU,142
 syncmodels/context.py,sha256=k1Gs_ip9BfyRFpyRnzqYvRDKo0sYBqJsh6z9sWln9oE,451
 syncmodels/crawler.py,sha256=lx0IU586JD0qcdozWiv0y7970CkUEg3SzFB6gOYDS6I,94540
 syncmodels/crud.py,sha256=oZIcwEKR2i-lesEF_059Y4yThohd9m7gs6R6xYgLH-I,15351
@@ -10,8 +10,8 @@ syncmodels/parallel.py,sha256=Ll8HmyFF9v9fIofqqSgfhyTlklvb77mTtNdG5Y9lqdQ,7145
 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=GLEDryiBkgN9SgtvcqBRxP_22T00gGkIbiZqM6AqKDI,76158
+syncmodels/schema.py,sha256=n5Kkq5bxwzBkLomVtUzq3cwNpVjV0HNLxj-wavlYIbQ,2789
+syncmodels/storage.py,sha256=x01TmpETMrHvQvliL3TXfUp18RKr6Huz6DmrRZWD1DU,76418
 syncmodels/syncmodels.py,sha256=jcUxVbv1hrx5hI81VCO1onIM6WyORTqJVPwIqlPocOc,10596
 syncmodels/timequeue.py,sha256=YRd3ULRaIhoszaBsYhfr0epMqAbL6-NwVEtScjUYttM,595
 syncmodels/wave.py,sha256=Gra22BLiA9z2nF-6diXpjAc4GZv9nebmyvHxdAfXec4,7764
@@ -24,7 +24,7 @@ syncmodels/cli/surreal.py,sha256=eL7pDicLo0_68JhpCZacde6DOVcfHE_UEzczvgDuvAc,106
 syncmodels/cli/wingdbstub.py,sha256=q4z-RqHN1ttzNtiLYTzqQG2ZYZ6W3NOnEd2E5NGhfao,17165
 syncmodels/cli/workspace.py,sha256=wajZnxf567nYoQysTEgxrDAp8ZBU8zSuoP4KyZtqvdc,2461
 syncmodels/helpers/__init__.py,sha256=qZet64gMJNAAqzUdEqCV5WDk5D2Dbw1Kxlt9Jo6x3m4,23
-syncmodels/helpers/crawler.py,sha256=ptqj4g96nQfQIvdp18HRDovnWfB0RJXtTBzHQsNPrM8,4844
+syncmodels/helpers/crawler.py,sha256=UNa_Sgmq8M1X3oQlVUalo-2fAePWsLlhJx1BViIO3fo,4840
 syncmodels/helpers/explorer.py,sha256=-Dol3z1pALCMI9OPSvVbROaTzLjbUpS0suJ82Z6Rmb4,7447
 syncmodels/helpers/faker.py,sha256=tPtibNh28KoHb9kcwE9WaPdPrSrN6xMbCv5HhNFEVG0,1222
 syncmodels/helpers/general.py,sha256=UAcSfrvsaT15iJuxsR3WMk51UjpLLGDf14xmpBojndg,6160
@@ -303,10 +303,10 @@ syncmodels/session/postgresql.py,sha256=ZMIu1Rv93pKfvFlovFBmWArzlrT2xaQWNYGZT_LW
 syncmodels/session/sql.py,sha256=auZ_3RZTSWViED4UrExYaes42Y2bTZKixEsfOpa_zaU,7036
 syncmodels/session/sqlite.py,sha256=nCDjopLiBpX1F10qkKoARM7JrVdIpJ1WdGOduFVxaiA,2080
 syncmodels/source/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syncmodels-0.1.343.dist-info/AUTHORS.rst,sha256=3ZPoqg8Aav8DSYKd0fwcwn4_5HwSiMLart0E5Un00-U,168
-syncmodels-0.1.343.dist-info/LICENSE,sha256=uzMOYtIiUsnsD0xHJR7aJWJ4v_bvan0kTnvufy5eNoA,1075
-syncmodels-0.1.343.dist-info/METADATA,sha256=sXMUvCabKs5rQ2jAfNc1Vgp6XBoQbcpPCXhRq4rQ9a8,2700
-syncmodels-0.1.343.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
-syncmodels-0.1.343.dist-info/entry_points.txt,sha256=dMnigjZsHMxTwXiiZyBZdBbMYE0-hY3L5cG15EcDAzw,51
-syncmodels-0.1.343.dist-info/top_level.txt,sha256=2DfQ9NuAhKMjY3BvQGVBA7GfqTm7EoHNbaehSUiqiHQ,11
-syncmodels-0.1.343.dist-info/RECORD,,
+syncmodels-0.1.345.dist-info/AUTHORS.rst,sha256=3ZPoqg8Aav8DSYKd0fwcwn4_5HwSiMLart0E5Un00-U,168
+syncmodels-0.1.345.dist-info/LICENSE,sha256=uzMOYtIiUsnsD0xHJR7aJWJ4v_bvan0kTnvufy5eNoA,1075
+syncmodels-0.1.345.dist-info/METADATA,sha256=1qq6L-7xrXhXrHll1btsJpYQlyYveDgz564yJvivZlY,2700
+syncmodels-0.1.345.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
+syncmodels-0.1.345.dist-info/entry_points.txt,sha256=dMnigjZsHMxTwXiiZyBZdBbMYE0-hY3L5cG15EcDAzw,51
+syncmodels-0.1.345.dist-info/top_level.txt,sha256=2DfQ9NuAhKMjY3BvQGVBA7GfqTm7EoHNbaehSUiqiHQ,11
+syncmodels-0.1.345.dist-info/RECORD,,