albert 1.11.0__py3-none-any.whl → 1.11.2__py3-none-any.whl

albert/__init__.py

@@ -4,4 +4,4 @@ from albert.core.auth.sso import AlbertSSOClient
 
 __all__ = ["Albert", "AlbertClientCredentials", "AlbertSSOClient"]
 
-__version__ = "1.11.0"
+__version__ = "1.11.2"

albert/collections/attachments.py

@@ -152,20 +152,30 @@ class AttachmentCollection(BaseCollection):
             The name of the file, by default ""
         upload_key : str | None, optional
             Override the storage key used when signing and uploading the file.
-            Defaults to the provided ``file_name``.
+            Defaults to ``{parent_id}/{note_id}/{file_name}``.
 
         Returns
         -------
         Note
             The created note.
         """
-        upload_name = upload_key or file_name
-        if not upload_name:
+        if not (upload_key or file_name):
             raise ValueError("A file name or upload key must be provided for attachment upload.")
 
-        file_type = mimetypes.guess_type(file_name or upload_name)[0]
-        file_collection = self._get_file_collection()
         note_collection = self._get_note_collection()
+        note = Note(
+            parent_id=parent_id,
+            note=note_text,
+        )
+        registered_note = note_collection.create(note=note)
+        if upload_key:
+            attachment_name = file_name or Path(upload_key).name
+            upload_name = upload_key
+        else:
+            attachment_name = file_name
+            upload_name = f"{parent_id}/{registered_note.id}/{file_name}"
+        file_type = mimetypes.guess_type(attachment_name or upload_name)[0]
+        file_collection = self._get_file_collection()
 
         file_collection.sign_and_upload_file(
             data=file_data,
@@ -176,16 +186,12 @@ class AttachmentCollection(BaseCollection):
         file_info = file_collection.get_by_name(
             name=upload_name, namespace=FileNamespace.RESULT.value
         )
-        note = Note(
-            parent_id=parent_id,
-            note=note_text,
-        )
-        registered_note = note_collection.create(note=note)
         self.attach_file_to_note(
             note_id=registered_note.id,
-            file_name=file_name or Path(upload_name).name,
+            file_name=attachment_name,
             file_key=file_info.name,
         )
+
         return note_collection.get_by_id(id=registered_note.id)
 
     @validate_call

albert/resources/entity_types.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Any
 
-from pydantic import Field
+from pydantic import Field, model_validator
 
 from albert.core.shared.identifiers import CustomFieldId, EntityTypeId, RuleId
 from albert.core.shared.models.base import BaseAlbertModel, BaseResource, EntityLink
@@ -173,8 +175,8 @@ class EntityType(BaseResource):
     ----------
     id : EntityTypeId
         The unique identifier for the entity type.
-    category : EntityCategory
-        The category the entity type belongs to.
+    category : EntityCategory | None
+        The category the entity type belongs to. Required for tasks and inventories.
     custom_category : str | None, optional
         A custom category name for the entity type.
     label : str
@@ -194,7 +196,7 @@ class EntityType(BaseResource):
     """
 
     id: EntityTypeId | None = Field(alias="albertId", default=None)
-    category: EntityCategory
+    category: EntityCategory | None = None
     custom_category: str | None = Field(
         default=None, max_length=100, min_length=1, alias="customCategory"
     )
@@ -215,6 +217,15 @@ class EntityType(BaseResource):
         alias="searchQueryString", default=None
     )
 
