datajunction 0.0.209__tar.gz → 0.0.211__tar.gz

{datajunction-0.0.209 → datajunction-0.0.211}/.pre-commit-config.yaml

@@ -3,29 +3,27 @@ exclude: ^datajunction-clients/python/dj.project.schema.json
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id: trailing-whitespace
   - id: check-ast
-    exclude: ^templates/
+    exclude: templates/
   - id: check-merge-conflict
   - id: debug-statements
-    exclude: ^templates/
-  - id: requirements-txt-fixer
-    exclude: ^templates/
+    exclude: templates/
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.10
+  rev: v0.15.22
   hooks:
-    - id: ruff
+    - id: ruff-check
       args: [ --fix ]
     - id: ruff-format
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: 'v0.981'  # Use the sha / tag you want to point at
+  rev: 'v2.3.0'  # Use the sha / tag you want to point at
   hooks:
   - id: mypy
-    exclude: ^templates/
+    exclude: templates/
     additional_dependencies:
     - types-requests
     - types-freezegun
@@ -35,20 +33,12 @@ repos:
     - types-tabulate
 
 - repo: https://github.com/asottile/add-trailing-comma
-  rev: v3.1.0
+  rev: v4.0.0
   hooks:
   - id: add-trailing-comma
 
-- repo: https://github.com/kynan/nbstripout
-  rev: 0.6.1
+- repo: https://github.com/asottile/pyupgrade
+  rev: v3.21.2
   hooks:
-    - id: nbstripout
-- repo: https://github.com/tomcatling/black-nb
-  rev: "0.7"
-  hooks:
-    - id: black-nb
-      files: '\.ipynb$'
-- repo: https://github.com/pdm-project/pdm
-  rev: 2.6.1
-  hooks:
-    - id: pdm-lock-check
+  - id: pyupgrade
+    args: [--py311-plus]

{datajunction-0.0.209 → datajunction-0.0.211}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datajunction
-Version: 0.0.209
+Version: 0.0.211
 Summary: DataJunction client library for connecting to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>
@@ -8,10 +8,10 @@ License: MIT
 License-File: LICENSE.txt
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: <4.0,>=3.10
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: <4.0,>=3.11
 Requires-Dist: alive-progress>=3.1.2
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: pandas>=2.0.2

{datajunction-0.0.209 → datajunction-0.0.211}/datajunction/__about__.py

@@ -2,4 +2,4 @@
 Version for Hatch
 """
 
-__version__ = "0.0.209"
+__version__ = "0.0.211"

{datajunction-0.0.209 → datajunction-0.0.211}/datajunction/_base.py

@@ -1,15 +1,17 @@
 """Base client dataclasses."""
 
+from __future__ import annotations
+
+import sys
 from dataclasses import MISSING, fields, is_dataclass
 from types import UnionType
 from typing import (
     TYPE_CHECKING,
     Any,
-    Dict,
-    Optional,
-    Type,
+    Self,
     TypeVar,
     Union,
+    cast,
     get_args,
     get_origin,
 )
@@ -28,22 +30,25 @@ class SerializableMixin:  # pylint: disable=too-few-public-methods
 
     @staticmethod
     def _serialize_nested(
-        field_type: Type,
+        field_type: type,
         field_value: Any,
-        dj_client: Optional["DJClient"],
+        dj_client: DJClient | None,
     ):
         """
         Handle nested field serialization
         """
         if is_dataclass(field_type) and isinstance(field_value, dict):
-            return field_type.from_dict(dj_client, field_value)
+            return cast(type[SerializableMixin], field_type).from_dict(
+                dj_client,
+                field_value,
+            )
         return field_value
 
     @staticmethod
     def _serialize_list(
-        field_type: Type,
+        field_type: type,
         field_value: Any,
-        dj_client: Optional["DJClient"],
+        dj_client: DJClient | None,
     ):
         """
         Handle serialization of lists of both primitive and dataclass object types
