poetry draft

.harness/pythonsdkpublish.yaml

@@ -32,7 +32,7 @@ inputSet:
                       value: <+input>
                     - name: ruff
                       type: String
-                      value: <+input>
+                      value: ruff format --check indico tests
                     - name: mypy
                       type: String
                       value: <+input>

.harness/pythonsdkrelease.yaml

@@ -32,7 +32,7 @@ inputSet:
                       value: <+input>
                     - name: ruff
                       type: String
-                      value: <+input>
+                      value: ruff format --check indico tests
                     - name: mypy
                       type: String
                       value: <+input>

.pre-commit-config.yaml

@@ -8,12 +8,7 @@ repos:
         exclude: ^docs
     -   id: trailing-whitespace
         exclude: ^docs
--   repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.7.4
     hooks:
-    -   id: isort
-        name: isort (python)
--   repo: https://github.com/psf/black
-    rev: 23.11.0
-    hooks:
-    -   id: black
+      - id: ruff-format

Dockerfile

@@ -1,6 +1,17 @@
-FROM python:3.10.4
+ARG REGISTRY_PATH='harbor.devops.indico.io/indico'
+ARG BUILD_TAG=latest
 
-ENV INDICO_HOST="try.indico.io"
+FROM ${REGISTRY_PATH}/ubuntu-2204-build:${BUILD_TAG} as poetry-installer
+ARG POETRY_INSTALL_ARGS
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -yqq apt-transport-https
+
+#deadsnakes holds old versions of python for ubuntu
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -yqq software-properties-common && add-apt-repository ppa:deadsnakes/ppa
+
+RUN  DEBIAN_FRONTEND=noninteractive apt-get -yqq install  python3.8 python3.9 python3.10 python3.11 python3.12 python3.13 python3-pip
+
+RUN pip3 install tox==4.11.3
 
 COPY . /indico-client
 WORKDIR /indico-client

indico/client/request.py

@@ -2,6 +2,8 @@
 from enum import Enum
 from typing import TYPE_CHECKING, Generic, TypeVar, cast
 
+import jq
+
 from indico.errors import IndicoInputError, IndicoRequestError
 from indico.typing import AnyDict
 
@@ -100,20 +102,16 @@ def __init__(self, query: str, variables: "Optional[AnyDict]" = None):
         super().__init__(query, variables=variables)
 
     def process_response(
-        self, response: "AnyDict", nested_keys: "Optional[List[str]]" = None
+        self, response: "AnyDict", jq_path: "Optional[str]" = None
     ) -> "Any":
         raw_response: "AnyDict" = cast("AnyDict", super().process_response(response))
-        if nested_keys:
-            _pg = raw_response
-            for key in nested_keys:
-                if key not in _pg.keys():
-                    raise IndicoInputError(
-                        f"Nested key not found in response: {key}",
-                    )
-                _pg = _pg[key]
-            _pg = _pg["pageInfo"]
+        if jq_path:
+            try:
+                _pg = jq.compile(jq_path).input(raw_response).first()["pageInfo"]
+            except Exception:
+                raise IndicoInputError(f"Invalid jq path: {jq_path}. ")
         else:
-            _pg = next(iter(response.values()))["pageInfo"]
+            _pg = raw_response["pageInfo"]
 
         if not _pg:
             raise ValueError("The supplied GraphQL must include 'pageInfo'.")

indico/filters/__init__.py

@@ -288,10 +288,10 @@ class ComponentBlueprintFilter(Filter):
 
     def __init__(
         self,
-        name: Union[str, None] = None,
-        component_type: Union[str, None] = None,
-        component_family: Union[str, None] = None,
-        tags: Union[List[str], None] = None,
+        name: "Optional[str]" = None,
+        component_type: "Optional[str]" = None,
+        component_family: "Optional[str]" = None,
+        tags: "Optional[List[str]]" = None,
     ):
         kwargs = {
             "name": name,

indico/queries/datasets.py

@@ -89,7 +89,7 @@ def __init__(
         )
 
     def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
+        self, response: "Payload", _: "Optional[str]" = None
     ) -> "List[Dataset]":
         response = super().parse_payload(response)
         return [Dataset(**dataset) for dataset in response["datasetsPage"]["datasets"]]

indico/queries/document_report.py

@@ -71,7 +71,7 @@ def __init__(
         super().__init__(self.query, variables=variables)
 
     def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
+        self, response: "Payload", _: "Optional[str]" = None
     ) -> "List[DocumentReport]":
         return _DocumentReportList(
             **super().parse_payload(response)["submissionsLog"]

indico/queries/example.py

@@ -74,7 +74,7 @@ def __init__(
         )
 
     def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
+        self, response: "Payload", _: "Optional[str]" = None
     ) -> "List[Example]":
         example_page = super().parse_payload(response)["modelGroups"]["modelGroups"][0]
         return [Example(**s) for s in example_page["pagedExamples"]["examples"]]

indico/queries/gallery.py

@@ -4,10 +4,10 @@
 from indico.types.component_blueprint import BlueprintPage, BlueprintTags
 
 if TYPE_CHECKING:  # pragma: no cover
-    from typing import Any, List
+    from typing import Any
 
     from indico.filters import ComponentBlueprintFilter
-    from indico.typing import AnyDict, Payload
+    from indico.typing import Payload
 
 
 class ListGallery(PagedRequest[BlueprintPage]):
@@ -77,10 +77,11 @@ def __init__(
         )
 
     def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
+        self, response: "Payload", _: "Optional[str]" = None
     ) -> "BlueprintPage":
         response = super().process_response(
-            response, nested_keys=["gallery", "component", "blueprintsPage"]
+            response,
+            jq_path=".gallery.component.blueprintsPage",
         )
         return BlueprintPage(
             blueprints=[

indico/queries/submission.py

@@ -150,7 +150,7 @@ def __init__(
         )
 
     def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
+        self, response: "Payload", _: "Optional[str]" = None
     ) -> "List[Submission]":
         return [
             Submission(**s)

indico/queries/usermetrics.py

@@ -119,7 +119,7 @@ def __init__(
         super().__init__(self.query, variables=variables)
 
     def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
+        self, response: "Payload", _: "Optional[str]" = None
     ) -> "List[UserSnapshot]":
         return _PagedUserSnapshots(
             **super().parse_payload(response)["userSnapshot"]
@@ -181,7 +181,7 @@ def __init__(
         super().__init__(self.query, variables=variables)
 
     def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
+        self, response: "Payload", _: "Optional[str]" = None
     ) -> "List[UserChangelog]":
         return _PagedUserChangelog(
             **super().parse_payload(response)["userChangelog"]