+    @model_validator(mode="after")
+    def validate_category(self) -> EntityType:
+        if (
+            self.service in {EntityServiceType.TASKS, EntityServiceType.INVENTORIES}
+            and self.category is None
+        ):
+            raise ValueError("category is required for tasks and inventories entity types.")
+        return self
+
 
 class EntityTypeOptionType(str, Enum):
     """Types of options that can be used in entity type fields.

{albert-1.11.0.dist-info → albert-1.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: albert
-Version: 1.11.0
+Version: 1.11.2
 Summary: The official Python SDK for the Albert Invent platform.
 Project-URL: Homepage, https://www.albertinvent.com/
 Project-URL: Documentation, https://docs.developer.albertinvent.com/albert-python

{albert-1.11.0.dist-info → albert-1.11.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-albert/__init__.py,sha256=HmsEPDVHy3OV1CPN344cztFYv5B-RjMiwM21n4B9OpM,239
+albert/__init__.py,sha256=w6OATl6C5XTZwB_fGPlL2-I1i3fMb3WkBFdxI2uKTSc,239
 albert/client.py,sha256=9SUy9AJpnFEUlSfxvbP1gJI776WcOoZykgPHx0EcF8g,12038
 albert/exceptions.py,sha256=-oxOJGE0A__aPUhri3qqb5YQ5qanECcTqamS73vGajM,3172
 albert/collections/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 albert/collections/activities.py,sha256=vvV5-f9KH52HarVSzUNAL7o4hz9mKWEZiE1MreqiH1g,3373
-albert/collections/attachments.py,sha256=xhhdXxlVuQL_5K_rCKWlA-itr8yBMGfgkSaHrOtZfpw,9950
+albert/collections/attachments.py,sha256=Lq5q2sMUKMBargfCM7xqFMbaZLRNRvyhjCUT5sWdhUk,10169
 albert/collections/base.py,sha256=MwBHndy5mXHvieozseaT1YF_RDevJWYu4IFGpLCBfww,8590
 albert/collections/batch_data.py,sha256=esMttDTCY8TqSEOfMFQQ6Um_77Mf-SY3g75t1b6THjQ,3388
 albert/collections/btdataset.py,sha256=rhjO4RtGSzAZj4hgA4M9BKG-eyhl111IDwZr_JW4t_E,4461
@@ -76,7 +76,7 @@ albert/resources/custom_fields.py,sha256=spu5S32wFQ-ifKh-6QKjmSFz5HawAYaEM9EeA7P
 albert/resources/custom_templates.py,sha256=iglIlk4WYgvYkaCcQ8W_qZjDROyKAFC-7Fib_RFY-48,9710
 albert/resources/data_columns.py,sha256=y9-14lF3ncvJ4ut7TxSz2Wp6tw96o578aVUYh7CBDT4,345
 albert/resources/data_templates.py,sha256=Wf1iyKFNDV-vuEHUNjYBL-gMYYaHfmjE82TgcHe0LxA,7009
-albert/resources/entity_types.py,sha256=wP0Y0EScr4VN-YvzGdVZk91U5tqGBZDqvLpESoY0B-w,10791
+albert/resources/entity_types.py,sha256=7lessP8StBDfi4DZMifvRNN4lspdQ5X0olBIu7lT_AI,11244
 albert/resources/facet.py,sha256=tjm6CsOL7T5LSV4G9406C1c5mpzY1gpfQYAttP6Hckw,372
 albert/resources/files.py,sha256=0q5H6rJ9il0Oy1FnwxVo3otq_w8YQeQjo29DgsTY8JQ,1067
 albert/resources/hazards.py,sha256=ltlbYct3PhvpTojqic0OcfJVKd2s6m59XqszzZZAuWo,375
@@ -117,7 +117,7 @@ albert/utils/data_template.py,sha256=AUwzfQ-I2HY-osq_Tme5KLwXfMzW2pJpiud7HAMh148
 albert/utils/inventory.py,sha256=ViHxb62DVxniEJqOfD7Gf8HltLeCbq21y4rS1xkVRnY,5349
 albert/utils/property_data.py,sha256=US_5PYZu2Yv3CmAuWMQfYztjSIgNaRrCz9SsVzLOGcw,22906
 albert/utils/tasks.py,sha256=ejhXD9yQR_ReDKLJ3k8ZxWxkYl-Mta_4OPXrz_lQiBI,19878
-albert-1.11.0.dist-info/METADATA,sha256=ZG1c_FM2O4145--84AgRXprermG8dv4S9WcEeDk6MHg,15427
-albert-1.11.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-albert-1.11.0.dist-info/licenses/LICENSE,sha256=S7_vRdIhQmG7PmTlU8-BCCveuEcFZ6_3IUVdcoaJMuA,11348
-albert-1.11.0.dist-info/RECORD,,
+albert-1.11.2.dist-info/METADATA,sha256=zBwfJkO8ubUMm-06Wj3wA8c4eE97E_LbUj5K03bEKY4,15427
+albert-1.11.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+albert-1.11.2.dist-info/licenses/LICENSE,sha256=S7_vRdIhQmG7PmTlU8-BCCveuEcFZ6_3IUVdcoaJMuA,11348
+albert-1.11.2.dist-info/RECORD,,