@@ -74,10 +79,10 @@ class SerializableMixin:  # pylint: disable=too-few-public-methods
 
     @classmethod
     def from_dict(
-        cls: Type[T],
-        dj_client: Optional["DJClient"],
-        data: Dict[str, Any],
-    ) -> T:
+        cls,
+        dj_client: DJClient | None,
+        data: dict[str, Any],
+    ) -> Self:
         """
         Create an instance of the given dataclass `cls` from a dictionary `data`.
         This will handle nested dataclasses and optional types.
@@ -90,14 +95,26 @@ class SerializableMixin:  # pylint: disable=too-few-public-methods
             if field.name == "dj_client":
                 continue
 
-            # Resolve optional types to their inner type
+            # `from __future__ import annotations` makes `field.type` a string;
+            # evaluate it in the defining module's namespace to get the real
+            # type. Forward refs only importable under TYPE_CHECKING (e.g. a
+            # "DJBuilder" used solely for static typing) can't be resolved
+            # here, so fall back to the raw string and skip nested conversion.
             field_type = field.type
+            if isinstance(field_type, str):
+                try:
+                    field_type = eval(  # pylint: disable=eval-used
+                        field_type,
+                        vars(sys.modules[cls.__module__]),
+                        None,
+                    )
+                except NameError:  # pragma: no cover
+                    pass
+
             origin = get_origin(field_type)
             if origin in (Union, UnionType):
                 field_type = next(  # pragma: no cover
-                    typ
-                    for typ in get_args(field_type)
-                    if typ is not type(None)  # noqa
+                    typ for typ in get_args(field_type) if typ is not type(None)
                 )
 
             # Serialize field value
@@ -118,6 +135,6 @@ class SerializableMixin:  # pylint: disable=too-few-public-methods
                 field.name not in field_values or field_values[field.name] is None
             ) and field.default is not MISSING:
                 field_values[field.name] = field.default
-        if is_dataclass(cls) and "dj_client" in cls.__dataclass_fields__.keys():  # type: ignore
+        if is_dataclass(cls) and "dj_client" in cls.__dataclass_fields__:  # type: ignore
             return cls(dj_client=dj_client, **field_values)  # type: ignore
         return cls(**field_values)

{datajunction-0.0.209 → datajunction-0.0.211}/datajunction/_internal.py

@@ -5,7 +5,7 @@ import logging
 import os
 import platform
 from dataclasses import asdict, dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, TypedDict, Union
+from typing import TYPE_CHECKING, Any, TypedDict, Union
 from urllib.parse import urljoin
 
 import pandas as pd
@@ -49,8 +49,8 @@ class Results(TypedDict):
     Results in a completed DJ Query
     """
 
-    columns: Tuple[str]
-    data: Tuple[Tuple]
+    columns: tuple[str]
+    data: tuple[tuple]
 
 
 class RequestsSessionWithEndpoint(requests.Session):  # pragma: no cover
@@ -59,7 +59,7 @@ class RequestsSessionWithEndpoint(requests.Session):  # pragma: no cover
     subsequent requests will use as a prefix.
     """
 
-    def __init__(self, endpoint: str = None, show_traceback: bool = False):
+    def __init__(self, endpoint: str | None = None, show_traceback: bool = False):
         super().__init__()
         self.endpoint = endpoint
         self.mount("http://", HTTPAdapter())
@@ -137,9 +137,9 @@ class DJClient:
     def __init__(  # pylint: disable=too-many-arguments
         self,
         uri: str = "http://localhost:8000",
-        engine_name: str = None,
-        engine_version: str = None,
-        requests_session: RequestsSessionWithEndpoint = None,
+        engine_name: str | None = None,
+        engine_version: str | None = None,
+        requests_session: RequestsSessionWithEndpoint | None = None,
         target_namespace: str = DEFAULT_NAMESPACE,
         timeout: int = 2 * 60,
         debug: bool = False,
@@ -174,8 +174,8 @@ class DJClient:
 
     def basic_login(
         self,
-        username: Optional[str] = None,
-        password: Optional[str] = None,
+        username: str | None = None,
+        password: str | None = None,
     ):
         """
         Login with basic authentication.
