UncountablePythonSDK 0.0.45__tar.gz → 0.0.46__tar.gz

{uncountablepythonsdk-0.0.45/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.45
+Version: 0.0.46
 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.45 → uncountablepythonsdk-0.0.46/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.45
+Version: 0.0.46
 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.45 → uncountablepythonsdk-0.0.46}/UncountablePythonSDK.egg-info/SOURCES.txt

@@ -111,6 +111,8 @@ uncountable/types/calculations_t.py
 uncountable/types/chemical_structure.py
 uncountable/types/chemical_structure_t.py
 uncountable/types/client_base.py
+uncountable/types/client_config.py
+uncountable/types/client_config_t.py
 uncountable/types/curves.py
 uncountable/types/curves_t.py
 uncountable/types/entity.py

{uncountablepythonsdk-0.0.45 → uncountablepythonsdk-0.0.46}/uncountable/core/async_batch.py

@@ -17,6 +17,7 @@ class AsyncBatchProcessor(AsyncBatchProcessorBase):
         super().__init__()
         self._client = client
         self._queue = []
+        self._submitted_job_ids = []
 
     def _enqueue(self, req: async_batch_t.AsyncBatchRequest) -> None:
         self._queue.append(req)

{uncountablepythonsdk-0.0.45 → uncountablepythonsdk-0.0.46}/uncountable/core/client.py

@@ -15,6 +15,7 @@ from pkgs.argument_parser import CachedParser
 from pkgs.serialization_util import serialize_for_api
 from pkgs.serialization_util.serialization_helpers import JsonValue
 from uncountable.types.client_base import APIRequest, ClientMethods
+from uncountable.types.client_config import ClientConfigOptions
 
 from .file_upload import FileUpload, FileUploader, UploadedFile
 from .types import AuthDetailsAll, AuthDetailsApiKey, AuthDetailsOAuth
@@ -58,9 +59,7 @@ HTTPRequest = HTTPPostRequest | HTTPGetRequest
 
 
 @dataclass(kw_only=True)
-class ClientConfig:
-    allow_insecure_tls: bool = False
-    extra_headers: dict[str, str] | None = None
+class ClientConfig(ClientConfigOptions):
     transform_request: typing.Callable[[requests.Request], requests.Request] | None = None
 
 

{uncountablepythonsdk-0.0.45 → uncountablepythonsdk-0.0.46}/uncountable/integration/construct_client.py

@@ -1,7 +1,8 @@
 import os
-from typing import assert_never
 
 from uncountable.core import AuthDetailsApiKey, Client
+from uncountable.core.client import ClientConfig
+from uncountable.core.types import AuthDetailsAll
 from uncountable.types.job_definition_t import (
     AuthRetrievalEnv,
     ProfileMetadata,
@@ -15,7 +16,7 @@ def _get_env_var(name: str) -> str:
     return value
 
 
-def construct_uncountable_client(profile_meta: ProfileMetadata) -> Client:
+def _construct_auth_details(profile_meta: ProfileMetadata) -> AuthDetailsAll:
     match profile_meta.auth_retrieval:
         case AuthRetrievalEnv():
             api_id = _get_env_var(f"UNC_PROFILE_{profile_meta.name.upper()}_API_ID")
@@ -26,10 +27,21 @@ def construct_uncountable_client(profile_meta: ProfileMetadata) -> Client:
             assert api_id is not None
             assert api_secret_key is not None
 
-            return Client(
-                base_url=profile_meta.base_url,
-                auth_details=AuthDetailsApiKey(
-                    api_id=api_id, api_secret_key=api_secret_key
-                ),
-            )
-    assert_never(profile_meta.auth_retrieval)
+            return AuthDetailsApiKey(api_id=api_id, api_secret_key=api_secret_key)
+
+
+def _construct_client_config(profile_meta: ProfileMetadata) -> ClientConfig | None:
+    if profile_meta.client_options is None:
+        return None
+    return ClientConfig(
+        allow_insecure_tls=profile_meta.client_options.allow_insecure_tls,
+        extra_headers=profile_meta.client_options.extra_headers,
+    )
+
+
+def construct_uncountable_client(profile_meta: ProfileMetadata) -> Client:
+    return Client(
+        base_url=profile_meta.base_url,
+        auth_details=_construct_auth_details(profile_meta),
+        config=_construct_client_config(profile_meta),
+    )

{uncountablepythonsdk-0.0.45 → uncountablepythonsdk-0.0.46}/uncountable/integration/entrypoint.py

@@ -32,6 +32,7 @@ def main(blocking: bool) -> None:
                 base_url=profile.base_url,
                 auth_retrieval=profile.auth_retrieval,
                 jobs=profile.jobs,
+                client_options=profile.client_options,
             )
 
         if blocking:

{uncountablepythonsdk-0.0.45 → uncountablepythonsdk-0.0.46}/uncountable/integration/server.py

@@ -11,6 +11,7 @@ from apscheduler.triggers.cron import CronTrigger
 from sqlalchemy.engine.base import Engine
 
 from uncountable.integration.cron import CronJobArgs, cron_job_executor
+from uncountable.types.client_config_t import ClientConfigOptions
 from uncountable.types.job_definition_t import (
     AuthRetrieval,
     CronJobDefinition,
@@ -40,10 +41,14 @@ class IntegrationServer:
         base_url: str,
         auth_retrieval: AuthRetrieval,
         jobs: list[JobDefinition],
+        client_options: Optional[ClientConfigOptions],
     ) -> None:
         for job_defn in jobs:
             profile_metadata = ProfileMetadata(
-                name=profile_name, auth_retrieval=auth_retrieval, base_url=base_url
+                name=profile_name,
+                auth_retrieval=auth_retrieval,
+                base_url=base_url,
+                client_options=client_options,
             )
             match job_defn:
                 case CronJobDefinition():

{uncountablepythonsdk-0.0.45 → uncountablepythonsdk-0.0.46}/uncountable/types/__init__.py

@@ -12,6 +12,7 @@ from . import async_batch_t as async_batch_t
 from . import base_t as base_t
 from . import calculations_t as calculations_t
 from . import chemical_structure_t as chemical_structure_t
+from . import client_config_t as client_config_t
 from .api.chemical import convert_chemical_formats as convert_chemical_formats_t
 from .api.entity import create_entities as create_entities_t
 from .api.entity import create_entity as create_entity_t
