clear-skies-cortex 2.0.2__tar.gz → 2.0.3__tar.gz

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v0.0.35
+_commit: v0.0.45
 _src_path: gh:clearskies-py/clearskies-module-template
 author_email: tom.nijboer@cimpress.com
 author_name: Tom Nijboer

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/.github/workflows/create-version.yaml

@@ -79,7 +79,7 @@ jobs:
       # STEP 2: Commit all file changes together
       - name: Commit All Changes
         run: |
-          git add pyproject.toml CHANGELOG.md
+          git add pyproject.toml CHANGELOG.md uv.lock
           git commit -m "chore(release): bump version to ${{ steps.bump.outputs.tag }}"
 
       # STEP 3: Create the tag for the final commit

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/.github/workflows/run-tests.yml

@@ -67,7 +67,7 @@ jobs:
       python-version: ${{ matrix.python-version }}
       run-mypy: ${{ needs.changes.outputs.tests == 'true' }}
       run-pytest: ${{ needs.changes.outputs.tests == 'true' }}
-      run-black: ${{ needs.changes.outputs.tests == 'true' }}
+      run-ruff-format: ${{ needs.changes.outputs.tests == 'true' }}
       run-ruff-check: ${{ needs.changes.outputs.tests == 'true' }}
     secrets: inherit
     strategy:
@@ -76,6 +76,7 @@ jobs:
           - '3.11'
           - '3.12'
           - '3.13'
+          - '3.14'
       fail-fast: false
 
   status:

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/.github/workflows/tests-matrix.yaml

@@ -14,7 +14,7 @@ on:
       run-pytest:
         required: true
         type: boolean
-      run-black:
+      run-ruff-format:
         required: true
         type: boolean
       run-ruff-check:
@@ -66,27 +66,14 @@ jobs:
       - run: uv run pytest -v
       - run: git diff --exit-code --stat HEAD
 
-  black:
-    name: black
+  ruff-format:
+    name: ruff-format
     runs-on: ${{ inputs.runner }}
-    if: inputs.run-black
+    if: inputs.run-ruff-format
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: Install uv and set the python version
-        uses: astral-sh/setup-uv@v6
-        with:
-          python-version: ${{ inputs.python-version }}
-          enable-cache: true
-      - name: Install dependencies
-        run: uv sync --locked --all-extras --dev
-      - uses: psf/black@stable
+      - uses: astral-sh/ruff-action@v3
         with:
-          options: "--check --verbose"
-          src: "./src"
+          args: "format --diff"
 
   ruff-check:
     name: ruff-check

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/.pre-commit-config.yaml

@@ -38,12 +38,6 @@ repos:
     hooks:
       - id: uv-lock
 
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
-    hooks:
-      - id: black
-        files: \.py$
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.12.1
     hooks:
@@ -55,7 +49,7 @@ repos:
     rev: v1.16.1
     hooks:
       - id: mypy
-        additional_dependencies: [types-requests, clear-skies]
+        additional_dependencies: [types-requests]
         files: \.py$
 
   - repo: https://github.com/adrienverge/yamllint

clear_skies_cortex-2.0.3/.vscode/settings.json

@@ -0,0 +1,21 @@
+{
+    "python.testing.pytestArgs": ["tests"],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true,
+    "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
+    "ruff.interpreter": ["${workspaceFolder}/.venv/bin/python"],
+    "ruff.path": ["${workspaceFolder}/.venv/bin/ruff"],
+    "ruff.configuration": "${workspaceFolder}/ruff.toml",
+    "ruff.nativeServer": "on",
+    "[python]": {
+        "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+            "source.fixAll": "explicit",
+            "source.organizeImports": "explicit"
+        },
+        "editor.defaultFormatter": "charliermarsh.ruff"
+    },
+    "mypy-type-checker.args": [
+        "--config-file=${workspaceFolder}/pyproject.toml"
+    ]
+}

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/CHANGELOG.md

@@ -5,12 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.3] - 2026-01-27
+
+### Changed
+- Udpate to QueryResult
+- Update to latest copier version
+
 ## [2.0.2] - 2026-01-06
 
 ### Added
 - Add teams
 
 ### Changed
+- Bump version to v2.0.2 by @github-actions[bot]
 - Make it all work with the api
 
 ### Fixed
@@ -34,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * @tnijboer made their first contribution in [#1](https://github.com/clearskies-py/cortex/pull/1)
 * @cmancone made their first contribution
 * @ made their first contribution
+[2.0.3]: https://github.com/clearskies-py/cortex/compare/v2.0.2..v2.0.3
 [2.0.2]: https://github.com/clearskies-py/cortex/compare/v2.0.1..v2.0.2
 
 <!-- generated by git-cliff -->

clear_skies_cortex-2.0.3/LATEST_CHANGELOG.md

@@ -0,0 +1,6 @@
+## [2.0.3] - 2026-01-27
+
+### Changed
+- Udpate to QueryResult
+- Update to latest copier version
+

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/PKG-INFO

@@ -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 → clear_skies_cortex-2.0.3}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "clear-skies-cortex"
 description = "Cortex module for Clearskies"
-version = "2.0.2"
+version = "2.0.3"
 license = "MIT"
 readme = "./README.md"
 authors = [{name = "Tom Nijboer", email = "tom.nijboer@cimpress.com"}]
 requires-python = ">=3.11,<4.0"
 dependencies = [
-    "clear-skies>=2.0.0,<3.0.0",
+    "clear-skies>=2.0.37,<3.0.0",
     "dacite>=1.9.2",
 ]
 classifiers = [
@@ -44,19 +44,6 @@ exclude = [
     "tests/**"
 ]
 
-[tool.black]
-line-length = 120
-skip-magic-trailing-comma = false
-preview = false
-
-[tool.mypy]
-python_version = "3.11"
-
-exclude = [
-    ".*_test\\.py$",
-    "docs/.*"
-]
-
 [tool.pytest.ini_options]
 minversion = "6.0"
 addopts = "-ra -q"
@@ -72,7 +59,6 @@ pythonpath = [
 [dependency-groups]
 dev = [
     "akeyless>=5.0.8",
-    "black>=25.1.0",
     "mypy>=1.18.2",
     "pre-commit>=4.3.0",
     "pytest>=8.4.1",

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/src/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

{clear_skies_cortex-2.0.2 → clear_skies_cortex-2.0.3}/src/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