@@ -189,7 +189,7 @@ class DJClient:
         )
         return response
 
-    def deploy(self, deployment_spec: Dict[str, Any]):
+    def deploy(self, deployment_spec: dict[str, Any]):
         """
         Deploy a deployment spec to the target namespace.
         """
@@ -215,7 +215,7 @@ class DJClient:
         namespace: str,
         git_branch: str | None = None,
         parent_namespace: str | None = None,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """
         Set git metadata (branch, parent namespace) on a namespace.
         Creates the namespace if it does not exist yet.
@@ -232,7 +232,7 @@ class DJClient:
         )
         return response.json()
 
-    def get_deployment_impact(self, deployment_spec: Dict[str, Any]):
+    def get_deployment_impact(self, deployment_spec: dict[str, Any]):
         """
         Get impact analysis for a deployment spec without deploying.
         """
@@ -244,7 +244,7 @@ class DJClient:
         return response.json()
 
     @staticmethod
-    def _primary_key_from_columns(columns) -> List[str]:
+    def _primary_key_from_columns(columns) -> list[str]:
         """
         Extracts the primary key from the columns
         """
@@ -292,7 +292,7 @@ class DJClient:
     def _get_nodes_in_namespace(
         self,
         namespace: str,
-        type_: Optional[models.NodeType] = None,
+        type_: models.NodeType | None = None,
     ):
         """
         Retrieves all nodes in given namespace.
@@ -308,7 +308,7 @@ class DJClient:
 
     def _get_all_nodes(
         self,
-        type_: Optional[models.NodeType] = None,
+        type_: models.NodeType | None = None,
     ):
         """
         Retrieve all nodes of a given type.
@@ -321,8 +321,8 @@ class DJClient:
     def _verify_node_exists(
         self,
         node_name: str,
-        type_: Optional[str] = None,
-    ) -> Dict[str, Any]:
+        type_: str | None = None,
+    ) -> dict[str, Any]:
         """
         Retrieves a node and verifies that it exists and has the expected node type.
         """
@@ -351,7 +351,7 @@ class DJClient:
     def _create_node(
         self,
         node: "Node",
-        mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
+        mode: models.NodeMode | None = models.NodeMode.PUBLISHED,
     ):
         """
         Helper function to create a node.
@@ -439,7 +439,7 @@ class DJClient:
         node_name: str,
         column_name: str,
         dimension_name: str,
-        dimension_column: Optional[str],
+        dimension_column: str | None,
     ):
         """
         Helper function to link a dimension to the node.
@@ -460,7 +460,7 @@ class DJClient:
         node_column: str,
         dimension_node: str,
         dimension_column: str,
-        role: Optional[str] = None,
+        role: str | None = None,
     ):
         """
         Helper function to link a dimension to the node.
@@ -481,12 +481,12 @@ class DJClient:
         self,
         node_name: str,
         dimension_node: str,
-        join_type: Optional[str] = None,
+        join_type: str | None = None,
         *,
         join_on: str,
-        join_cardinality: Optional[str] = None,
-        role: Optional[str] = None,
-        spark_hints: Optional[str] = None,
+        join_cardinality: str | None = None,
+        role: str | None = None,
+        spark_hints: str | None = None,
     ):
         """
         Helper function to link a complex dimension to the node.
@@ -511,7 +511,7 @@ class DJClient:
         node_name: str,
         column_name: str,
         dimension_name: str,
-        dimension_column: Optional[str] = None,
+        dimension_column: str | None = None,
     ):
         """
         Helper function to un-link a dimension to the node.
@@ -527,7 +527,7 @@ class DJClient:
         self,
         node_name: str,
         dimension_node: str,
