matelab-python-sdk 0.2.0a8__py3-none-any.whl → 0.2.0a9__py3-none-any.whl

matelab/_generated/models.py

@@ -11,7 +11,7 @@ from pydantic import ConfigDict, Field, RootModel, SecretStr, StrictBool, Strict
 
 from matelab._wire_validation import WireModel
 
-OPENAPI_INFO_VERSION = "2026.10.4"
+OPENAPI_INFO_VERSION = "2026.11.1"
 
 
 class ResponseEnvelope(WireModel):

matelab/domains/records.py

@@ -16,6 +16,7 @@ from matelab._hashes import LOWERCASE_SHA256_PATTERN
 from matelab._transport import Encoding, Operation, SessionTransport, StreamOperation
 from matelab._wire_validation import WireValue, encode_json_field, validate_multipart_request, validate_request
 from matelab.domains._attachment_content import prepare_attachment_content
+from matelab.domains.cloud_drive import CloudFile
 from matelab.domains.notebooks import NotebookPermissions, NotebookRef, validate_notebook_scope
 from matelab.domains.uploads import UploadBindingRef
 from matelab.domains.users import UserRef
@@ -432,6 +433,7 @@ RecordImportValue: TypeAlias = (
     | bool
     | None
     | StagedAttachment
+    | CloudFile
     | Mapping[str, "RecordImportValue"]
     | list["RecordImportValue"]
     | tuple["RecordImportValue", ...]
@@ -488,11 +490,11 @@ class RecordValueAddition:
 
 @dataclass(frozen=True, slots=True)
 class RecordFormAttachmentFieldAddition:
-    """Add one new file field and finalize one staged attachment."""
+    """Add one file field from a staged upload or an existing cloud file."""
 
     module: str
     name: str
-    attachment: StagedAttachment
+    attachment: StagedAttachment | CloudFile
 
 
 @dataclass(frozen=True, slots=True)
@@ -929,8 +931,8 @@ def _current_attachment(source: RecordLocator, current: Record, requested: Recor
     return attachment
 
 
-def _iter_import_attachments(value: RecordImportValue) -> Iterator[StagedAttachment]:
-    if isinstance(value, StagedAttachment):
+def _iter_import_attachments(value: RecordImportValue) -> Iterator[StagedAttachment | CloudFile]:
+    if isinstance(value, StagedAttachment | CloudFile):
         yield value
     elif isinstance(value, Mapping):
         for item in value.values():
@@ -940,13 +942,13 @@ def _iter_import_attachments(value: RecordImportValue) -> Iterator[StagedAttachm
             yield from _iter_import_attachments(item)
 
 
-def _iter_dataset_attachments(items: Sequence[RecordImportItem]) -> Iterator[StagedAttachment]:
+def _iter_dataset_attachments(items: Sequence[RecordImportItem]) -> Iterator[StagedAttachment | CloudFile]:
     for item in items:
         for value in item.data.values():
             yield from _iter_import_attachments(value)
 
 
-def _iter_update_attachments(changes: tuple[RecordChange, ...]) -> Iterator[StagedAttachment]:
+def _iter_update_attachments(changes: tuple[RecordChange, ...]) -> Iterator[StagedAttachment | CloudFile]:
     for change in changes:
         if isinstance(
             change,
@@ -965,6 +967,7 @@ def _iter_update_attachments(changes: tuple[RecordChange, ...]) -> Iterator[Stag
 def _validate_staged_name_update_shape(changes: tuple[RecordChange, ...]) -> None:
     has_finalizer = any(
         isinstance(change, RecordFormAttachmentFieldAddition | RecordTableFileCellSet | RecordTableRowAttachmentAppend)
+        and isinstance(change.attachment, StagedAttachment)
         or isinstance(change, RecordFilesAttachmentAppend)
         and bool(change.folder_path)
         for change in changes
@@ -994,7 +997,7 @@ def _record_update_requires_current_state(changes: tuple[RecordChange, ...]) ->
     )
 
 
-def _encode_record_attachment_reference(attachment: StagedAttachment) -> str:
+def _encode_record_attachment_reference(attachment: StagedAttachment | CloudFile) -> str:
     return f"#hash{{{attachment.filename}, {attachment.sha256}}}"
 
 
@@ -1925,7 +1928,7 @@ class Records:
                 | RecordTableRowAttachmentAppend
                 | RecordFilesAttachmentAppend,
             ):
-                self._compile_staged_record_attachment_change(change, patch)
+                self._compile_record_attachment_addition(change, patch)
             else:
                 self._compile_observed_record_attachment_change(
                     source, current, change, removals, value_deletions, patch
@@ -1939,7 +1942,7 @@ class Records:
             patch.claim(path)
             patch.modify.append({"path": list(path), "data": _encode_record_rich_text(change)})
 
-    def _compile_staged_record_attachment_change(
+    def _compile_record_attachment_addition(
         self,
         change: (
             RecordFormAttachmentFieldAddition
@@ -1953,19 +1956,31 @@ class Records:
             patch.reject_deleted_module(change.module)
             module = patch.modules.get(change.module)
             if module is None or module.get("type") != "form":
-                raise MatelabUsageError("A record attachment can be finalized only into an existing form module.")
-            if not change.name or _module_field(module, change.name) is not None:
-                raise MatelabUsageError("A record attachment requires a new non-empty form field name.")
+                raise MatelabUsageError("A record attachment requires an existing form module.")
+            if (
+                not change.name
+                or _module_field(module, change.name) is not None
+                or any(
+                    isinstance(addition, dict)
+                    and addition.get("module") == change.module
+                    and addition.get("name") == change.name
+                    for addition in patch.add_values
+                )
+            ):
+                raise MatelabUsageError("A record attachment requires a new, unique non-empty form field name.")
+            patch.claim((change.module, change.name))
+            attachment = change.attachment
+            if isinstance(attachment, CloudFile):
+                model = wire_models.AddValueOperation
+                reference = _encode_record_attachment_reference(attachment)
+            else:
+                model = wire_models.AddNewFormFileFieldWithStagedAttachmentOperation
+                reference = f"#file{{{attachment.binding.uid}}}"
             patch.add_values.append(
                 _operation_payload(
-                    wire_models.AddNewFormFileFieldWithStagedAttachmentOperation,
-                    {
-                        "module": change.module,
-                        "name": change.name,
-                        "type": "file",
-                        "data": [f"#file{{{change.attachment.binding.uid}}}"],
-                    },
-                    "New form-file attachment finalizer does not satisfy the contract.",
+                    model,
+                    {"module": change.module, "name": change.name, "type": "file", "data": [reference]},
+                    "New form-file attachment does not satisfy the contract.",
                 )
             )
             return
@@ -2235,11 +2250,21 @@ class Records:
             )
 
     def _staged_attachment_keys(
-        self, notebook: NotebookRef, attachments: Iterable[StagedAttachment]
+        self, notebook: NotebookRef, attachments: Iterable[StagedAttachment | CloudFile]
     ) -> set[_StagedAttachmentKey]:
         uploader = UserRef(userid=self._transport.require_session().identity.userid)
         keys: set[_StagedAttachmentKey] = set()
         for attachment in attachments:
+            if isinstance(attachment, CloudFile):
+                if (
+                    not attachment.filename
+                    or len(attachment.filename) > 255
+                    or "\r" in attachment.filename
+                    or "\n" in attachment.filename
+                    or LOWERCASE_SHA256_PATTERN.fullmatch(attachment.sha256) is None
+                ):
+                    raise MatelabUsageError("Cloud-file metadata does not satisfy the Integration Contract.")
+                continue
             if attachment.notebook != notebook:
                 raise MatelabUsageError("Staged attachment belongs to a different notebook.")
             if attachment.uploader != uploader:
@@ -2262,9 +2287,11 @@ class Records:
         """Encode one domain import value."""
         if isinstance(value, StagedAttachment):
             return f"#file{{{value.binding.uid}}}"
+        if isinstance(value, CloudFile):
+            return _encode_record_attachment_reference(value)
         if isinstance(value, str):
             if _contains_native_attachment_reference(value):
-                raise MatelabUsageError("Provider-native attachment references require a staged attachment object.")
+                raise MatelabUsageError("Provider-native attachment references require a typed attachment object.")
             return value
         if isinstance(value, Mapping):
             return {name: self._encode_import_value(item) for name, item in value.items()}

{matelab_python_sdk-0.2.0a8.dist-info → matelab_python_sdk-0.2.0a9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: matelab-python-sdk
-Version: 0.2.0a8
+Version: 0.2.0a9
 Summary: Reusable async Python client for the Matelab Integration Contract
 Author: CMPDC, Institute of Physics, Chinese Academy of Sciences
 License-Expression: Apache-2.0

{matelab_python_sdk-0.2.0a8.dist-info → matelab_python_sdk-0.2.0a9.dist-info}/RECORD

@@ -8,19 +8,19 @@ matelab/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 matelab/session.py,sha256=D8i9uyAt32-bADotS-Lrb7RpmWRNYNIkIpZUijTYvy4,899
 matelab/streaming.py,sha256=36epH2josWk87Ors_JY0YsjNmtiq3NZa2iB9djLmlnY,3792
 matelab/_generated/__init__.py,sha256=jmGbXLLe3JorsGU7OUdF8iKGewFMRqkCzgyFAw7C15w,79
-matelab/_generated/models.py,sha256=pKWhccohpfOQTfJHjXo0GGYATT8yfK8tZU2h47gmEmA,179704
+matelab/_generated/models.py,sha256=VhE1ixBb-qflSTEO8VEbixnB6jtHshXqCd9gAgJBGQ8,179704
 matelab/domains/__init__.py,sha256=C34IWsGoCAwP7r6uYKJ79DJkToZyrZ4LWA87ufc1i0Q,65
 matelab/domains/_attachment_content.py,sha256=z26hwFpdgAk2x1w8EGe00XBLtJ3QFDX8BPS35Zc5SoE,1461
 matelab/domains/cloud_drive.py,sha256=EoqAYWvLVUfVOsic3g-TxsQEtAI3wTp5h0_vB79KpwY,10406
 matelab/domains/groups.py,sha256=H8-Da2WTm2Ui4m3Nr1bhMNMn7stbzbRa3EmpkTRmkBU,1300
 matelab/domains/literature.py,sha256=xpdHuFCR1RpEPB_Lk8VOaddlIpGQ2rnp4kxl5a8Bk4M,27473
 matelab/domains/notebooks.py,sha256=_SvffaViECSEOkN5iwXtSv6El3fK2OYaR4RJvUCXfGk,13477
-matelab/domains/records.py,sha256=laluv0XiN26369PcO-mGxlugaDrqE-M67yICFYwoMzI,94263
+matelab/domains/records.py,sha256=U3zOLwTjJ1YbnuayGXKroEKhUZLhsmjRCYtnFaDyJzQ,95614
 matelab/domains/templates.py,sha256=-x7RqRLhrRnAK3HGK3c4I3C-SsAk7zpicIcvzoVd414,17698
 matelab/domains/uploads.py,sha256=6y4i85UWGxumasWw9HAubcgtK_fqgZLnBUbX0oghxQU,7699
 matelab/domains/users.py,sha256=ZhlLzC_AadwYqNqxQrqkUBgIUqL7MJ6FgMyxwq-az8s,1445
-matelab_python_sdk-0.2.0a8.dist-info/METADATA,sha256=LkiXjUNtd2lkTuHmc6f5pgMyHvEJO-jXN_JZ1JGE1Ok,2436
-matelab_python_sdk-0.2.0a8.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
-matelab_python_sdk-0.2.0a8.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-matelab_python_sdk-0.2.0a8.dist-info/licenses/NOTICE,sha256=Hc4scCJTof5VL3JCPI2aaewnnzCejIHUGuBVYBf-klc,98
-matelab_python_sdk-0.2.0a8.dist-info/RECORD,,
+matelab_python_sdk-0.2.0a9.dist-info/METADATA,sha256=l5luHe5D2BRV0uAUoy1EusPL6A_bpCGQSlqHEp08_Ro,2436
+matelab_python_sdk-0.2.0a9.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+matelab_python_sdk-0.2.0a9.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+matelab_python_sdk-0.2.0a9.dist-info/licenses/NOTICE,sha256=Hc4scCJTof5VL3JCPI2aaewnnzCejIHUGuBVYBf-klc,98
+matelab_python_sdk-0.2.0a9.dist-info/RECORD,,