UncountablePythonSDK 0.0.162__tar.gz → 0.0.163__tar.gz

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.162
+Version: 0.0.163
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/UncountablePythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.162
+Version: 0.0.163
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ docs/conf.py
 docs/index.md
 docs/justfile
 docs/requirements.txt
+docs/integration_examples/add_file_to_folder.md
 docs/integration_examples/create_ingredient.md
 docs/integration_examples/create_output.md
 docs/integration_examples/index.md
@@ -58,6 +59,7 @@ pkgs/argument_parser/_is_enum.py
 pkgs/argument_parser/_is_namedtuple.py
 pkgs/argument_parser/argument_parser.py
 pkgs/argument_parser/case_convert.py
+pkgs/argument_parser/parser_error.py
 pkgs/filesystem_utils/__init__.py
 pkgs/filesystem_utils/_blob_session.py
 pkgs/filesystem_utils/_file_share_session.py

uncountablepythonsdk-0.0.163/docs/integration_examples/add_file_to_folder.md

@@ -0,0 +1,57 @@
+# Add a File to a Folder
+
+This is a two-step workflow: first upload the file using `upload_files`, then place it in a target folder using `add_file_to_folder`.
+
+## Step 1: Upload the file
+
+```{code-block} python
+from io import BytesIO
+from pathlib import Path
+
+from uncountable.core import AuthDetailsApiKey, Client
+from uncountable.core.client import ClientConfig
+from uncountable.core.file_upload import DataFileUpload, UploadedFile
+
+client: Client = Client(
+    base_url="<BASE_URL>",
+    auth_details=AuthDetailsApiKey(
+        api_id="<API_ID>", api_secret_key="<API_SECRET_KEY>"
+    ),
+    config=ClientConfig(allow_insecure_tls=False),
+)
+
+filepath = Path("<YOUR_FILE_PATH>")
+file_io: BytesIO = BytesIO(filepath.read_bytes())
+
+upload_file_response: list[UploadedFile] = client.upload_files(
+    file_uploads=[DataFileUpload(data=file_io, name=filepath.name)]
+)
+
+file_id = upload_file_response[0].file_id
+```
+
+## Step 2: Add the file to a folder
+
+```{code-block} python
+from uncountable.types import identifier_t
+
+response = client.add_file_to_folder(
+    file_id=file_id,
+    folder_key=identifier_t.IdentifierKeyId(id=<FOLDER_ID>),
+)
+```
+
+Example Response:
+```{code}
+Data(modification_made=True, result_id=4521, entity=Entity(id=892, type=<EntityType.FILE_FOLDER_MEMBERSHIP: 'file_folder_membership'>), result_values=None)
+```
+
+To add the file to the root folder instead of a specific folder:
+
+```{code-block} python
+response = client.add_file_to_folder(
+    file_id=file_id,
+    folder_key=identifier_t.IdentifierKeyRefName(ref_name="root"),
+)
+```
+

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/docs/integration_examples/index.md