-        role: Optional[str] = None,
+        role: str | None = None,
     ):
         """
         Helper function to remove a complex dimension link.
@@ -605,7 +605,7 @@ class DJClient:
         self,
         node_name,
         column_name,
-        attributes: List[models.ColumnAttribute],
+        attributes: list[models.ColumnAttribute],
     ):
         """
         Sets attributes for columns on the node
@@ -669,7 +669,7 @@ class DJClient:
     def _export_namespace_yaml_zip(
         self,
         namespace: str,
-        existing_zip_bytes: Optional[bytes] = None,
+        existing_zip_bytes: bytes | None = None,
     ) -> bytes:
         """
         Export a namespace as a ZIP of YAML files.
@@ -698,7 +698,7 @@ class DJClient:
         """
         return self._session.patch(f"/tags/{tag_name}/", json=asdict(update_input))
 
-    def _update_node_tags(self, node_name: str, tags: Optional[List[str]]):
+    def _update_node_tags(self, node_name: str, tags: list[str] | None):
         """
         Update tags on a node
         """
@@ -738,7 +738,7 @@ class DJClient:
     def _list_nodes_with_tag(
         self,
         tag_name: str,
-        node_type: Optional[models.NodeType] = None,
+        node_type: models.NodeType | None = None,
     ):
         """
         Retrieves all nodes with a given tag.

{datajunction-0.0.209 → datajunction-0.0.211}/datajunction/admin.py

@@ -1,7 +1,6 @@
 """DataJunction admin client module."""
 
 import logging
-from typing import Optional
 
 from datajunction.builder import DJBuilder
 from datajunction.exceptions import DJClientException
@@ -66,8 +65,8 @@ class DJAdmin(DJBuilder):  # pylint: disable=too-many-public-methods
         self,
         name: str,
         version: str,
-        uri: Optional[str] = None,
-        dialect: Optional[str] = None,
+        uri: str | None = None,
+        dialect: str | None = None,
         skip_if_exists: bool = False,
     ) -> None:
         """

{datajunction-0.0.209 → datajunction-0.0.211}/datajunction/builder.py

@@ -4,7 +4,6 @@
 import re
 from dataclasses import fields
 from http import HTTPStatus
-from typing import Dict, List, Optional
 
 from datajunction import models
 from datajunction.client import DJClient
@@ -142,7 +141,7 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         branch_info = data["branch"]
         return Namespace(namespace=branch_info["namespace"], dj_client=self)
 
-    def list_branches(self, namespace: str) -> List[BranchInfo]:
+    def list_branches(self, namespace: str) -> list[BranchInfo]:
         """List all branch namespaces under a git root namespace."""
         response = self._session.get(
             f"/namespaces/{namespace}/branches",
@@ -198,8 +197,8 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         namespace: str,
         github_repo_path: str,
         default_branch: str,
-        git_path: Optional[str] = None,
-        git_only: Optional[bool] = None,
+        git_path: str | None = None,
+        git_only: bool | None = None,
     ) -> GitConfig:
         """Initialize git configuration on a root namespace.
 
@@ -268,7 +267,7 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
     def make_node_of_type(
         self,
         type_: models.NodeType,
-        data: Dict,
+        data: dict,
     ):
         """
         Make a new node of the given type.
@@ -305,7 +304,7 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         self,
         type_: models.NodeType,
         name: str,
-        data: Dict,
+        data: dict,
         update_if_exists: bool = False,
     ):
         """
@@ -401,15 +400,15 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
     def create_source(  # pylint: disable=too-many-arguments
         self,
         name: str,
-        catalog: Optional[str] = None,
-        schema: Optional[str] = None,
-        table: Optional[str] = None,
-        display_name: Optional[str] = None,
-        description: Optional[str] = None,
-        columns: Optional[List["models.ColumnYAML"]] = None,
-        primary_key: Optional[List[str]] = None,
-        tags: Optional[List[str]] = None,
-        mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
+        catalog: str | None = None,
+        schema: str | None = None,
+        table: str | None = None,
+        display_name: str | None = None,
+        description: str | None = None,
+        columns: list["models.ColumnYAML"] | None = None,
+        primary_key: list[str] | None = None,
+        tags: list[str] | None = None,
+        mode: models.NodeMode | None = models.NodeMode.PUBLISHED,
         update_if_exists: bool = False,
     ) -> "Source":
         """
