zenml-nightly 0.83.0.dev20250612__py3-none-any.whl → 0.83.0.dev20250613__py3-none-any.whl

zenml/VERSION

@@ -1 +1 @@
-0.83.0.dev20250612
+0.83.0.dev20250613

zenml/client.py

@@ -3542,7 +3542,9 @@ class Client(metaclass=ClientMetaClass):
         """
         return self._get_entity_by_id_or_name_or_prefix(
             get_method=self.zen_store.get_run_template,
-            list_method=self.list_run_templates,
+            list_method=functools.partial(
+                self.list_run_templates, hidden=None
+            ),
             name_id_or_prefix=name_id_or_prefix,
             allow_name_prefix_match=False,
             project=project,

zenml/utils/tag_utils.py

@@ -44,7 +44,7 @@ add_tags(tags=[...], run_template=...)
 # Manual tagging to an artifact
 add_tags(tags=[...], artifact=...)
 
-# Automatic tagging to an artifact version(within a step)
+# Automatic tagging to an artifact version (within a step)
 add_tags(tags=[...], infer_artifact=True)  # step with single output
 add_tags(tags=[...], artifact_name=..., infer_artifact=True)  # specific output of a step
 
@@ -148,7 +148,7 @@ def add_tags(
     *,
     tags: List[Union[str, Tag]],
     artifact_name: str,
-    artifact_version: Optional[str] = None,
+    artifact_version: str,
 ) -> None: ...
 
 
@@ -191,7 +191,7 @@ def add_tags(
     artifact_version_id: Optional[UUID] = None,
     artifact_name: Optional[str] = None,
     artifact_version: Optional[str] = None,
-    infer_artifact: bool = False,
+    infer_artifact: Optional[bool] = None,
 ) -> None:
     """Add tags to various resource types in a generalized way.
 