@@ -1,6 +1,7 @@
 # Integration Examples
 
 ```{toctree}
+add_file_to_folder
 create_ingredient
 create_output
 upload_file

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/pkgs/argument_parser/__init__.py

@@ -1,11 +1,8 @@
 from ._is_enum import is_string_enum_class as is_string_enum_class
 from .argument_parser import CachedParser as CachedParser
 from .argument_parser import ParserBase as ParserBase
-from .argument_parser import ParserError as ParserError
-from .argument_parser import ParserExtraFieldsError as ParserExtraFieldsError
 from .argument_parser import ParserFunction as ParserFunction
 from .argument_parser import ParserOptions as ParserOptions
-from .argument_parser import ParserTypeError as ParserTypeError
 from .argument_parser import SourceEncoding as SourceEncoding
 from .argument_parser import build_parser as build_parser
 from .argument_parser import is_missing as is_missing
@@ -14,3 +11,6 @@ from .argument_parser import is_union as is_union
 from .case_convert import camel_to_snake_case as camel_to_snake_case
 from .case_convert import kebab_to_pascal_case as kebab_to_pascal_case
 from .case_convert import snake_to_camel_case as snake_to_camel_case
+from .parser_error import ParserError as ParserError
+from .parser_error import ParserExtraFieldsError as ParserExtraFieldsError
+from .parser_error import ParserTypeError as ParserTypeError

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/pkgs/argument_parser/argument_parser.py

@@ -26,6 +26,7 @@ from pkgs.serialization import (
 from ._is_enum import is_string_enum_class
 from ._is_namedtuple import is_namedtuple_type
 from .case_convert import camel_to_snake_case, snake_to_camel_case
+from .parser_error import ParserError, ParserExtraFieldsError, ParserTypeError
 
 T = typing.TypeVar("T")
 ParserFunction = typing.Callable[[typing.Any], T]
@@ -72,22 +73,6 @@ class ParserContext:
     cache: ParserCache
 
 
-class ParserError(BaseException): ...
-
-
-class ParserExtraFieldsError(ParserError):
-    extra_fields: set[str]
-
-    def __init__(self, extra_fields: set[str]) -> None:
-        self.extra_fields = extra_fields
-
-    def __str__(self) -> str:
-        return f"extra fields were provided: {', '.join(self.extra_fields)}"
-
-
-class ParserTypeError(ParserError): ...
-
-
 def is_union(field_type: typing.Any) -> bool:
     origin = typing.get_origin(field_type)
     return origin is typing.Union or origin is types.UnionType
@@ -152,8 +137,10 @@ def _invoke_fallback_parsers(
         except Exception as e:
             exceptions.append(e)
             continue
-    raise ValueError(
-        f"Unhandled value {value} cannot be cast to a member of {original_type}"
+    raise ParserError(
+        f"Unhandled value {value} cannot be cast to a member of {original_type}",
+        value=value,
+        expected_type=original_type,
     ) from ExceptionGroup("Fallback Parser Exception", exceptions)
 
 
@@ -169,7 +156,9 @@ def _invoke_membership_parser(
         if value == test_value:
             return test_value
 
-    raise ValueError(f"Expected value from {expected_values} but got value {value}")
+    raise ParserError(
+        f"Expected value from {expected_values} but got value {value}", value=value
+    )
 
 
 # Uses `is` to compare
@@ -179,8 +168,10 @@ def _build_identity_parser(
     def parse(value: typing.Any) -> T:
         if value is identity_value:
             return identity_value
-        raise ValueError(
-            f"Expected value {identity_value} (type: {type(identity_value)}) but got value {value} (type: {type(value)})"
+        raise ParserError(
+            f"Expected value {identity_value} (type: {type(identity_value)}) but got value {value} (type: {type(value)})",
+            value=value,
+            expected_type=type(identity_value),
         )
 
     return parse
@@ -206,12 +197,12 @@ def _build_parser_discriminated_union(
         else:
             discriminant = value.get(discriminator)
         if discriminant is None:
-            raise ValueError("missing-union-discriminant")
+            raise ParserError("missing-union-discriminant")
         if not isinstance(discriminant, str):
-            raise ValueError("union-discriminant-is-not-string")
+            raise ParserError("union-discriminant-is-not-string", value=discriminant)
         parser = discriminator_map.get(discriminant)
         if parser is None:
-            raise ValueError("missing-type-for-union-discriminant", discriminant)
+            raise ParserError("missing-type-for-union-discriminant", value=discriminant)
         return parser(value)
 
     return parse
@@ -384,18 +375,22 @@ def _build_parser_inner(
     if origin in (list, set):
         args = typing.get_args(parsed_type)
         if len(args) != 1:
-            raise ValueError("List types only support one argument")
+            raise ParserError(
+                "List types only support one argument", expected_type=parsed_type
+            )
         arg_parser = _build_parser_inner(args[0], context, type_var_map)
 
         def parse_element(value: typing.Any) -> typing.Any:
             try:
                 return arg_parser(value)
             except Exception as e:
-                raise ValueError("Failed to parse element", value) from e
+                raise ParserError("Failed to parse element", value=value) from e
 
         def parse(value: typing.Any) -> typing.Any:
             if not isinstance(value, list):
-                raise ValueError("value is not a list", parsed_type)
+                raise ParserError(
+                    "value is not a list", value=value, expected_type=parsed_type
+                )
             return origin(parse_element(x) for x in value)
 
         return parse
@@ -403,7 +398,10 @@ def _build_parser_inner(
     if origin is dict:
         args = typing.get_args(parsed_type)
         if len(args) != 2:
-            raise ValueError("Dict types only support two arguments for now")
+            raise ParserError(
+                "Dict types only support two arguments for now",
+                expected_type=parsed_type,
+            )
         k_inner_parser = _build_parser_inner(
             args[0],
             context,
@@ -479,7 +477,11 @@ def _build_parser_inner(
                 return value  # type: ignore
             if isinstance(value, (float, int)):
                 return str(value)  # type: ignore
-            raise ValueError(f"Invalid string value: {type(value)}: {value}")
+            raise ParserError(
+                f"Invalid string value: {type(value)}: {value}",
+                value=value,
+                expected_type=str,
+            )
 
         return parse_str
 
@@ -488,7 +490,11 @@ def _build_parser_inner(
         def parse_as_numeric_type(value: typing.Any) -> T:
             numeric_value: Decimal | float = parsed_type(value)  # type: ignore
             if math.isnan(numeric_value):
-                raise ValueError(f"Invalid numeric value: {numeric_value}")
+                raise ParserError(
+                    f"Invalid numeric value: {numeric_value}",
+                    value=numeric_value,
+                    expected_type=parsed_type,
+                )
 
             return numeric_value  # type: ignore
 
@@ -500,7 +506,7 @@ def _build_parser_inner(
     if parsed_type is MissingSentryType:
 
         def error(value: typing.Any) -> T:
-            raise ValueError("Missing type cannot be parsed directly")
+            raise ParserError("Missing type cannot be parsed directly")
 
         return error
 
@@ -519,7 +525,9 @@ def _build_parser_inner(
             type_var_map,
         )
 
-    raise ValueError(f"Unhandled type {parsed_type}/{origin}")
+    raise ParserError(
+        f"Unhandled type {parsed_type}/{origin}", expected_type=parsed_type
+    )
 
 
 # Take in map of parameter name to materialized type
@@ -583,7 +591,9 @@ def _build_parser_dataclass(
                 field_value: typing.Any
                 if field_raw_value == dataclasses.MISSING:
                     if serial_class_data.has_parse_require(field.name):
-                        raise ValueError("missing-required-field", field.name)
+                        raise ParserError(
+                            "missing-required-field", field_name=field.name
+                        )
                     if _has_field_default(field):
                         field_value = _get_field_default(field)
                     elif is_missing(field_type):
@@ -596,7 +606,9 @@ def _build_parser_dataclass(
                         # Backwards compatibilty to dataclasses that didn't set a default value
                         field_value = False
                     else:
-                        raise ValueError("missing-value-for-field", field.name)
+                        raise ParserError(
+                            "missing-value-for-field", field_name=field.name
+                        )
                 elif (
                     field_raw_value is None
                     and not is_optional(field_type)
@@ -612,8 +624,10 @@ def _build_parser_dataclass(
                 data[field.name] = field_value
 
             except Exception as e:
-                raise ValueError(
-                    f"unable-to-parse-field:{field.name}", field_raw_value
+                raise ParserError(
+                    f"unable-to-parse-field:{field.name}",
+                    field_name=field.name,
+                    value=field_raw_value,
                 ) from e
 
         if context.options.strict_property_parsing:

uncountablepythonsdk-0.0.163/pkgs/argument_parser/parser_error.py

@@ -0,0 +1,60 @@
+from __future__ import annotations
+
+import typing
+
+_UNSET = object()
+
+
+class ParserError(ValueError):
+    """Raised when argument parsing fails. Carries structured context about the failure."""
+
+    def __init__(
+        self,
+        message: str,
+        *,
+        value: typing.Any = _UNSET,
+        expected_type: typing.Any = None,
+        field_name: str | None = None,
+    ) -> None:
+        self.error_message = message
+        self.value = value
+        self.expected_type = expected_type
+        self.field_name = field_name
+        super().__init__(message)
+
+    def error_chain(self) -> list[ParserError]:
+        errors: list[ParserError] = []
+        current: BaseException | None = self
+        while isinstance(current, ParserError):
+            errors.append(current)
+            current = current.__cause__
+        return errors
+
+    def format_error_chain(self) -> str:
+        messages: list[str] = []
+        current: BaseException | None = self
+        while current is not None:
+            if isinstance(current, ParserError):
+                messages.append(current.error_message)
+                current = current.__cause__
+            else:
+                messages.append(str(current))
+                break
+
+        if len(messages) <= 1:
+            return self.error_message
+
+        return " → ".join(messages)
+
+
+class ParserExtraFieldsError(ParserError):
+    extra_fields: set[str]
+
+    def __init__(self, extra_fields: set[str]) -> None:
+        self.extra_fields = extra_fields
+        super().__init__(
+            f"extra fields were provided: {', '.join(extra_fields)}",
+        )
+
+
+class ParserTypeError(ParserError): ...

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/uncountable/core/query/column.py

@@ -294,7 +294,7 @@ class BooleanColumn[
     ) -> ColumnFilter:
         return ColumnFilter(
             identifier=self.identifier,
-            filter=lambda x: listing_t.FilterSpecEquals(column=x, value=other),
+            filter=lambda x: listing_t.FilterSpecEqualsBoolean(column=x, value=other),
         )
 
 

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/uncountable/integration/queue_runner/command_server/command_server.py

@@ -159,13 +159,17 @@ async def serve(command_queue: CommandQueue, datastore: DatastoreSqlite) -> None
                 else None
             )
 
-            queued_job_metadata = datastore.list_queued_job_metadata(
-                status=job_status,
-                limit=request.limit,
-                offset=request.offset,
-                job_ref_name=request.job_ref_name or None,
-                submitted_from=submitted_from,
-                submitted_to=submitted_to,
+            loop = asyncio.get_running_loop()
+            queued_job_metadata = await loop.run_in_executor(
+                None,
+                lambda: datastore.list_queued_job_metadata(
+                    status=job_status,
+                    limit=request.limit,
+                    offset=request.offset,
+                    job_ref_name=request.job_ref_name or None,
+                    submitted_from=submitted_from,
+                    submitted_to=submitted_to,
+                ),
             )
 
             response_list: list[ListQueuedJobsResult.ListQueuedJobsResultItem] = []

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/uncountable/integration/queue_runner/datastore/datastore_sqlite.py

@@ -36,6 +36,16 @@ class DatastoreSqlite(Datastore):
                 connection.execute(
                     text("alter table queued_jobs add column status VARCHAR")
                 )
+            connection.execute(
+                text(
+                    "create index if not exists ix_queued_jobs_status on queued_jobs (status)"
+                )
+            )
+            connection.execute(
+                text(
+                    "create index if not exists ix_queued_jobs_submitted_at on queued_jobs (submitted_at)"
+                )
+            )
 
     def add_job_to_queue(
         self, job_payload: queued_job_t.QueuedJobPayload, job_ref_name: str

{uncountablepythonsdk-0.0.162 → uncountablepythonsdk-0.0.163}/uncountable/integration/queue_runner/datastore/model.py

@@ -13,7 +13,10 @@ class QueuedJob(Base):
     id = Column(Text, primary_key=True)
     job_ref_name = Column(Text, nullable=False, index=True)
     submitted_at = Column(
-        DateTime(timezone=True), server_default=func.current_timestamp(), nullable=False
+        DateTime(timezone=True),
+        server_default=func.current_timestamp(),
+        nullable=False,
+        index=True,
     )
     payload = Column(JSON, nullable=False)
     num_attempts = Column(BigInteger, nullable=False, default=0, server_default="0")
@@ -21,4 +24,5 @@ class QueuedJob(Base):
         Enum(queued_job_t.JobStatus, length=None),
         default=queued_job_t.JobStatus.QUEUED,
         nullable=True,
+        index=True,
     )