tigrbl_engine_xlsx 0.1.1.dev3__tar.gz → 0.1.1.dev5__tar.gz

{tigrbl_engine_xlsx-0.1.1.dev3 → tigrbl_engine_xlsx-0.1.1.dev5}/.gitignore

@@ -30,9 +30,13 @@ pkgs/standards/peagen/.pymon
 gateway.db
 kms.db
 *.asc
+*.kid
 *.so
 *.db
 target/
 !.gitkeep          # keep the empty dir in repo
 pkgs/experimental/swarmakit/libs/svelte/.vscode/extensions.json
 node_modules/
+*.zip
+.pymon
+/.tmp_pydeps

{tigrbl_engine_xlsx-0.1.1.dev3 → tigrbl_engine_xlsx-0.1.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tigrbl_engine_xlsx
-Version: 0.1.1.dev3
+Version: 0.1.1.dev5
 Summary: XLSX engine plugin for tigrbl where each workbook is a database and each sheet is a table.
 Project-URL: Homepage, https://github.com/swarmauri/swarmauri-sdk
 Author-email: Jacob Stewart <jacob@swarmauri.com>

{tigrbl_engine_xlsx-0.1.1.dev3 → tigrbl_engine_xlsx-0.1.1.dev5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "tigrbl_engine_xlsx"
-version = "0.1.1.dev3"
+version = "0.1.1.dev5"
 description = "XLSX engine plugin for tigrbl where each workbook is a database and each sheet is a table."
 readme = "README.md"
 license = { file = "LICENSE" }

{tigrbl_engine_xlsx-0.1.1.dev3 → tigrbl_engine_xlsx-0.1.1.dev5}/src/tigrbl_engine_xlsx/session.py

@@ -344,14 +344,20 @@ class XlsxSession(TigrblSessionBase):
         return obj
 
     def _scan_model(self, model: type) -> List[Any]:
-        out = [self._inflate(model, row) for row in self._rows_for(model)]
         pk = _single_pk_name(model)
-        by_id = {getattr(obj, pk): obj for obj in out}
+        by_id: Dict[Any, Any] = {}
+        for row in self._rows_for(model):
+            ident = row.get(pk)
+            if ident is None:
+                continue
+            tracked = self._tracked.get((model, ident))
+            if tracked is not None:
+                by_id[ident] = tracked
+            else:
+                by_id[ident] = self._inflate_tracked(model, ident, row)
         for (known_model, ident), row in self._puts.items():
             if known_model is model:
                 by_id[ident] = self._inflate_tracked(model, ident, row)
-        for ident, obj in list(by_id.items()):
-            self._tracked[(model, ident)] = obj
         for known_model, ident in self._dels:
             if known_model is model:
                 by_id.pop(ident, None)

{tigrbl_engine_xlsx-0.1.1.dev3 → tigrbl_engine_xlsx-0.1.1.dev5}/tests/test_tigrblapp_rpc_usage.py

@@ -6,10 +6,11 @@ from openpyxl import Workbook
 import pytest
 
 from tigrbl import TigrblApp
-from tigrbl.bindings import rpc_call
+from tigrbl import rpc_call
 from tigrbl.engine import EngineSpec
 from tigrbl.orm.mixins import GUIDPk
-from tigrbl.specs import F, IO, S, acol
+from tigrbl.specs import F, IO, S
+from tigrbl.shortcuts import acol
 from tigrbl.table import Table
 from tigrbl.types import Mapped, String