@@ -220,19 +220,52 @@ def add_tags(
     resource_type = None
 
     # Tag a pipeline
-    if pipeline is not None:
+    if pipeline is not None and all(
+        v is None
+        for v in [
+            run,
+            run_template,
+            artifact,
+            artifact_version_id,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
         pipeline_model = client.get_pipeline(name_id_or_prefix=pipeline)
         resource_id = pipeline_model.id
         resource_type = TaggableResourceTypes.PIPELINE
 
     # Tag a run by ID
-    elif run is not None:
+    elif run is not None and all(
+        v is None
+        for v in [
+            pipeline,
+            run_template,
+            artifact,
+            artifact_version_id,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
         run_model = client.get_pipeline_run(name_id_or_prefix=run)
         resource_id = run_model.id
         resource_type = TaggableResourceTypes.PIPELINE_RUN
 
     # Tag a run template
-    elif run_template is not None:
+    elif run_template is not None and all(
+        v is None
+        for v in [
+            pipeline,
+            run,
+            artifact,
+            artifact_version_id,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
         run_template_model = client.get_run_template(
             name_id_or_prefix=run_template
         )
@@ -240,26 +273,68 @@ def add_tags(
         resource_type = TaggableResourceTypes.RUN_TEMPLATE
 
     # Tag an artifact
-    elif artifact is not None:
+    elif artifact is not None and all(
+        v is None
+        for v in [
+            pipeline,
+            run,
+            run_template,
+            artifact_version_id,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
         artifact_model = client.get_artifact(name_id_or_prefix=artifact)
         resource_id = artifact_model.id
         resource_type = TaggableResourceTypes.ARTIFACT
 
+    # Tag an artifact version by its ID
+    elif artifact_version_id is not None and all(
+        v is None
+        for v in [
+            pipeline,
+            run,
+            run_template,
+            artifact,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
+        resource_id = artifact_version_id
+        resource_type = TaggableResourceTypes.ARTIFACT_VERSION
+
     # Tag an artifact version by its name and version
-    elif artifact_name is not None and artifact_version is not None:
+    elif (artifact_name is not None and artifact_version is not None) and all(
+        v is None
+        for v in [
+            pipeline,
+            run,
+            run_template,
+            artifact,
+            artifact_version_id,
+            infer_artifact,
+        ]
+    ):
         artifact_version_model = client.get_artifact_version(
             name_id_or_prefix=artifact_name, version=artifact_version
         )
         resource_id = artifact_version_model.id
         resource_type = TaggableResourceTypes.ARTIFACT_VERSION
 
-    # Tag an artifact version by its ID
-    elif artifact_version_id is not None:
-        resource_id = artifact_version_id
-        resource_type = TaggableResourceTypes.ARTIFACT_VERSION
-
     # Tag an artifact version through the step context
-    elif infer_artifact is True:
+    elif infer_artifact is True and all(
+        v is None
+        for v in [
+            pipeline,
+            run,
+            run_template,
+            artifact,
+            artifact_version_id,
+            artifact_version,
+        ]
+    ):
         resource_type = TaggableResourceTypes.ARTIFACT_VERSION
 
         try:
@@ -308,12 +383,14 @@ def add_tags(
     elif all(
         v is None
         for v in [
+            pipeline,
             run,
+            run_template,
+            artifact,
             artifact_version_id,
             artifact_name,
             artifact_version,
-            pipeline,
-            run_template,
+            infer_artifact,
         ]
     ):
         try:
@@ -437,7 +514,7 @@ def remove_tags(
     *,
     tags: List[str],
     artifact_name: str,
-    artifact_version: Optional[str] = None,
+    artifact_version: str,
 ) -> None: ...
 
 
@@ -464,7 +541,7 @@ def remove_tags(
     artifact_version_id: Optional[UUID] = None,
     artifact_name: Optional[str] = None,
     artifact_version: Optional[str] = None,
-    infer_artifact: bool = False,
+    infer_artifact: Optional[bool] = None,
 ) -> None:
     """Remove tags from various resource types in a generalized way.
 
@@ -492,13 +569,35 @@ def remove_tags(
     resource_type = None
 
     # Remove tags from a pipeline
-    if pipeline is not None:
+    if pipeline is not None and all(
+        v is None
+        for v in [
+            run_template,
+            run,
+            artifact,
+            artifact_version_id,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
         pipeline_model = client.get_pipeline(name_id_or_prefix=pipeline)
         resource_id = pipeline_model.id
         resource_type = TaggableResourceTypes.PIPELINE
 
     # Remove tags from a run template
-    elif run_template is not None:
+    elif run_template is not None and all(
+        v is None
+        for v in [
+            pipeline,
+            run,
+            artifact,
+            artifact_version_id,
+            artifact_version,
+            artifact_name,
+            infer_artifact,
+        ]
+    ):
         run_template_model = client.get_run_template(
             name_id_or_prefix=run_template
         )
@@ -506,32 +605,85 @@ def remove_tags(
         resource_type = TaggableResourceTypes.RUN_TEMPLATE
 
     # Remove tags from a run
-    elif run is not None:
+    elif run is not None and all(
+        v is None
+        for v in [
+            pipeline,
+            run_template,
+            artifact,
+            artifact_version_id,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
         run_model = client.get_pipeline_run(name_id_or_prefix=run)
         resource_id = run_model.id
         resource_type = TaggableResourceTypes.PIPELINE_RUN
 
     # Remove tags from an artifact
-    elif artifact is not None:
+    elif artifact is not None and all(
+        v is None
+        for v in [
+            pipeline,
+            run_template,
+            run,
+            artifact_version_id,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
         artifact_model = client.get_artifact(name_id_or_prefix=artifact)
         resource_id = artifact_model.id
         resource_type = TaggableResourceTypes.ARTIFACT
 
+    # Remove tags from an artifact version by its ID
+    elif artifact_version_id is not None and all(
+        v is None
+        for v in [
+            pipeline,
+            run_template,
+            run,
+            artifact,
+            artifact_name,
+            artifact_version,
+            infer_artifact,
+        ]
+    ):
+        resource_id = artifact_version_id
+        resource_type = TaggableResourceTypes.ARTIFACT_VERSION
+
     # Remove tags from an artifact version by its name and version
-    elif artifact_name is not None and artifact_version is not None:
+    elif (artifact_name is not None and artifact_version is not None) and all(
+        v is None
+        for v in [
+            pipeline,
+            run_template,
+            run,
+            artifact,
+            artifact_version_id,
+            infer_artifact,
+        ]
+    ):
         artifact_version_model = client.get_artifact_version(
             name_id_or_prefix=artifact_name, version=artifact_version
         )
         resource_id = artifact_version_model.id
         resource_type = TaggableResourceTypes.ARTIFACT_VERSION
 
-    # Remove tags from an artifact version by its ID
-    elif artifact_version_id is not None:
-        resource_id = artifact_version_id
-        resource_type = TaggableResourceTypes.ARTIFACT_VERSION
-
     # Remove tags from an artifact version through the step context
-    elif infer_artifact is True:
+    elif infer_artifact is True and all(
+        v is None
+        for v in [
+            pipeline,
+            run_template,
+            run,
+            artifact,
+            artifact_version_id,
+            artifact_version,
+        ]
+    ):
         try:
             from zenml.steps.step_context import get_step_context
 
@@ -579,12 +731,14 @@ def remove_tags(
     elif all(
         v is None
         for v in [
+            pipeline,
             run,
+            run_template,
+            artifact,
             artifact_version_id,
             artifact_name,
             artifact_version,
-            pipeline,
-            run_template,
+            infer_artifact,
         ]
     ):
         try:

zenml/zen_stores/sql_zen_store.py

@@ -3001,10 +3001,6 @@ class SqlZenStore(BaseZenStore):
                     )
                     session.add(vis_schema)
 
-            # Commit the visualizations so potential future rollbacks don't
-            # remove them
-            session.commit()
-
             # Save tags of the artifact
             self._attach_tags_to_resources(
                 tags=artifact_version.tags,
@@ -5188,9 +5184,19 @@ class SqlZenStore(BaseZenStore):
                             # we want to display them as separate nodes in the
                             # DAG. We can therefore always create a new node
                             # here.
+                            is_manual_load = (
+                                input.type == StepRunInputArtifactType.MANUAL
+                            )
                             artifact_node = helper.add_artifact_node(
                                 node_id=helper.get_artifact_node_id(
-                                    name=input.name,
+                                    # For manual loads, the name might not be
+                                    # unique, so we use the artifact ID instead.
+                                    # We don't need to keep the name consistent
+                                    # with placeholder nodes as they don't exist
+                                    # for manual loads.
+                                    name=str(input.artifact_id)
+                                    if is_manual_load
+                                    else input.name,
                                     step_name=step_name,
                                     io_type=input.type,
                                     is_input=True,
@@ -5221,9 +5227,20 @@ class SqlZenStore(BaseZenStore):
                         # want to merge these and instead display them
                         # separately in the DAG, but if that should ever change
                         # this would be the place to merge them.
+                        is_manual_save = (
+                            output.artifact_version.save_type
+                            == ArtifactSaveType.MANUAL
+                        )
                         artifact_node = helper.add_artifact_node(
                             node_id=helper.get_artifact_node_id(
-                                name=output.name,
+                                # For manual saves, the name might not be
+                                # unique, so we use the artifact ID instead.
+                                # We don't need to keep the name consistent
+                                # with placeholder nodes as they don't exist
+                                # for manual saves.
+                                name=str(output.artifact_id)
+                                if is_manual_save
+                                else output.name,
                                 step_name=step_name,
                                 io_type=output.artifact_version.save_type,
                                 is_input=False,
@@ -12003,17 +12020,16 @@ class SqlZenStore(BaseZenStore):
         validate_name(tag)
         self._set_request_user_id(request_model=tag, session=session)
 
-        with session.begin_nested() as nested_session:
-            tag_schema = TagSchema.from_request(tag)
-            session.add(tag_schema)
+        tag_schema = TagSchema.from_request(tag)
+        session.add(tag_schema)
 
-            try:
-                session.commit()
-            except IntegrityError:
-                nested_session.rollback()
-                raise EntityExistsError(
-                    f"Tag with name `{tag.name}` already exists."
-                )
+        try:
+            session.commit()
+        except IntegrityError:
+            session.rollback()
+            raise EntityExistsError(
+                f"Tag with name `{tag.name}` already exists."
+            )
         return tag_schema
 
     @track_decorator(AnalyticsEvent.CREATED_TAG)
@@ -12394,6 +12410,7 @@ class SqlZenStore(BaseZenStore):
                             other_runs_with_same_tag = self.list_runs(
                                 PipelineRunFilter(
                                     id=f"notequals:{resource.id}",
+                                    project=resource.project.id,
                                     pipeline_id=resource.pipeline_id,
                                     tags=[tag_schema.name],
                                 )
@@ -12418,6 +12435,7 @@ class SqlZenStore(BaseZenStore):
                                 self.list_artifact_versions(
                                     ArtifactVersionFilter(
                                         id=f"notequals:{resource.id}",
+                                        project=resource.project.id,
                                         artifact_id=resource.artifact_id,
                                         tags=[tag_schema.name],
                                     )
@@ -12447,6 +12465,7 @@ class SqlZenStore(BaseZenStore):
                                 older_templates = self.list_run_templates(
                                     RunTemplateFilter(
                                         id=f"notequals:{resource.id}",
+                                        project=resource.project.id,
                                         pipeline_id=scope_id,
                                         tags=[tag_schema.name],
                                     )

{zenml_nightly-0.83.0.dev20250612.dist-info → zenml_nightly-0.83.0.dev20250613.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: zenml-nightly
-Version: 0.83.0.dev20250612
+Version: 0.83.0.dev20250613
 Summary: ZenML: Write production-ready ML code.
 License: Apache-2.0
 Keywords: machine learning,production,pipeline,mlops,devops

{zenml_nightly-0.83.0.dev20250612.dist-info → zenml_nightly-0.83.0.dev20250613.dist-info}/RECORD

@@ -1,5 +1,5 @@
 zenml/README.md,sha256=827dekbOWAs1BpW7VF1a4d7EbwPbjwccX-2zdXBENZo,1777
-zenml/VERSION,sha256=HXay_lP3loPwJZwUQVwYs5HL4KZ-1gKOR5QVleAsS4Y,19
+zenml/VERSION,sha256=raYTX7L20222A6BNt7Djwt8Q0R7IUDK_SDF-BODdqRg,19
 zenml/__init__.py,sha256=CKEyepFK-7akXYiMrNVh92Nb01Cjs23w4_YyI6sgdc8,2242
 zenml/actions/__init__.py,sha256=mrt6wPo73iKRxK754_NqsGyJ3buW7RnVeIGXr1xEw8Y,681
 zenml/actions/base_action.py,sha256=UcaHev6BTuLDwuswnyaPjdA8AgUqB5xPZ-lRtuvf2FU,25553
@@ -55,7 +55,7 @@ zenml/cli/text_utils.py,sha256=bY1GIjoULt1cW2FyrPlMoAXNS2R7cSOjDFEZQqrpVQ8,3553
 zenml/cli/user_management.py,sha256=sNnhaUxH-cHecbZBR1L0mEU0TnLNZHzI6ZBCUSQa7OY,13078
 zenml/cli/utils.py,sha256=vMAb9f6GDfNVGmZWOz9UOyPRpKI3KfnYpRl_w9YUBNE,86501
 zenml/cli/version.py,sha256=nm1iSU_1V6-MUwpMKeXcwFhLYGUMLswvQL67cEuCpxA,3635
-zenml/client.py,sha256=cf4sYrVCx9xbX3ZcQKF2j-jRroCxy-MKUNkEOhZD1yk,293336
+zenml/client.py,sha256=YXGUxFdpxLHcl84Oe4Mc1QoXph8aBsUPUT6wOcjBEWQ,293398
 zenml/client_lazy_loader.py,sha256=oyxKvBWVB7k2pHMavdhNEOfR2Vk4IS3XUu43SBzDPsI,7152
 zenml/code_repositories/__init__.py,sha256=W5bDfzAG8OXIKZSV1L-VHuzMcSCYa9qzTdPb3jqfyYw,920
 zenml/code_repositories/base_code_repository.py,sha256=Id6VjbUu8N3ZpNvBGhOgbahtoMiCAtYXed3G7YQ_iAc,5225
@@ -797,7 +797,7 @@ zenml/utils/singleton.py,sha256=uFRrUlUdS5VyY9lLJyl_n5kqppsqJLKkBhSj4g5VPkY,2757
 zenml/utils/source_code_utils.py,sha256=8iyNA2MGIORYVEkSdxNTXfS1ZdFKXTAG1dZRkeQtPL0,3751
 zenml/utils/source_utils.py,sha256=joKLghhDq9dh0fd8B0WRGX-nN-uwnGQdgmsyY_n-8gY,27033
 zenml/utils/string_utils.py,sha256=xJ8Abm52yFQyOpNrgpoLjDbPCgb6rpJsi8N4-7bb5GU,7254
-zenml/utils/tag_utils.py,sha256=2LJ-3XkXuWnffUsyfCwahzL_N2k4lIYIgBs1HVShhA0,19180
+zenml/utils/tag_utils.py,sha256=GjuTyrkZAPhT27nP41bttBAvqGFpzgVZ9WZ_mswLc6o,22543
 zenml/utils/time_utils.py,sha256=-9Y9zwJ-6Gv7hoZQCoftPyC2LCLo2bYj6OgdyBaE44o,4076
 zenml/utils/typed_model.py,sha256=00EAo1I1VnOBHG4-ce8dPkyHRPpgi67SRIU-KdewRWs,4757
 zenml/utils/typing_utils.py,sha256=jP7JKrlLsuMIStXhwKFNWykE6SMOR72tJIJ_qEbQSNc,6555
@@ -1324,11 +1324,11 @@ zenml/zen_stores/secrets_stores/hashicorp_secrets_store.py,sha256=5err1a-TrV3SR5
 zenml/zen_stores/secrets_stores/secrets_store_interface.py,sha256=Q2Jbnt2Pp7NGlR-u1YBfRZV2g8su2Fd0ArBMdksAE-Q,2819
 zenml/zen_stores/secrets_stores/service_connector_secrets_store.py,sha256=S87ne23D08PAwtfRVlVnBn8R0ilTpEh6r8blauNV5WQ,6941
 zenml/zen_stores/secrets_stores/sql_secrets_store.py,sha256=LPFW757WCJLP1S8vrvjsrl2Tf1yo281xUTjSBsos4qk,8788
-zenml/zen_stores/sql_zen_store.py,sha256=zgdaIUTG2JYTr6_sW_yhYar_ZgPQZiKWEO3rmM0ys1Y,466071
+zenml/zen_stores/sql_zen_store.py,sha256=uYYwCvz-ot-qHPModf7Z6FheVRtZj7TUiWw-tHaBzGI,467346
 zenml/zen_stores/template_utils.py,sha256=GbJ7LgGVYHSCKPEA8RNTxPoVTWqpC77F_lGzjJ4O1Fw,9220
 zenml/zen_stores/zen_store_interface.py,sha256=_ap55L3_mrHgegsLkMRSmmNXVasYC53LwjcEeuS1YT4,92411
-zenml_nightly-0.83.0.dev20250612.dist-info/LICENSE,sha256=wbnfEnXnafPbqwANHkV6LUsPKOtdpsd-SNw37rogLtc,11359
-zenml_nightly-0.83.0.dev20250612.dist-info/METADATA,sha256=FUzuC18FJ-qvtfLPJ0snlCP_3lBm9oeE3ek0V2z4gtw,24317
-zenml_nightly-0.83.0.dev20250612.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-zenml_nightly-0.83.0.dev20250612.dist-info/entry_points.txt,sha256=QK3ETQE0YswAM2mWypNMOv8TLtr7EjnqAFq1br_jEFE,43
-zenml_nightly-0.83.0.dev20250612.dist-info/RECORD,,
+zenml_nightly-0.83.0.dev20250613.dist-info/LICENSE,sha256=wbnfEnXnafPbqwANHkV6LUsPKOtdpsd-SNw37rogLtc,11359
+zenml_nightly-0.83.0.dev20250613.dist-info/METADATA,sha256=2iedUCzK58EUDGXITPNywLGmCuqlhXKHvyfj8d7JE7A,24317
+zenml_nightly-0.83.0.dev20250613.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+zenml_nightly-0.83.0.dev20250613.dist-info/entry_points.txt,sha256=QK3ETQE0YswAM2mWypNMOv8TLtr7EjnqAFq1br_jEFE,43
+zenml_nightly-0.83.0.dev20250613.dist-info/RECORD,,