@@ -522,13 +521,13 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
     def create_transform(  # pylint: disable=too-many-arguments
         self,
         name: str,
-        query: Optional[str] = None,
-        description: Optional[str] = None,
-        display_name: Optional[str] = None,
-        primary_key: Optional[List[str]] = None,
-        tags: Optional[List[str]] = None,
-        mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
-        custom_metadata: Optional[Dict] = None,
+        query: str | None = None,
+        description: str | None = None,
+        display_name: str | None = None,
+        primary_key: list[str] | None = None,
+        tags: list[str] | None = None,
+        mode: models.NodeMode | None = models.NodeMode.PUBLISHED,
+        custom_metadata: dict | None = None,
         update_if_exists: bool = False,
     ) -> "Transform":
         """
@@ -556,12 +555,12 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
     def create_dimension(  # pylint: disable=too-many-arguments
         self,
         name: str,
-        query: Optional[str] = None,
-        primary_key: Optional[List[str]] = None,
-        description: Optional[str] = None,
-        display_name: Optional[str] = None,
-        tags: Optional[List[str]] = None,
-        mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
+        query: str | None = None,
+        primary_key: list[str] | None = None,
+        description: str | None = None,
+        display_name: str | None = None,
+        tags: list[str] | None = None,
+        mode: models.NodeMode | None = models.NodeMode.PUBLISHED,
         update_if_exists: bool = False,
     ) -> "Dimension":
         """
@@ -588,17 +587,17 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
     def create_metric(  # pylint: disable=too-many-arguments
         self,
         name: str,
-        query: Optional[str] = None,
-        description: Optional[str] = None,
-        display_name: Optional[str] = None,
-        required_dimensions: Optional[List[str]] = None,
-        direction: Optional[models.MetricDirection] = None,
-        unit: Optional[models.MetricUnit] = None,
+        query: str | None = None,
+        description: str | None = None,
+        display_name: str | None = None,
+        required_dimensions: list[str] | None = None,
+        direction: models.MetricDirection | None = None,
+        unit: models.MetricUnit | None = None,
         significant_digits: int | None = None,
         min_decimal_exponent: int | None = None,
         max_decimal_exponent: int | None = None,
-        tags: Optional[List[str]] = None,
-        mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
+        tags: list[str] | None = None,
+        mode: models.NodeMode | None = models.NodeMode.PUBLISHED,
         update_if_exists: bool = False,
     ) -> "Metric":
         """
@@ -638,14 +637,14 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
     def create_cube(  # pylint: disable=too-many-arguments
         self,
         name: str,
-        metrics: Optional[List[str]] = None,
-        dimensions: Optional[List[str]] = None,
-        filters: Optional[List[str]] = None,
-        description: Optional[str] = None,
-        display_name: Optional[str] = None,
-        mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
-        tags: Optional[List[str]] = None,
-        custom_metadata: Optional[Dict] = None,
+        metrics: list[str] | None = None,
+        dimensions: list[str] | None = None,
+        filters: list[str] | None = None,
+        description: str | None = None,
+        display_name: str | None = None,
+        mode: models.NodeMode | None = models.NodeMode.PUBLISHED,
+        tags: list[str] | None = None,
+        custom_metadata: dict | None = None,
         update_if_exists: bool = False,
     ) -> "Cube":
         """
@@ -674,8 +673,8 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
     def create_tag(  # pylint: disable=too-many-arguments
         self,
         name: str,
-        description: Optional[str],
-        tag_metadata: Dict,
+        description: str | None,
+        tag_metadata: dict,
         tag_type: str,
         update_if_exists: bool = False,
     ) -> Tag: