UncountablePythonSDK 0.0.79__py3-none-any.whl → 0.0.81__py3-none-any.whl

{UncountablePythonSDK-0.0.79.dist-info → UncountablePythonSDK-0.0.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.79
+Version: 0.0.81
 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.79.dist-info → UncountablePythonSDK-0.0.81.dist-info}/RECORD

@@ -23,7 +23,8 @@ examples/set_recipe_output_file_sdk.py,sha256=Lz1amqppnWTX83z-C090wCJ4hcKmCD3kb-
 examples/upload_files.py,sha256=tUfKFqiqwnw08OL5Y8_e4j5pSRhp94cFex8XTuVa_ig,487
 examples/integration-server/pyproject.toml,sha256=mB0uj-_Wo8WRmhdMwOwcdOB5lAhiW_8Kf-epMFrOq34,9133
 examples/integration-server/jobs/materials_auto/example_cron.py,sha256=7VVQ-UJsq3DbGpN3XPnorRVZYo-vCwbfSU3VVDluIzA,699
-examples/integration-server/jobs/materials_auto/profile.yaml,sha256=MiqT9AHWoFz-rcpAHfiFTXuCP-18DaFipUaceati0-0,365
+examples/integration-server/jobs/materials_auto/example_wh.py,sha256=Hx5nonavOh2L3JykDpI5bPqPu8L1wwhwekTUfTRgq9g,479
+examples/integration-server/jobs/materials_auto/profile.yaml,sha256=XlOXSRplMJ13T6900pv1wDKxeE9V1hZZTMuvup1MiBM,896
 pkgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/argument_parser/__init__.py,sha256=JRfZkC0-q6axr8F5_TKrjSprJ7d7chfcPvf-iMQqFg0,447
@@ -41,7 +42,7 @@ pkgs/filesystem_utils/filesystem_session.py,sha256=BQ2Go8Mu9-GcnaWh2Pm4x7ugLVsre
 pkgs/serialization/__init__.py,sha256=LifasRW0a50A3qRFmo2bf3FQ6TXhZWOTz2-CVTgPjcQ,753
 pkgs/serialization/missing_sentry.py,sha256=aM_9KxbCk9dVvXvcOKgkIQBqFWvLhv8QlIUCiuFEXMo,806
 pkgs/serialization/opaque_key.py,sha256=FIfXEE0DA1U8R_taFbQ1RCoTSgehrPjP06-qvo-GeNQ,177
-pkgs/serialization/serial_class.py,sha256=xURwC05-ImnHU1pKM8BBYpzbrhTtiZr30UlzaA0T7zY,6110
+pkgs/serialization/serial_class.py,sha256=anGUNEArLXjiEX3GoMNk7tn15LQWANXjxNrb5DqNK18,6252
 pkgs/serialization/serial_union.py,sha256=xpdeqCrRd0sNCaUwBQRzje6V40ndCbJpZrLX2K0d5xo,2741
 pkgs/serialization/yaml.py,sha256=yoJtu7_ixnJV6uTxA_U1PpK5F_ixT08AKVh5ocyYwXM,1466
 pkgs/serialization_util/__init__.py,sha256=MVKqHTUl2YnWZAFG9xCxu1SgmkQ5xPofrAGlYg6h7rI,330
@@ -67,7 +68,7 @@ pkgs/type_spec/util.py,sha256=79SLJsSPVnBe2_3CTF6J-7-QD9nRr6o8MKvfjyx53eI,4864
 pkgs/type_spec/actions_registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pkgs/type_spec/actions_registry/__main__.py,sha256=JGwKxcAmrQdbpVR2vwknoimN1Q-r5h4SADw1cYLYzgk,4331
 pkgs/type_spec/actions_registry/emit_typescript.py,sha256=Z1ZM4zOw26tvLspvW6Emg79-jxjhNBse-8yaionbmeo,6066
-pkgs/type_spec/parts/base.py.prepart,sha256=wGNoDyQnLolHRZGRwHQX5TrPfKnu558NXCocYvqyroc,2174
+pkgs/type_spec/parts/base.py.prepart,sha256=St6P21VP8Um_nagZFuSyNzYiKDSrsK3TNOuGY_1O8cg,2186
 pkgs/type_spec/parts/base.ts.prepart,sha256=2FJJvpg2olCcavxj0nbYWdwKl6KeScour2JjSvN42l8,1001
 pkgs/type_spec/type_info/__main__.py,sha256=pmVjVqXyVh8vKTNCTFgz80Sg74C5BKToP3E6GS-X_So,857
 pkgs/type_spec/type_info/emit_type_info.py,sha256=EzX0ONjrLtQFlN5cEAaw2RPVyadmgmZazOfqHUbL_PI,13362
@@ -98,14 +99,14 @@ uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 uncountable/integration/db/connect.py,sha256=mE3bdV0huclH2iT_dXCQdRL4LkjIuf_myAR64RTWXEs,498
 uncountable/integration/db/session.py,sha256=96cGQXpe6IugBTdSsjdP0S5yhJ6toSmbVB6qhc3FJzE,693
 uncountable/integration/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uncountable/integration/executors/executors.py,sha256=CbwatKkHrLhnqYr_nsBjr0KYeOn8KqijxrZPHbxChBY,1961
+uncountable/integration/executors/executors.py,sha256=2OXFUJiG6hlkIB2NUZldobiBk9xSWuk7evvr5wlesG4,5119
 uncountable/integration/executors/generic_upload_executor.py,sha256=0vs9NVk1UL2FBhiMCH6o8p4KtVXNFNvv861QCOD3UU4,10375
 uncountable/integration/executors/script_executor.py,sha256=BBQ9f0l7uH2hgKf60jtm-pONzwk-EeOhM2qBAbv_URo,846
 uncountable/integration/queue_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uncountable/integration/queue_runner/job_scheduler.py,sha256=5Z74Wb17oohz7EFN40JBymH1UWW7-Dnk9HhOz3wZ08E,5005
+uncountable/integration/queue_runner/job_scheduler.py,sha256=lhvcl11jyk_wg9BSc1Xyh5u8iEtsdqQFW83FPLupjQI,6189
 uncountable/integration/queue_runner/queue_runner.py,sha256=0BmYu5zHdothTevGsB-nXg6MBd1UD-WkP3h1WCKMdQg,710
 uncountable/integration/queue_runner/types.py,sha256=8qTq29BTSa5rmW6CBlBntP0pNIiDcwu1wHa78pjroS0,219
-uncountable/integration/queue_runner/worker.py,sha256=pYLd6D3-ZSM3zcd7UKwyYUADVYEAUK9Hfi0PprwkNqo,4170
+uncountable/integration/queue_runner/worker.py,sha256=EMDtdObowaq0aHndH1bBmlSIOih0jF3Gcn7Yl6NNeOM,4265
 uncountable/integration/queue_runner/command_server/__init__.py,sha256=gQPVILGpWzCr2i5GJyoqna7AOSFvtn4tav69gB78mTQ,571
 uncountable/integration/queue_runner/command_server/command_client.py,sha256=DJb0TUVFkiiLBEQzHSN94sTRnuEbutNEgdN39XmnOXI,2046
 uncountable/integration/queue_runner/command_server/command_server.py,sha256=yyXryhiEC2eGS0yFElLGsVzSKwOuYvj-zp22jQorkv0,2138
@@ -131,7 +132,7 @@ uncountable/types/async_jobs_t.py,sha256=sEh1Ev46ff4n1v8mMV3rEbH3MGmaXnLuvYf0UhD
 uncountable/types/auth_retrieval.py,sha256=FY8Vr_BWD4O8PsauPNt_7_08YZSHFaUlTT72L5XJ-4o,570
 uncountable/types/auth_retrieval_t.py,sha256=D2ptCIsuCecJa_P8K2qrNk2-zz1WuBpOrsZ65BRP-Dw,2221
 uncountable/types/base.py,sha256=xVSjWvA_fUUnkCg83EjoYEFvAfmskinKFMeYFOxNc9E,359
-uncountable/types/base_t.py,sha256=XXjZXexx0xWFUxMMhW8i9nIL6n8dsZVsHwdgnhZ0zJ4,2714
+uncountable/types/base_t.py,sha256=ThxlCKyUBEj7sCRmfvWm2w4b6IDVvUkbAIISNxWTFxE,2726
 uncountable/types/calculations.py,sha256=FFO_D3BbKoGDZnqWvTKpW4KF359i2vrKjpdFCLYzJC0,284
 uncountable/types/calculations_t.py,sha256=157qD0VqijD5kNDF5BRsfGli3WaPGnNjoo2o2CPX-Ik,669
 uncountable/types/chemical_structure.py,sha256=E-LnikTFDoVQ1b2zKaVUIO_PAKm-7aZZYJi8I8SDSic,302
@@ -142,7 +143,7 @@ uncountable/types/client_config_t.py,sha256=6dStfR0IEHiPW8f9_aF3DD_tHmXXw2rEVrgp
 uncountable/types/curves.py,sha256=W6uMpG5SyW1MS82szNpxkFEn1MnxNpBFyFbQb2Ysfng,366
 uncountable/types/curves_t.py,sha256=lKhRM-2cZ_sFaW7pa_I_Ipz_pJhm3_yTFehRXI79pKk,1416
 uncountable/types/entity.py,sha256=ECvhswTj9xp4gUEKTZoZYyxHvx1oyvE5FNiGNfSyUgk,528
-uncountable/types/entity_t.py,sha256=78elxgVHHQ9GM9uvQVtTMSLnRXgDiznk9GEbAIzlK-k,16246
+uncountable/types/entity_t.py,sha256=_a7maOh51nJPigkfdDipJ0XB9h8G4N6-VAWIQHNbh3o,16491
 uncountable/types/experiment_groups.py,sha256=_0OXcPzSAbkE-rfKt5tPx178YJ4pcEKZvrCxUHgDnvw,309
 uncountable/types/experiment_groups_t.py,sha256=qEs8YW0eJOJ_sCOObT5v9QRx9wsjLYpJqJhCJXa-vNA,721
 uncountable/types/field_values.py,sha256=uuIWX-xmfvcinYPdfkWJeb56zzQY01mc9rmotMPMh24,503
@@ -162,7 +163,7 @@ uncountable/types/inputs_t.py,sha256=CpuuKRduZGET_wvkGUpUFN6rbZCHsdOIp1veEM-hspI
 uncountable/types/integration_server.py,sha256=61NuGs1pbgovU5Vuje7oN9HpLwOGCCw9Q_CcUvt_0qI,385
 uncountable/types/integration_server_t.py,sha256=wa45RWChRsj2oAvWcOfZXA2xZxyEEkzltuJqZwKTna8,1048
 uncountable/types/job_definition.py,sha256=DEma_s-0oBo2tPI5u9IU_UDw-9MWbn4mTZsd_RHiYGE,1667
-uncountable/types/job_definition_t.py,sha256=N9080NAzwfYQKTusY2vs3z1UrM5s_QGtzWyoFxr2_iM,7931
+uncountable/types/job_definition_t.py,sha256=whsat5825Jou1-67dbOkqiibpoavGcsaOhJ3APTUh2Q,7948
 uncountable/types/outputs.py,sha256=sUZx_X-TKCZtLm1YCEH8OISX9DdPlv9ZuUfM3-askCc,281
 uncountable/types/outputs_t.py,sha256=AdJZvIzqikHV9CnlC24WEo0OUe-5vrD4cjMqc2txEs0,765
 uncountable/types/overrides.py,sha256=Mv-smwK1B3pvbt48fNOiqkeQn9wMgYlBFJKUBOJqceE,431
@@ -285,7 +286,7 @@ uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr
 uncountable/types/api/triggers/run_trigger.py,sha256=-oZgPyn43xEKSCs81DVNzwaYMCdRJxbM9GY6fsqKwf4,1090
 uncountable/types/api/uploader/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/uploader/invoke_uploader.py,sha256=6mwVG136oLp9JcbB2I-kZnrcm3aeZzYZB-SFjEImY2o,1314
-UncountablePythonSDK-0.0.79.dist-info/METADATA,sha256=iq6fGPYZf2nEIM20TliAWLslL5xwXV9D9c6Y4jROeKA,2051
-UncountablePythonSDK-0.0.79.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-UncountablePythonSDK-0.0.79.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.79.dist-info/RECORD,,
+UncountablePythonSDK-0.0.81.dist-info/METADATA,sha256=hfFny-tLIUG0nrKcCY0eAxGDFgo-Q7wUXyqSczrBKpU,2051
+UncountablePythonSDK-0.0.81.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+UncountablePythonSDK-0.0.81.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.81.dist-info/RECORD,,

examples/integration-server/jobs/materials_auto/example_wh.py

@@ -0,0 +1,15 @@
+import typing
+
+from uncountable.integration.job import JobArguments, WebhookJob, register_job
+from uncountable.types.job_definition_t import JobResult
+
+
+@register_job
+class WebhookExample(WebhookJob):
+    @property
+    def payload_type(self) -> typing.Any:
+        return super().payload_type
+
+    def run(self, args: JobArguments, payload: typing.Any) -> JobResult:
+        args.logger.log_info(f"webhook invoked with payload: {payload}")
+        return JobResult(success=True)

examples/integration-server/jobs/materials_auto/profile.yaml

@@ -13,7 +13,31 @@ jobs:
     type: cron
     name: MyCron - Example
     cron_spec: "* * * * *"
-    executor: 
+    executor:
       type: script
       import_path: example_cron
+    logging_settings:
+      enabled: true
+      share_with_user_groups:
+        - admin:
+          type: ref_name
+          ref_name: admin
 
+  - id: example_wh1
+    type: webhook
+    name: Webhook 1
+    signature_key_secret:
+      type: env
+      env_key: WH1_SIGNATURE_KEY
+    executor:
+      type: script
+      import_path: example_wh
+  - id: example_wh2
+    type: webhook
+    name: Webhook 2
+    signature_key_secret:
+      type: env
+      env_key: WH2_SIGNATURE_KEY
+    executor:
+      type: script
+      import_path: example_wh

pkgs/serialization/serial_class.py

@@ -96,6 +96,10 @@ class SerialClassDataInspector:
     def named_type_path(self) -> Optional[str]:
         return self.current.named_type_path
 
+    @property
+    def is_field_proper(self) -> bool:
+        return self.current.from_decorator and self.current.named_type_path is not None
+
 
 def _get_merged_serial_class_data(type_class: type[Any]) -> _SerialClassData | None:
     base_class_data = (

pkgs/type_spec/parts/base.py.prepart

@@ -22,8 +22,8 @@ PureJsonScalar = Union[str, float, bool, None]
 # Regular expressions for identifying ref names and IDs. Ref names should be
 # using this regular expression as a constriant in the database.
 REF_NAME_REGEX = r"^[a-zA-Z0-9_/-]+$"
-# Does not support nonpositive integers at the moment.
-ID_REGEX = r"[1-9][0-9]{0,20}"
+# Ids matching a strict integer number are converted to integers
+ID_REGEX = r"-?[1-9][0-9]{0,20}"
 
 
 if TYPE_CHECKING:

uncountable/integration/executors/executors.py

@@ -1,9 +1,17 @@
 from typing import assert_never
 
+from uncountable.core.client import Client
 from uncountable.integration.executors.generic_upload_executor import GenericUploadJob
 from uncountable.integration.executors.script_executor import resolve_script_executor
 from uncountable.integration.job import Job, JobArguments
-from uncountable.types import job_definition_t
+from uncountable.types import (
+    async_jobs_t,
+    entity_t,
+    field_values_t,
+    identifier_t,
+    job_definition_t,
+    transition_entity_phase_t,
+)
 
 
 def resolve_executor(
@@ -24,6 +32,49 @@ def resolve_executor(
     assert_never(job_executor)
 
 
+def _create_run_entity(
+    *, client: Client, logging_settings: job_definition_t.JobLoggingSettings
+) -> entity_t.Entity:
+    run_entity = client.create_entity(
+        entity_type=entity_t.EntityType.ASYNC_JOB,
+        definition_key=identifier_t.IdentifierKeyRefName(
+            ref_name="unc_integration_server_run_definition"
+        ),
+        field_values=[
+            field_values_t.FieldRefNameValue(
+                field_ref_name=async_jobs_t.ASYNC_JOB_TYPE_FIELD_REF_NAME,
+                value=async_jobs_t.AsyncJobType.INTEGRATION_SERVER_RUN,
+            ),
+            field_values_t.FieldRefNameValue(
+                field_ref_name=async_jobs_t.ASYNC_JOB_STATUS_FIELD_REF_NAME,
+                value=async_jobs_t.AsyncJobStatus.IN_PROGRESS,
+            ),
+        ],
+    ).entity
+    client.transition_entity_phase(
+        entity=run_entity,
+        transition=transition_entity_phase_t.TransitionIdentifierPhases(
+            phase_from_key=identifier_t.IdentifierKeyRefName(
+                ref_name="unc_integration_server_run__queued"
+            ),
+            phase_to_key=identifier_t.IdentifierKeyRefName(
+                ref_name="unc_integration_server_run__started"
+            ),
+        ),
+    )
+    if logging_settings.share_with_user_groups is not None:
+        client.grant_entity_permissions(
+            entity_type=entity_t.EntityType.ASYNC_JOB,
+            entity_key=identifier_t.IdentifierKeyId(id=run_entity.id),
+            permission_types=[
+                entity_t.EntityPermissionType.READ,
+                entity_t.EntityPermissionType.WRITE,
+            ],
+            user_group_keys=logging_settings.share_with_user_groups,
+        )
+    return run_entity
+
+
 def execute_job(
     *,
     job_definition: job_definition_t.JobDefinition,
@@ -35,10 +86,28 @@ def execute_job(
 
         job_logger.log_info("running job")
 
+        run_entity: entity_t.Entity | None = None
         try:
+            if (
+                job_definition.logging_settings is not None
+                and job_definition.logging_settings.enabled
+            ):
+                run_entity = _create_run_entity(
+                    client=args.client, logging_settings=job_definition.logging_settings
+                )
             result = job.run_outer(args=args)
         except Exception as e:
             job_logger.log_exception(e)
+            if run_entity is not None:
+                args.client.set_values(
+                    entity=run_entity,
+                    values=[
+                        field_values_t.ArgumentValueRefName(
+                            field_ref_name=async_jobs_t.ASYNC_JOB_STATUS_FIELD_REF_NAME,
+                            value=async_jobs_t.AsyncJobStatus.ERROR,
+                        ),
+                    ],
+                )
             return job_definition_t.JobResult(success=False)
 
         if args.batch_processor.current_queue_size() != 0:
@@ -52,5 +121,17 @@ def execute_job(
                 "success": result.success,
             },
         )
+        if run_entity is not None:
+            args.client.set_values(
+                entity=run_entity,
+                values=[
+                    field_values_t.ArgumentValueRefName(
+                        field_ref_name=async_jobs_t.ASYNC_JOB_STATUS_FIELD_REF_NAME,
+                        value=async_jobs_t.AsyncJobStatus.COMPLETED
+                        if result.success
+                        else async_jobs_t.AsyncJobStatus.ERROR,
+                    ),
+                ],
+            )
 
         return result

uncountable/integration/queue_runner/job_scheduler.py

@@ -8,6 +8,7 @@ from opentelemetry.trace import get_current_span
 from uncountable.integration.db.connect import IntegrationDBService, create_db_engine
 from uncountable.integration.db.session import get_session_maker
 from uncountable.integration.queue_runner.command_server import (
+    CommandEnqueueJob,
     CommandEnqueueJobResponse,
     CommandQueue,
     CommandTask,
@@ -99,6 +100,41 @@ async def start_scheduler(command_queue: CommandQueue) -> None:
                 return
             await worker.listen_queue.put(queued_job)
 
+        async def _enqueue_or_deduplicate_job(
+            job_ref_name: str,
+            payload: queued_job_t.QueuedJobPayload,
+        ) -> str:
+            if isinstance(
+                payload.invocation_context,
+                queued_job_t.InvocationContextCron,
+            ):
+                existing_queued_jobs = datastore.load_job_queue()
+                duplicate_job = next(
+                    (
+                        job
+                        for job in existing_queued_jobs
+                        if job.job_ref_name == job_ref_name
+                    ),
+                    None,
+                )
+                if duplicate_job is not None:
+                    return duplicate_job.queued_job_uuid
+            queued_job = datastore.add_job_to_queue(
+                job_payload=payload,
+                job_ref_name=job_ref_name,
+            )
+            await enqueue_queued_job(queued_job)
+            return queued_job.queued_job_uuid
+
+        async def _handle_enqueue_job_command(command: CommandEnqueueJob) -> None:
+            queued_job_uuid = await _enqueue_or_deduplicate_job(
+                job_ref_name=command.job_ref_name,
+                payload=command.payload,
+            )
+            await command.response_queue.put(
+                CommandEnqueueJobResponse(queued_job_uuid=queued_job_uuid)
+            )
+
         for queued_job in queued_jobs:
             await enqueue_queued_job(queued_job)
 
@@ -112,15 +148,11 @@ async def start_scheduler(command_queue: CommandQueue) -> None:
             for task in finished:
                 if task == command_task:
                     command = command_task.result()
-                    queued_job = datastore.add_job_to_queue(
-                        job_payload=command.payload, job_ref_name=command.job_ref_name
-                    )
-                    await command.response_queue.put(
-                        CommandEnqueueJobResponse(
-                            queued_job_uuid=queued_job.queued_job_uuid
-                        )
-                    )
-                    await enqueue_queued_job(queued_job)
+                    match command:
+                        case CommandEnqueueJob():
+                            await _handle_enqueue_job_command(command=command)
+                        case _:
+                            typing.assert_never(command)
                     command_task = asyncio.create_task(command_queue.get())
                 elif task == result_task:
                     queued_job_result = result_task.result()

uncountable/integration/queue_runner/worker.py

@@ -106,3 +106,6 @@ def run_queued_job(
         except Exception as e:
             job_logger.log_exception(e)
             return job_definition_t.JobResult(success=False)
+        except BaseException as e:
+            job_logger.log_exception(e)
+            raise e

uncountable/types/base_t.py

@@ -39,8 +39,8 @@ PureJsonScalar = Union[str, float, bool, None]
 # Regular expressions for identifying ref names and IDs. Ref names should be
 # using this regular expression as a constriant in the database.
 REF_NAME_REGEX = r"^[a-zA-Z0-9_/-]+$"
-# Does not support nonpositive integers at the moment.
-ID_REGEX = r"[1-9][0-9]{0,20}"
+# Ids matching a strict integer number are converted to integers
+ID_REGEX = r"-?[1-9][0-9]{0,20}"
 
 
 if TYPE_CHECKING:

uncountable/types/entity_t.py

@@ -70,10 +70,12 @@ __all__: list[str] = [
         "ingredient": "Ingredient",
         "ingredient_attribute": "Ingredient Attribute",
         "ingredient_attribute_category": "Ingredient Attribute Category",
+        "ingredient_attribute_value": "Ingredient Attribute Value",
         "ingredient_category": "Ingredient Category (Project)",
         "ingredient_category_all": "Ingredient Category",
         "ingredient_category_all_material_family": "Ingredient Category Material Family",
         "ingredient_lot": "Ingredient Lot",
+        "ingredient_mat_family": "Ingredient Material Family",
         "ingredient_role": "Ingredient Role",
         "ingredient_tag": "Ingredient Subcategory",
         "ingredient_tag_map": "Ingredient Tag Map",
@@ -225,10 +227,12 @@ class EntityType(StrEnum):
     INGREDIENT = "ingredient"
     INGREDIENT_ATTRIBUTE = "ingredient_attribute"
     INGREDIENT_ATTRIBUTE_CATEGORY = "ingredient_attribute_category"
+    INGREDIENT_ATTRIBUTE_VALUE = "ingredient_attribute_value"
     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_MAT_FAMILY = "ingredient_mat_family"
     INGREDIENT_ROLE = "ingredient_role"
     INGREDIENT_TAG = "ingredient_tag"
     INGREDIENT_TAG_MAP = "ingredient_tag_map"

uncountable/types/job_definition_t.py

@@ -12,9 +12,9 @@ import dataclasses
 from pkgs.serialization import serial_class
 from pkgs.serialization import serial_union_annotation
 from . import auth_retrieval_t
-from . import base_t
 from . import client_config_t
 from . import generic_upload_t
+from . import identifier_t
 from . import integration_server_t
 from . import secret_retrieval_t
 
@@ -172,7 +172,7 @@ JobExecutor = typing.Annotated[
 @dataclasses.dataclass(kw_only=True)
 class JobLoggingSettings:
     enabled: bool = False
-    share_with_user_groups: typing.Optional[list[base_t.ObjectId]] = None
+    share_with_user_groups: typing.Optional[list[identifier_t.IdentifierKey]] = None
 
 
 # DO NOT MODIFY -- This file is generated by type_spec