UncountablePythonSDK 0.0.111__tar.gz → 0.0.112__tar.gz

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/.github/workflows/documentation.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up UV
         uses: astral-sh/setup-uv@4db96194c378173c656ce18a155ffc14a9fc4355 # v5
         with:
-          version: "0.6.1"
+          version: "0.7.1"
           python-version: "3.12"
           enable-cache: true
       - name: Install dependencies

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/.github/workflows/publish.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up UV
         uses: astral-sh/setup-uv@4db96194c378173c656ce18a155ffc14a9fc4355 # v5
         with:
-          version: "0.6.1"
+          version: "0.7.1"
           python-version: "3.12"
           enable-cache: true
       - name: Install build dependencies

{uncountablepythonsdk-0.0.111/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.112}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.111
+Version: 0.0.112
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -39,6 +39,7 @@ Requires-Dist: grpcio==1.67.1
 Requires-Dist: protobuf>=4.21.1
 Requires-Dist: azure-storage-blob==12.*
 Requires-Dist: boto3-stubs[essential,ses]==1.*
+Requires-Dist: msgspec==0.19.*
 Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.111
+Version: 0.0.112
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git
@@ -39,6 +39,7 @@ Requires-Dist: grpcio==1.67.1
 Requires-Dist: protobuf>=4.21.1
 Requires-Dist: azure-storage-blob==12.*
 Requires-Dist: boto3-stubs[essential,ses]==1.*
+Requires-Dist: msgspec==0.19.*
 Provides-Extra: test
 Requires-Dist: mypy==1.*; extra == "test"
 Requires-Dist: ruff==0.*; extra == "test"

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ examples/set_recipe_output_file_sdk.py
 examples/upload_files.py
 examples/integration-server/pyproject.toml
 examples/integration-server/jobs/materials_auto/example_cron.py
+examples/integration-server/jobs/materials_auto/example_runsheet_wh.py
 examples/integration-server/jobs/materials_auto/example_wh.py
 examples/integration-server/jobs/materials_auto/profile.yaml
 pkgs/__init__.py
@@ -90,6 +91,8 @@ pkgs/type_spec/parts/base.py.prepart
 pkgs/type_spec/parts/base.ts.prepart
 pkgs/type_spec/type_info/__main__.py
 pkgs/type_spec/type_info/emit_type_info.py
+pkgs/type_spec/ui_entry_actions/__init__.py
+pkgs/type_spec/ui_entry_actions/generate_ui_entry_actions.py
 pkgs/type_spec/value_spec/__init__.py
 pkgs/type_spec/value_spec/__main__.py
 pkgs/type_spec/value_spec/convert_type.py
@@ -310,6 +313,8 @@ uncountable/types/api/recipes/set_recipe_outputs.py
 uncountable/types/api/recipes/set_recipe_tags.py
 uncountable/types/api/recipes/unarchive_recipes.py
 uncountable/types/api/recipes/unlock_recipes.py
+uncountable/types/api/runsheet/__init__.py
+uncountable/types/api/runsheet/complete_async_upload.py
 uncountable/types/api/triggers/__init__.py
 uncountable/types/api/triggers/run_trigger.py
 uncountable/types/api/uploader/__init__.py

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/UncountablePythonSDK.egg-info/requires.txt

@@ -21,6 +21,7 @@ grpcio==1.67.1
 protobuf>=4.21.1
 azure-storage-blob==12.*
 boto3-stubs[essential,ses]==1.*
+msgspec==0.19.*
 
 [test]
 mypy==1.*

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/docs/conf.py

@@ -6,10 +6,10 @@
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
-from datetime import date
+import datetime
 
 project = "Uncountable SDK"
-copyright = f"{date.today().year}, Uncountable Inc"
+copyright = f"{datetime.datetime.now(tz=datetime.UTC).date().year}, Uncountable Inc"
 author = "Uncountable Inc"
 
 # -- General configuration ---------------------------------------------------

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/docs/justfile

@@ -1,5 +1,5 @@
 docs-setup-python:
-  curl -LsSf https://astral.sh/uv/0.6.1/install.sh | sh
+  curl -LsSf https://astral.sh/uv/0.7.1/install.sh | sh
   uv pip install -r requirements.txt
 
 docs-clean:

uncountablepythonsdk-0.0.112/examples/integration-server/jobs/materials_auto/example_runsheet_wh.py

@@ -0,0 +1,35 @@
+from io import BytesIO
+
+from uncountable.core.file_upload import DataFileUpload, FileUpload
+from uncountable.integration.job import JobArguments, RunsheetWebhookJob, register_job
+from uncountable.types import entity_t
+
+
+@register_job
+class StandardRunsheetGenerator(RunsheetWebhookJob):
+    def build_runsheet(
+        self,
+        *,
+        args: JobArguments,
+        entities: list[entity_t.Entity],
+    ) -> FileUpload:
+        args.logger.log_info(f"Generating runsheet for {len(entities)} entities")
+
+        content = []
+        content.append("STANDARD LAB RUNSHEET\n")
+        content.append("=" * 30 + "\n\n")
+
+        for entity in entities:
+            content.append(f"Type: {entity.type}\n")
+            content.append(f"ID: {entity.id}\n")
+
+            if hasattr(entity, "field_values") and entity.field_values:
+                content.append("Field Values:\n")
+                for field in entity.field_values:
+                    content.append(f"  - {field.name}: {field.value}\n")
+
+            content.append("\n")
+
+        runsheet_data = "".join(content).encode("utf-8")
+
+        return DataFileUpload(name="lab_runsheet.txt", data=BytesIO(runsheet_data))

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/examples/integration-server/jobs/materials_auto/profile.yaml

@@ -41,3 +41,12 @@ jobs:
     executor:
       type: script
       import_path: example_wh
+  - id: example_runsheet_wh
+    type: webhook
+    name: Runsheet Webhook
+    signature_key_secret:
+      type: env
+      env_key: WH_RUNSHEET_SIGNATURE_KEY
+    executor:
+      type: script
+      import_path: example_runsheet_wh

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/examples/integration-server/pyproject.toml

@@ -16,7 +16,8 @@ dependencies = [
   "types-requests == 2.*",
   "types-simplejson == 3.*",
   "pandas-stubs",
-  "xlrd == 2.*"
+  "xlrd == 2.*",
+  "msgspec == 0.19.*"
 ]
 
 [tool.mypy]
@@ -221,4 +222,3 @@ max-locals=50
 
 [tool.setuptools]
 py-modules = []
-

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/pkgs/argument_parser/argument_parser.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
 import dataclasses
+import datetime
 import math
 import types
 import typing
 from abc import ABC, abstractmethod
 from collections import defaultdict
-from datetime import date, datetime
+from datetime import date
 from decimal import Decimal
 from enum import Enum, auto
 from importlib import resources
