clear-skies-cortex 2.0.2__py3-none-any.whl → 2.0.3__py3-none-any.whl

{clear_skies_cortex-2.0.2.dist-info → clear_skies_cortex-2.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clear-skies-cortex
-Version: 2.0.2
+Version: 2.0.3
 Summary: Cortex module for Clearskies
 Project-URL: Docs, https://https://clearskies.info/modules/clear-skies-cortex
 Project-URL: Repository, https://github.com/clearskies-py/cortex
@@ -14,7 +14,7 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Requires-Python: <4.0,>=3.11
-Requires-Dist: clear-skies<3.0.0,>=2.0.0
+Requires-Dist: clear-skies<3.0.0,>=2.0.37
 Requires-Dist: dacite>=1.9.2
 Provides-Extra: dev
 Requires-Dist: types-requests>=2.32.4; extra == 'dev'

{clear_skies_cortex-2.0.2.dist-info → clear_skies_cortex-2.0.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 clearskies_cortex/__init__.py,sha256=SwFkNfKLJgcq2qE6YJ_78_JfeoRGojlKuR_3DymZZSQ,142
 clearskies_cortex/dataclasses.py,sha256=rmSwJkMPwyfQltHuGzRRn9OrwMXKHajkG1jA39ix9lU,1446
 clearskies_cortex/backends/__init__.py,sha256=Ek74kpJLE7ERY-6yhH2KwFO25gm3Yjz51laUApnhgnU,179
-clearskies_cortex/backends/cortex_backend.py,sha256=WzsLllkHkv--bcMgGx8VtWJQJ2w23m_9LSRgWoztHpw,4035
-clearskies_cortex/backends/cortex_team_relationship_backend.py,sha256=iLIev9VCkOoMyiTJQ7mo0iFRYcmj3JcuJWudwiZ3LiE,7543
+clearskies_cortex/backends/cortex_backend.py,sha256=kmF54P0W3eK2BpCAh4dpIBPmo6iWKU7oUYSPB-IG7IE,4149
+clearskies_cortex/backends/cortex_team_relationship_backend.py,sha256=UiMZp0jcKvpx3tLbR8aMBS8-KIfECxJGiwM3fz8DmuM,7648
 clearskies_cortex/columns/__init__.py,sha256=BpoVCEVXRtKcsyRFnAYLtlwYtHBjciUbzuzaBxmfH00,87
 clearskies_cortex/columns/string_list.py,sha256=khsJS_0T4XZvTeXFpRvZsFX8iNTWbx_urCEa9Tv0Bmo,754
 clearskies_cortex/defaults/__init__.py,sha256=tulZSvFgp4YUKj_bnArIevmlpC8z_AQKO0okYs4hCDo,216
@@ -22,7 +22,7 @@ clearskies_cortex/models/cortex_scorecard.py,sha256=YlINfUGudmqQHe-0ZpD2qOzAUKWs
 clearskies_cortex/models/cortex_team.py,sha256=LXqHx_lwBvuVMyUlj1l2Sfpngj0zTZGpVi0WrJP-o3E,2246
 clearskies_cortex/models/cortex_team_category_tree.py,sha256=PLC-9E5kuMeItow7RKFX7jKUiAfJ-7ehXIy3eeaFzr8,721
 clearskies_cortex/models/cortex_team_department.py,sha256=DL3k91462-R0VVqbUQgBfYM_TndE5MKmDPBSF448XYw,639
-clear_skies_cortex-2.0.2.dist-info/METADATA,sha256=GpQj7kcmGLxHS759R1RkSmbuiVPvNBUS3pHV1SGAVgA,2116
-clear_skies_cortex-2.0.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-clear_skies_cortex-2.0.2.dist-info/licenses/LICENSE,sha256=MkEX8JF8kZxdyBpTTcB0YTd-xZpWnHvbRlw-pQh8u58,1069
-clear_skies_cortex-2.0.2.dist-info/RECORD,,
+clear_skies_cortex-2.0.3.dist-info/METADATA,sha256=aDSWFEtcMWOw5fGdQGg1B--y7ECfX89nyI1WRa-36jg,2117
+clear_skies_cortex-2.0.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+clear_skies_cortex-2.0.3.dist-info/licenses/LICENSE,sha256=MkEX8JF8kZxdyBpTTcB0YTd-xZpWnHvbRlw-pQh8u58,1069
+clear_skies_cortex-2.0.3.dist-info/RECORD,,

clearskies_cortex/backends/cortex_backend.py

@@ -7,6 +7,7 @@ from clearskies.authentication import Authentication
 from clearskies.decorators import parameters_to_properties
 from clearskies.di import inject
 from clearskies.query import Query
+from clearskies.query.result import CountQueryResult
 
 
 class CortexBackend(clearskies.backends.ApiBackend):
@@ -39,7 +40,7 @@ class CortexBackend(clearskies.backends.ApiBackend):
     ):
         self.finalize_and_validate_configuration()
 
-    def count(self, query: Query) -> int:
+    def count(self, query: Query) -> CountQueryResult:
         """Return count of records matching query."""
         self.check_query(query)
         (url, method, body, headers) = self.build_records_request(query)
@@ -47,9 +48,9 @@ class CortexBackend(clearskies.backends.ApiBackend):
         response.raise_for_status()
         data = response.json()
         if "total" in data:
-            return data["total"]
+            return CountQueryResult(count=data["total"])
         data = self.map_records_response(data, query)
-        return len(data)
+        return CountQueryResult(count=len(data))
 
     def map_records_response(
         self, response_data: Any, query: Query, query_data: dict[str, Any] | None = None

clearskies_cortex/backends/cortex_team_relationship_backend.py

@@ -9,6 +9,7 @@ from clearskies.backends.memory_backend import MemoryBackend, MemoryTable
 from clearskies.columns import String, Uuid
 from clearskies.di import inject
 from clearskies.query import Condition, Query
+from clearskies.query.result import RecordsQueryResult
 
 from clearskies_cortex.backends import cortex_backend as rest_backend
 
@@ -34,7 +35,7 @@ class CortexTeamRelationshipBackend(MemoryBackend, Configurable):
         # or we need to let the di system build the CortexBackend.  This change does both:
         self.cortex_backend = cortex_backend
 
-    def records(self, query: Query, next_page_data: dict[str, str | int] | None = None) -> list[dict[str, Any]]:
+    def records(self, query: Query) -> RecordsQueryResult:
         """Accept either a model or a model class and creates a "table" for it."""
         table_name = query.model_class.destination_name()
         if table_name not in self._tables:
@@ -45,7 +46,7 @@ class CortexTeamRelationshipBackend(MemoryBackend, Configurable):
             # we don't need since we built the data ourselves.  In short, it will be a lot slower, so I cheat.
             self._tables[table_name]._rows = records  # type: ignore[assignment]
             self._tables[table_name]._id_index = id_index  # type: ignore[assignment]
-        return super().records(query, next_page_data)
+        return super().records(query)
 
     def _fetch_and_map_relationship_data(self, table_name: str) -> tuple[list[dict[str, str | int]], dict[str, int]]:
         class RelationshipModel(Model):
@@ -75,11 +76,14 @@ class CortexTeamRelationshipBackend(MemoryBackend, Configurable):
         root_categories: dict[str, str] = {}
         known_children: dict[str, str] = {}
         relationships: dict[str, set[str]] = {}
-        for relationship in self._get_cortex_backend().records(
-            Query(
-                model_class=RelationshipModel,
-            ),
-            {},
+        for relationship in (
+            self._get_cortex_backend()
+            .records(
+                Query(
+                    model_class=RelationshipModel,
+                ),
+            )
+            .records
         ):
             child_category = relationship["child_team_tag"]
             parent_category = relationship["parent_team_tag"]
@@ -153,12 +157,15 @@ class CortexTeamRelationshipBackend(MemoryBackend, Configurable):
         from clearskies_cortex.models.cortex_team import CortexTeam
 
         teams: dict[str, dict[str, Any]] = {}
-        for team in self._get_cortex_backend().records(
-            Query(
-                model_class=CortexTeam,
-                conditions=[Condition("include_teams_without_members=true")],
-            ),
-            {},
+        for team in (
+            self._get_cortex_backend()
+            .records(
+                Query(
+                    model_class=CortexTeam,
+                    conditions=[Condition("include_teams_without_members=true")],
+                ),
+            )
+            .records
         ):
             teams[team["team_tag"]] = team
         self._cached_teams = teams