@@ -107,6 +108,7 @@ __all__: list[str] = [
     "base_t",
     "calculations_t",
     "chemical_structure_t",
+    "client_config_t",
     "convert_chemical_formats_t",
     "create_entities_t",
     "create_entity_t",

uncountablepythonsdk-0.0.46/uncountable/types/client_config.py

@@ -0,0 +1,8 @@
+# flake8: noqa: F821
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+# DO NOT MODIFY -- This file is generated by type_spec
+# Kept only for SDK backwards compatibility
+from .client_config_t import ClientConfigOptions as ClientConfigOptions
+# DO NOT MODIFY -- This file is generated by type_spec

uncountablepythonsdk-0.0.46/uncountable/types/client_config_t.py

@@ -0,0 +1,22 @@
+# DO NOT MODIFY -- This file is generated by type_spec
+# flake8: noqa: F821
+# ruff: noqa: E402 Q003
+# fmt: off
+# isort: skip_file
+from __future__ import annotations
+import typing  # noqa: F401
+import datetime  # noqa: F401
+from decimal import Decimal  # noqa: F401
+import dataclasses
+
+__all__: list[str] = [
+    "ClientConfigOptions",
+]
+
+
+# DO NOT MODIFY -- This file is generated by type_spec
+@dataclasses.dataclass(kw_only=True)
+class ClientConfigOptions:
+    allow_insecure_tls: bool = False
+    extra_headers: typing.Optional[typing.Optional[dict[str, str]]] = None
+# DO NOT MODIFY -- This file is generated by type_spec

{uncountablepythonsdk-0.0.45 → uncountablepythonsdk-0.0.46}/uncountable/types/entity_t.py

@@ -29,40 +29,53 @@ __all__: list[str] = [
         "calendar": "Calendar",
         "calendar_event": "Calendar Event",
         "certification": "Certification",
+        "characterization": "Characterization",
         "comment": "Comment",
         "comment_thread": "Comment Thread",
         "condition_parameter": "Condition Parameter",
         "condition_parameter_mat_family": "Condition Parameter Material Family",
+        "condition_parameter_value": "Condition Parameter Value",
         "constraint": "Constraint",
         "constraint_set": "Constraint Set",
         "curve_settings": "Curve Settings",
         "custom_entity": "Custom Entity",
         "doe_run": "Suggest Experiments",
+        "email_record_external": "External Emails",
+        "email_relay_server": "Email Relay Server",
+        "enter_recipe_view_preference": "Enter Recipe View Preference",
         "entities_viewed": "Entities Viewed",
+        "entity_annotation": "Annotation",
         "entity_field": "Field",
         "entity_field_audit_log": "Entity Field Audit Log",
+        "entity_link": "Entity Link",
         "entity_phase_event": "Entity Phase Event",
+        "entity_search": "Entity Search",
         "entity_tag": "Entity Tag",
         "equipment": "Equipment",
+        "equipment_maintenance": "Equipment Maintenance",
         "equipment_type": "Equipment Type",
         "experiment_group": "Experiment Group",
         "experiment_group_type": "Experiment Group Type",
         "favorite_link": "Favorite Link",
         "field_option_set": "Field Option Set",
+        "field_option": "Field Option",
         "file_folder": "File Folder",
         "file_folder_membership": "File Folder Membership",
         "goal": "Goal",
         "ingredient": "Ingredient",
         "ingredient_attribute": "Ingredient Attribute",
         "ingredient_attribute_category": "Ingredient Attribute Category",
-        "ingredient_category": "Ingredient Category",
+        "ingredient_category": "Ingredient Category (Project)",
         "ingredient_category_all": "Ingredient Category",
+        "ingredient_category_all_material_family": "Ingredient Category Material Family",
         "ingredient_lot": "Ingredient Lot",
         "ingredient_role": "Ingredient Role",
         "ingredient_tag": "Ingredient Subcategory",
         "input_group": "Input Group",
         "inv_local_locations": "Inventory Location",
         "inventory_amount": "Inventory Amount",
+        "inventory_limit": "Inventory Limit",
+        "inventory_history": "Inventory History",
         "lab_location": "Lab Location",
         "lab_request": "Lab Request",
         "license": "License",
@@ -82,46 +95,59 @@ __all__: list[str] = [
         "output_condition_parameter_analytical_method_category": "Output Condition Parameter Analytical Method Category",
         "output_condition_parameter_analytical_method": "Output Condition Parameter Analytical Method",
         "output_group": "Output Group",
-        "recipe_output_metadata": "Recipe Output Metadata",
         "permission": "Permission",
+        "permissions_recipe_link_inheritance": "Permissions Recipe Link Inheritance",
         "phase_workflow": "Phase Workflow",
+        "platform_config": "Platform Config",
         "predictive_model": "Predictive Model",
         "product": "Product",
         "project": "Project",
+        "project_workbook_comment": "Notebook Cell Comment",
         "recipe": "Experiment",
+        "recipe_audit_log": "Experiment Audit Log",
         "recipe_calculation": "Recipe Calculation",
-        "recipe_permission_view": "Recipe Permission View",
-        "recipe_project": "Recipe Project",
         "recipe_check": "Experiment Check",
         "recipe_export": "Recipe Export",
+        "recipe_ingredient": "Recipe Ingredient",
+        "recipe_ingredient_actual": "Recipe Ingredient Actual",
         "recipe_ingredients_compounded": "Recipe Ingredients Compounded",
         "recipe_ingredients_compounded_calculation": "Recipe Ingredients Compounded Caclulation",
+        "recipe_output": "Recipe Output",
+        "recipe_output_metadata": "Recipe Output Metadata",
+        "recipe_permission_view": "Recipe Permission View",
+        "recipe_project": "Recipe Project",
         "recipe_step": "Recipe Step",
         "recipe_tag": "Recipe Tag",
         "recipe_metadata": "Experiment Metadata",
+        "metadata_value": "Metadata Value",
         "review": "Review",
         "review_entity_user_status": "Review Entity User Status",
         "review_user": "Review User",
         "rlw_phase": "Phase",
+        "rlw_trigger": "Trigger",
         "rlw_trigger_set": "Trigger Set",
         "safety_data_sheet": "Safety Data Sheet",
         "scheduled_notification": "Scheduled Notification",
         "specs": "Spec",
         "split_template": "Split Template",
         "structured_loading_user_config": "List Config",
+        "table_builder_config": "Table Builder Config",
         "task": "Task",
         "task_board": "Task Board",
         "template": "Template",
         "timesheet_entry": "Timesheet Entry",
         "training_run": "Analyze Experiment",
+        "training_run_template": "Scheduled Training Run",
         "training_set": "Training Set",
         "time_series": "Time Series",
+        "time_series_stage": "Time Series Stage",
         "units": "Units",
         "user_favorite": "User Favorite",
         "user": "User",
         "user_certification": "User Certification",
         "user_group": "User Group",
         "user_list_set": "User List Set",
+        "value_spec_property": "Value Spec Property",
         "webhook": "Webhook",
         "webhook_event": "Webhook Event",
         "workflow": "Workflow",
@@ -135,6 +161,7 @@ __all__: list[str] = [
         "public_data_sourced_output": "ChemQuery Property",
         "public_data_sourced_project": "ChemQuery Category",
         "public_data_sourced_recipe": "ChemQuery Product",
+        "public_data_sourced_raw_material": "ChemQuery Raw Materials",
         "public_data_sourced_recipe_project": "ChemQuery Product Category",
         "public_data_sourced_recipe_metadata": "ChemQuery Product Information",
         "public_data_sourced_units": "ChemQuery Units",
@@ -152,26 +179,36 @@ class EntityType(StrEnum):
     CALENDAR = "calendar"
     CALENDAR_EVENT = "calendar_event"
     CERTIFICATION = "certification"
+    CHARACTERIZATION = "characterization"
     COMMENT = "comment"
     COMMENT_THREAD = "comment_thread"
     CONDITION_PARAMETER = "condition_parameter"
     CONDITION_PARAMETER_MAT_FAMILY = "condition_parameter_mat_family"
+    CONDITION_PARAMETER_VALUE = "condition_parameter_value"
     CONSTRAINT = "constraint"
     CONSTRAINT_SET = "constraint_set"
     CURVE_SETTINGS = "curve_settings"
     CUSTOM_ENTITY = "custom_entity"
     DOE_RUN = "doe_run"
+    EMAIL_RECORD_EXTERNAL = "email_record_external"
+    EMAIL_RELAY_SERVER = "email_relay_server"
+    ENTER_RECIPE_VIEW_PREFERENCE = "enter_recipe_view_preference"
     ENTITIES_VIEWED = "entities_viewed"
+    ENTITY_ANNOTATION = "entity_annotation"
     ENTITY_FIELD = "entity_field"
     ENTITY_FIELD_AUDIT_LOG = "entity_field_audit_log"
+    ENTITY_LINK = "entity_link"
     ENTITY_PHASE_EVENT = "entity_phase_event"
+    ENTITY_SEARCH = "entity_search"
     ENTITY_TAG = "entity_tag"
     EQUIPMENT = "equipment"
+    EQUIPMENT_MAINTENANCE = "equipment_maintenance"
     EQUIPMENT_TYPE = "equipment_type"
     EXPERIMENT_GROUP = "experiment_group"
     EXPERIMENT_GROUP_TYPE = "experiment_group_type"
     FAVORITE_LINK = "favorite_link"
     FIELD_OPTION_SET = "field_option_set"
+    FIELD_OPTION = "field_option"
     FILE_FOLDER = "file_folder"
     FILE_FOLDER_MEMBERSHIP = "file_folder_membership"
     GOAL = "goal"
@@ -180,12 +217,15 @@ class EntityType(StrEnum):
     INGREDIENT_ATTRIBUTE_CATEGORY = "ingredient_attribute_category"
     INGREDIENT_CATEGORY = "ingredient_category"
     INGREDIENT_CATEGORY_ALL = "ingredient_category_all"
+    INGREDIENT_CATEGORY_ALL_MATERIAL_FAMILY = "ingredient_category_all_material_family"
     INGREDIENT_LOT = "ingredient_lot"
     INGREDIENT_ROLE = "ingredient_role"
     INGREDIENT_TAG = "ingredient_tag"
     INPUT_GROUP = "input_group"
     INV_LOCAL_LOCATIONS = "inv_local_locations"
     INVENTORY_AMOUNT = "inventory_amount"
+    INVENTORY_LIMIT = "inventory_limit"
+    INVENTORY_HISTORY = "inventory_history"
     LAB_LOCATION = "lab_location"
     LAB_REQUEST = "lab_request"
     LICENSE = "license"
@@ -205,46 +245,59 @@ class EntityType(StrEnum):
     OUTPUT_CONDITION_PARAMETER_ANALYTICAL_METHOD_CATEGORY = "output_condition_parameter_analytical_method_category"
     OUTPUT_CONDITION_PARAMETER_ANALYTICAL_METHOD = "output_condition_parameter_analytical_method"
     OUTPUT_GROUP = "output_group"
-    RECIPE_OUTPUT_METADATA = "recipe_output_metadata"
     PERMISSION = "permission"
+    PERMISSIONS_RECIPE_LINK_INHERITANCE = "permissions_recipe_link_inheritance"
     PHASE_WORKFLOW = "phase_workflow"
+    PLATFORM_CONFIG = "platform_config"
     PREDICTIVE_MODEL = "predictive_model"
     PRODUCT = "product"
     PROJECT = "project"
+    PROJECT_WORKBOOK_COMMENT = "project_workbook_comment"
     RECIPE = "recipe"
+    RECIPE_AUDIT_LOG = "recipe_audit_log"
     RECIPE_CALCULATION = "recipe_calculation"
-    RECIPE_PERMISSION_VIEW = "recipe_permission_view"
-    RECIPE_PROJECT = "recipe_project"
     RECIPE_CHECK = "recipe_check"
     RECIPE_EXPORT = "recipe_export"
+    RECIPE_INGREDIENT = "recipe_ingredient"
+    RECIPE_INGREDIENT_ACTUAL = "recipe_ingredient_actual"
     RECIPE_INGREDIENTS_COMPOUNDED = "recipe_ingredients_compounded"
     RECIPE_INGREDIENTS_COMPOUNDED_CALCULATION = "recipe_ingredients_compounded_calculation"
+    RECIPE_OUTPUT = "recipe_output"
+    RECIPE_OUTPUT_METADATA = "recipe_output_metadata"
+    RECIPE_PERMISSION_VIEW = "recipe_permission_view"
+    RECIPE_PROJECT = "recipe_project"
     RECIPE_STEP = "recipe_step"
     RECIPE_TAG = "recipe_tag"
     RECIPE_METADATA = "recipe_metadata"
+    METADATA_VALUE = "metadata_value"
     REVIEW = "review"
     REVIEW_ENTITY_USER_STATUS = "review_entity_user_status"
     REVIEW_USER = "review_user"
     RLW_PHASE = "rlw_phase"
+    RLW_TRIGGER = "rlw_trigger"
     RLW_TRIGGER_SET = "rlw_trigger_set"
     SAFETY_DATA_SHEET = "safety_data_sheet"
     SCHEDULED_NOTIFICATION = "scheduled_notification"
     SPECS = "specs"
     SPLIT_TEMPLATE = "split_template"
     STRUCTURED_LOADING_USER_CONFIG = "structured_loading_user_config"
+    TABLE_BUILDER_CONFIG = "table_builder_config"
     TASK = "task"
     TASK_BOARD = "task_board"
     TEMPLATE = "template"
     TIMESHEET_ENTRY = "timesheet_entry"
     TRAINING_RUN = "training_run"
+    TRAINING_RUN_TEMPLATE = "training_run_template"
     TRAINING_SET = "training_set"
     TIME_SERIES = "time_series"
+    TIME_SERIES_STAGE = "time_series_stage"
     UNITS = "units"
     USER_FAVORITE = "user_favorite"
     USER = "user"
     USER_CERTIFICATION = "user_certification"
     USER_GROUP = "user_group"
     USER_LIST_SET = "user_list_set"
+    VALUE_SPEC_PROPERTY = "value_spec_property"
     WEBHOOK = "webhook"
     WEBHOOK_EVENT = "webhook_event"
     WORKFLOW = "workflow"
@@ -258,6 +311,7 @@ class EntityType(StrEnum):
     PUBLIC_DATA_SOURCED_OUTPUT = "public_data_sourced_output"
     PUBLIC_DATA_SOURCED_PROJECT = "public_data_sourced_project"
     PUBLIC_DATA_SOURCED_RECIPE = "public_data_sourced_recipe"
+    PUBLIC_DATA_SOURCED_RAW_MATERIAL = "public_data_sourced_raw_material"
     PUBLIC_DATA_SOURCED_RECIPE_PROJECT = "public_data_sourced_recipe_project"
     PUBLIC_DATA_SOURCED_RECIPE_METADATA = "public_data_sourced_recipe_metadata"
     PUBLIC_DATA_SOURCED_UNITS = "public_data_sourced_units"

{uncountablepythonsdk-0.0.45 → uncountablepythonsdk-0.0.46}/uncountable/types/job_definition_t.py

@@ -11,6 +11,7 @@ from pkgs.strenum_compat import StrEnum
 import dataclasses
 from pkgs.serialization import serial_class
 from pkgs.serialization import serial_union_annotation
+from . import client_config_t
 from . import generic_upload_t
 from . import secret_retrieval_t
 
@@ -193,6 +194,7 @@ class ProfileDefinition:
     auth_retrieval: AuthRetrieval
     base_url: str
     jobs: list[JobDefinition]
+    client_options: typing.Optional[client_config_t.ClientConfigOptions] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -201,6 +203,7 @@ class ProfileMetadata:
     name: str
     base_url: str
     auth_retrieval: AuthRetrieval
+    client_options: typing.Optional[client_config_t.ClientConfigOptions]
 
 
 # DO NOT MODIFY -- This file is generated by type_spec