@@ -335,10 +336,12 @@ def _build_parser_inner(
 
         return parse_int
 
-    if parsed_type is datetime:
+    if parsed_type is datetime.datetime:
 
         def parse_datetime(value: typing.Any) -> T:
-            if context.options.allow_direct_type and isinstance(value, datetime):
+            if context.options.allow_direct_type and isinstance(
+                value, datetime.datetime
+            ):
                 return value  # type: ignore
             return dateutil.parser.isoparse(value)  # type:ignore
 

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/pkgs/type_spec/emit_python.py

@@ -5,7 +5,7 @@ from decimal import Decimal
 from typing import Any
 
 from . import builder, util
-from .builder import EndpointEmitType, EndpointSpecificPath
+from .builder import EndpointEmitType, EndpointSpecificPath, base_namespace_name
 from .config import PythonConfig
 from .cross_output_links import get_path_links
 from .emit_open_api_util import EmitOpenAPIStabilityLevel
@@ -907,13 +907,19 @@ def _emit_type(ctx: Context, stype: builder.SpecType) -> None:
 
     # Emit dataclass decorator
     dataclass = "@dataclasses.dataclass"
-    dc_args = []
+    refer_to(
+        ctx,
+        builder.SpecTypeDefnAlias(
+            namespace=ctx.builder.namespaces[base_namespace_name], name="ENABLE_SLOTS"
+        ),
+    )
+    dc_args = ["slots=base_t.ENABLE_SLOTS"]
     if stype.is_kw_only():
         dc_args.append("kw_only=True")
     if stype.is_hashable:
         dc_args.extend(["frozen=True", "eq=True"])
     if len(dc_args) > 0:
-        dataclass += f"({', '.join(dc_args)})"
+        dataclass += f"({', '.join(dc_args)})  # type: ignore[literal-required]"
 
     ctx.out.write(f"{dataclass}\n")
     ctx.out.write(class_out.getvalue())

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/pkgs/type_spec/emit_typescript_util.py

@@ -103,7 +103,7 @@ def emit_value_ts(
     elif isinstance(stype, builder.SpecTypeDefnStringEnum):
         return f"{refer_to(ctx, stype)}.{ts_enum_name(value, stype.name_case)}"
 
-    raise Exception("invalid constant type", value, stype)
+    raise Exception("invalid constant type", value, stype, type(stype))
 
 
 def emit_type_ts(ctx: EmitTypescriptContext, stype: builder.SpecType) -> None:
@@ -266,3 +266,18 @@ def emit_namespace_imports_ts(
         )
         import_from = f"{import_path}{resolve_namespace_name(ns)}"
         out.write(f'import * as {import_as} from "{import_from}"\n')  # noqa: E501
+
+
+def emit_namespace_imports_from_root_ts(
+    namespaces: set[builder.SpecNamespace],
+    out: io.StringIO,
+    root: str,
+) -> None:
+    for ns in sorted(
+        namespaces,
+        key=lambda name: resolve_namespace_name(name),
+    ):
+        import_as = resolve_namespace_ref(ns)
+        out.write(
+            f'import * as {import_as} from "{root}/{resolve_namespace_name(ns)}"\n'
+        )  # noqa: E501

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/pkgs/type_spec/parts/base.py.prepart

@@ -28,6 +28,10 @@ REF_NAME_STRICT_REGEX = rf"{REF_NAME_STRICT_REGEX_STRING}"
 ID_REGEX = r"-?[1-9][0-9]{0,20}"
 
 
+# ENABLE_SLOTS should be removed after slots have been tested locally
+import os
+ENABLE_SLOTS = os.environ.get("UNC_ENABLE_DATACLASS_SLOTS") == "true"
+
 if TYPE_CHECKING:
     JsonValue = Union[JsonScalar, Mapping[str, "JsonValue"], Sequence["JsonValue"]]
     ExtJsonValue = JsonValue

uncountablepythonsdk-0.0.112/pkgs/type_spec/ui_entry_actions/__init__.py

@@ -0,0 +1,4 @@
+# CLOSED MODULE
+from .generate_ui_entry_actions import (
+    generate_entry_actions_typescript as generate_entry_actions_typescript,
+)

uncountablepythonsdk-0.0.112/pkgs/type_spec/ui_entry_actions/generate_ui_entry_actions.py

@@ -0,0 +1,294 @@
+import json
+from dataclasses import dataclass
+from io import StringIO
+from pathlib import Path
+from typing import assert_never
+
+from main.base.types import (
+    ui_entry_actions_t,
+)
+from pkgs.argument_parser import snake_to_camel_case
+from pkgs.serialization_util import serialize_for_api
+from pkgs.type_spec import emit_typescript_util
+from pkgs.type_spec.builder import (
+    BaseTypeName,
+    NameCase,
+    RawDict,
+    SpecBuilder,
+    SpecNamespace,
+    SpecTypeDefnObject,
+)
+from pkgs.type_spec.config import Config
+from pkgs.type_spec.load_types import load_types
+from pkgs.type_spec.util import rewrite_file
+from pkgs.type_spec.value_spec.convert_type import convert_from_value_spec_type
+
+_INIT_ACTION_INDEX_TYPE_DATA = {
+    "EntryActionInfo<InputT, OutputT>": {
+        "type": BaseTypeName.s_object,
+        "properties": {"inputs": {"type": "InputT"}, "outputs": {"type": "OutputT"}},
+    }
+}
+_TYPES_ROOT = "unc_types"
+
+
+@dataclass(kw_only=True)
+class EntryActionTypeInfo:
+    inputs_type: SpecTypeDefnObject
+    outputs_type: SpecTypeDefnObject
+    name: str
+
+
+def ui_entry_variable_to_type_spec_type(
+    variable: ui_entry_actions_t.UiEntryActionVariable,
+) -> str:
+    match variable:
+        case ui_entry_actions_t.UiEntryActionVariableString():
+            return BaseTypeName.s_string
+        case ui_entry_actions_t.UiEntryActionVariableEntityFields():
+            return "entity.Entity"
+        case _:
+            assert_never(variable)
+
+
+def construct_inputs_type_data(
+    vars: dict[str, ui_entry_actions_t.UiEntryActionVariable],
+) -> RawDict:
+    if len(vars) == 0:
+        return {"type": BaseTypeName.s_object}
+    properties: dict[str, dict[str, str]] = {}
+    for input_name, input_defn in (vars).items():
+        properties[f"{input_name}"] = {
+            "type": ui_entry_variable_to_type_spec_type(input_defn)
+        }
+    return {"type": BaseTypeName.s_object, "properties": properties}
+
+
+def construct_outputs_type_data(
+    vars: dict[str, ui_entry_actions_t.UiEntryActionOutput],
+) -> RawDict:
+    if len(vars) == 0:
+        return {"type": BaseTypeName.s_object}
+    properties: dict[str, dict[str, str]] = {}
+    for output_name, output_defn in (vars).items():
+        # All outputs are optional
+        properties[f"{output_name}"] = {
+            "type": f"Optional<{convert_from_value_spec_type(output_defn.vs_type)}>"
+        }
+    return {"type": BaseTypeName.s_object, "properties": properties}
+
+
+def construct_outputs_type(
+    *,
+    action_scope: ui_entry_actions_t.ActionScope,
+    vars: dict[str, ui_entry_actions_t.UiEntryActionOutput],
+    builder: SpecBuilder,
+    namespace: SpecNamespace,
+) -> SpecTypeDefnObject:
+    stype = SpecTypeDefnObject(
+        namespace=namespace,
+        name=emit_typescript_util.ts_type_name(f"{action_scope}_outputs"),
+    )
+    namespace.types[stype.name] = stype
+    stype.process(
+        builder=builder,
+        data=construct_outputs_type_data(vars=vars),
+    )
+    return stype
+
+
+def construct_inputs_type(
+    *,
+    action_scope: ui_entry_actions_t.ActionScope,
+    vars: dict[str, ui_entry_actions_t.UiEntryActionVariable],
+    builder: SpecBuilder,
+    namespace: SpecNamespace,
+) -> SpecTypeDefnObject:
+    stype = SpecTypeDefnObject(
+        namespace=namespace,
+        name=emit_typescript_util.ts_type_name(f"{action_scope}_inputs"),
+    )
+    stype.process(builder=builder, data=construct_inputs_type_data(vars))
+    namespace.types[stype.name] = stype
+    return stype
+
+
+def _get_types_root(destination_root: Path) -> Path:
+    return destination_root / "types"
+
+
+def emit_imports_ts(
+    namespaces: set[SpecNamespace],
+    out: StringIO,
+) -> None:
+    for ns in sorted(
+        namespaces,
+        key=lambda ns: ns.name,
+    ):
+        import_as = emit_typescript_util.resolve_namespace_ref(ns)
+        import_from = f"{_TYPES_ROOT}/{ns.name}"
+        out.write(f'import * as {import_as} from "{import_from}"\n')
+
+
+def emit_entry_action_definition(
+    *,
+    ctx: emit_typescript_util.EmitTypescriptContext,
+    defn: ui_entry_actions_t.UiEntryActionDefinition,
+    builder: SpecBuilder,
+    action_scope: ui_entry_actions_t.ActionScope,
+) -> EntryActionTypeInfo:
+    inputs_type = construct_inputs_type(
+        action_scope=action_scope,
+        vars=defn.inputs,
+        builder=builder,
+        namespace=ctx.namespace,
+    )
+    outputs_type = construct_outputs_type(
+        action_scope=action_scope,
+        vars=defn.outputs,
+        builder=builder,
+        namespace=ctx.namespace,
+    )
+
+    return EntryActionTypeInfo(
+        inputs_type=inputs_type,
+        outputs_type=outputs_type,
+        name=action_scope,
+    )
+
+
+def emit_query_index(
+    ctx: emit_typescript_util.EmitTypescriptContext,
+    defn_infos: list[EntryActionTypeInfo],
+    index_path: Path,
+    builder: SpecBuilder,
+    definitions: dict[
+        ui_entry_actions_t.ActionScope, ui_entry_actions_t.UiEntryActionDefinition
+    ],
+) -> bool:
+    query_index_type_data = {
+        **_INIT_ACTION_INDEX_TYPE_DATA,
+        "EntityActionTypeLookup": {
+            "type": BaseTypeName.s_object,
+            "properties": {
+                defn_info.name: {
+                    "type": f"EntryActionInfo<{defn_info.inputs_type.name},{defn_info.outputs_type.name}>",
+                    "name_case": NameCase.preserve,
+                }
+                for defn_info in defn_infos
+            },
+        },
+        "InputInfo": {
+            "type": BaseTypeName.s_object,
+            "properties": {
+                "value_spec_var": {"type": "String"},
+                "variable": {"type": "ui_entry_actions.UiEntryActionVariable"},
+            },
+        },
+        "OutputInfo": {
+            "type": BaseTypeName.s_object,
+            "properties": {
+                "name": {"type": "String"},
+                "desc": {"type": "String"},
+                "type": {"type": "value_spec.BaseType"},
+            },
+        },
+        "DefinitionInfo": {
+            "type": BaseTypeName.s_object,
+            "properties": {
+                "inputs": {
+                    "type": "ReadonlyArray<InputInfo>",
+                },
+                "outputs": {
+                    "type": "ReadonlyArray<OutputInfo>",
+                },
+            },
+        },
+    }
+    ctx.namespace.prescan(query_index_type_data)
+    ctx.namespace.process(
+        builder=builder,
+        data=query_index_type_data,
+    )
+
+    defn_lookup_info = {}
+    for scope, defn in definitions.items():
+        inputs = []
+        outputs = []
+        for name, input in defn.inputs.items():
+            inputs.append(
+                serialize_for_api({
+                    "value_spec_var": snake_to_camel_case(name),
+                    "variable": input,
+                })
+            )
+        for name, output in defn.outputs.items():
+            outputs.append(
+                serialize_for_api({
+                    "name": name,
+                    "desc": output.description,
+                    "type": output.vs_type,
+                })
+            )
+        defn_lookup_info[scope] = {"inputs": inputs, "outputs": outputs}
+
+    defn_lookup_out = f"export const DEFINITION_LOOKUP = {json.dumps(defn_lookup_info, sort_keys=True, indent=2)} as const\n\nexport const DEFINITION_LOOKUP_TYPED = DEFINITION_LOOKUP as Record<UiEntryActionsT.ActionScope, DefinitionInfo>\n"
+
+    for stype in ctx.namespace.types.values():
+        emit_typescript_util.emit_type_ts(
+            ctx=ctx,
+            stype=stype,
+        )
+
+    import_buffer = StringIO()
+    emit_typescript_util.emit_namespace_imports_from_root_ts(
+        namespaces=ctx.namespaces,
+        out=import_buffer,
+        root=_TYPES_ROOT,
+    )
+
+    return rewrite_file(
+        content=import_buffer.getvalue() + ctx.out.getvalue() + defn_lookup_out,
+        filename=str(index_path),
+    )
+
+
+def generate_entry_actions_typescript(
+    *,
+    definitions: dict[
+        ui_entry_actions_t.ActionScope, ui_entry_actions_t.UiEntryActionDefinition
+    ],
+    destination_root: Path,
+    materials_type_spec_config: Config,
+) -> None:
+    builder = load_types(materials_type_spec_config)
+    assert builder is not None
+
+    definition_buffer = StringIO()
+    index_namespace = SpecNamespace(name="index")
+    ctx = emit_typescript_util.EmitTypescriptContext(
+        out=definition_buffer,
+        namespace=index_namespace,
+    )
+    builder.namespaces[index_namespace.name] = index_namespace
+
+    defn_infos: list[EntryActionTypeInfo] = []
+
+    for action_scope, defn in definitions.items():
+        defn_infos.append(
+            emit_entry_action_definition(
+                action_scope=action_scope,
+                ctx=ctx,
+                defn=defn,
+                builder=builder,
+            )
+        )
+
+    index_path = _get_types_root(destination_root) / "index.ts"
+    emit_query_index(
+        ctx=ctx,
+        builder=builder,
+        defn_infos=defn_infos,
+        definitions=definitions,
+        index_path=index_path,
+    )

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/pkgs/type_spec/value_spec/convert_type.py

@@ -61,3 +61,16 @@ def convert_to_value_spec_type(parsed: ParsedTypePath) -> value_spec_t.ValueType
     return value_spec_t.ValueType(base_type=mapped.base_type, parameters=parameters)
 
     # Our formatter was duplicating the previous line for an unknown reason, this comment blocks that
+
+
+def convert_from_value_spec_type(
+    base_type: value_spec_t.BaseType,
+) -> str:
+    for type_spec_type, mapped_type in TYPE_MAP.items():
+        if (
+            mapped_type.base_type == base_type
+            and mapped_type.param_count == 0
+            and mapped_type.variable_param_count is False
+        ):
+            return type_spec_type
+    raise ValueError(f"invalid value spec type {base_type}")

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/pyproject.toml

@@ -71,7 +71,8 @@ dependencies = [
     "grpcio == 1.67.1",
     "protobuf >= 4.21.1",
     "azure-storage-blob == 12.*",
-    "boto3-stubs[essential,ses]==1.*"
+    "boto3-stubs[essential,ses]==1.*",
+    "msgspec == 0.19.*"
 ]
 dynamic = ["version"]
 

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/uncountable/core/client.py

@@ -1,8 +1,9 @@
 import base64
+import datetime
 import re
 import typing
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import UTC, timedelta
 from enum import StrEnum
 from io import BytesIO
 from urllib.parse import unquote, urljoin
@@ -145,7 +146,7 @@ class SDKError(Exception):
 @dataclass(kw_only=True)
 class OAuthBearerTokenCache:
     token: str
-    expires_at: datetime
+    expires_at: datetime.datetime
 
 
 @dataclass(kw_only=True)
@@ -274,7 +275,8 @@ class Client(ClientMethods):
         if (
             self._oauth_bearer_token_cache is None
             or (
-                self._oauth_bearer_token_cache.expires_at - datetime.now()
+                self._oauth_bearer_token_cache.expires_at
+                - datetime.datetime.now(tz=UTC)
             ).total_seconds()
             < OAUTH_REFRESH_WINDOW_SECONDS
         ):
@@ -290,7 +292,8 @@ class Client(ClientMethods):
             token_data = oauth_bearer_token_data_parser.parse_storage(data)
             self._oauth_bearer_token_cache = OAuthBearerTokenCache(
                 token=token_data.access_token,
-                expires_at=datetime.now() + timedelta(seconds=token_data.expires_in),
+                expires_at=datetime.datetime.now(tz=UTC)
+                + timedelta(seconds=token_data.expires_in),
             )
 
         return self._oauth_bearer_token_cache.token

{uncountablepythonsdk-0.0.111 → uncountablepythonsdk-0.0.112}/uncountable/integration/executors/generic_upload_executor.py

@@ -1,7 +1,8 @@
+import datetime
 import io
 import os
 import re
-from datetime import datetime, timezone
+from datetime import UTC
 
 import paramiko
 
@@ -164,7 +165,7 @@ def _move_files_post_upload(
     appended_text = ""
 
     if remote_directory_scope.prepend_date_on_archive:
-        appended_text = f"-{datetime.now(timezone.utc).timestamp()}"
+        appended_text = f"-{datetime.datetime.now(UTC).timestamp()}"
 
     for file_path in success_file_paths:
         filename = os.path.split(file_path)[-1]