Refactor workspaces into projects

src/zenml/artifacts/utils.py

@@ -182,7 +182,6 @@ def _store_artifact_data_and_prepare_request(
         uri=materializer.uri,
         materializer=source_utils.resolve(materializer.__class__),
         data_type=source_utils.resolve(data_type),
-        user=Client().active_user.id,
         workspace=Client().active_workspace.id,
         artifact_store_id=artifact_store.id,
         visualizations=visualizations,
@@ -350,7 +349,6 @@ def register_artifact(
         uri=folder_or_file_uri,
         materializer=source_utils.resolve(PreexistingDataMaterializer),
         data_type=source_utils.resolve(Path),
-        user=Client().active_user.id,
         workspace=Client().active_workspace.id,
         artifact_store_id=artifact_store.id,
         has_custom_name=has_custom_name,

src/zenml/cli/secret.py

@@ -38,7 +38,6 @@
 from zenml.constants import SECRET_VALUES
 from zenml.enums import (
     CliCategories,
-    SecretScope,
 )
 from zenml.exceptions import EntityExistsError, ZenKeyError
 from zenml.logger import get_logger
@@ -59,11 +58,12 @@ def secret() -> None:
 )
 @click.argument("name", type=click.STRING)
 @click.option(
-    "--scope",
-    "-s",
-    "scope",
-    type=click.Choice([scope.value for scope in list(SecretScope)]),
-    default=SecretScope.WORKSPACE.value,
+    "--private",
+    "-p",
+    "private",
+    is_flag=True,
+    help="Whether the secret is private. A private secret is only accessible "
+    "to the user who creates it.",
 )
 @click.option(
     "--interactive",
@@ -84,13 +84,13 @@ def secret() -> None:
 )
 @click.argument("args", nargs=-1, type=click.UNPROCESSED)
 def create_secret(
-    name: str, scope: str, interactive: bool, values: str, args: List[str]
+    name: str, private: bool, interactive: bool, values: str, args: List[str]
 ) -> None:
     """Create a secret.
 
     Args:
         name: The name of the secret to create.
-        scope: The scope of the secret to create.
+        private: Whether the secret is private.
         interactive: Whether to use interactive mode to enter the secret values.
         values: Secret key-value pairs to be passed as JSON or YAML.
         args: The arguments to pass to the secret.
@@ -152,7 +152,7 @@ def create_secret(
         with console.status(f"Saving secret `{name}`..."):
             try:
                 client.create_secret(
-                    name=name, values=parsed_args, scope=SecretScope(scope)
+                    name=name, values=parsed_args, private=private
                 )
                 declare(f"Secret '{name}' successfully created.")
             except EntityExistsError as e:
@@ -186,7 +186,7 @@ def list_secrets(**kwargs: Any) -> None:
             dict(
                 name=secret.name,
                 id=str(secret.id),
-                scope=secret.scope.value,
+                private=secret.private,
             )
             for secret in secrets.items
         ]
@@ -200,22 +200,26 @@ def list_secrets(**kwargs: Any) -> None:
     type=click.STRING,
 )
 @click.option(
-    "--scope",
-    "-s",
-    type=click.Choice([scope.value for scope in list(SecretScope)]),
-    default=None,
+    "--private",
+    "-p",
+    "private",
+    type=click.BOOL,
+    required=False,
+    help="Use this flag to explicitly fetch a private secret or a public secret.",
 )
-def get_secret(name_id_or_prefix: str, scope: Optional[str] = None) -> None:
+def get_secret(name_id_or_prefix: str, private: Optional[bool] = None) -> None:
     """Get a secret and print it to the console.
 
     Args:
         name_id_or_prefix: The name of the secret to get.
-        scope: The scope of the secret to get.
+        private: Private status of the secret to filter for.
     """
-    secret = _get_secret(name_id_or_prefix, scope)
+    secret = _get_secret(name_id_or_prefix, private)
+    scope = ""
+    if private is not None:
+        scope = "private " if private else "public "
     declare(
-        f"Fetched secret with name `{secret.name}` and ID `{secret.id}` in "
-        f"scope `{secret.scope.value}`:"
+        f"Fetched {scope}secret with name `{secret.name}` and ID `{secret.id}`:"
     )
     if not secret.secret_values:
         warning(f"Secret with name `{name_id_or_prefix}` is empty.")
@@ -224,25 +228,22 @@ def get_secret(name_id_or_prefix: str, scope: Optional[str] = None) -> None:
 
 
 def _get_secret(
-    name_id_or_prefix: str, scope: Optional[str] = None
+    name_id_or_prefix: str, private: Optional[bool] = None
 ) -> SecretResponse:
     """Get a secret with a given name, prefix or id.
 
     Args:
         name_id_or_prefix: The name of the secret to get.
-        scope: The scope of the secret to get.
+        private: Private status of the secret to filter for.
 
     Returns:
         The secret response model.
     """
     client = Client()
     try:
-        if scope:
-            return client.get_secret(
-                name_id_or_prefix=name_id_or_prefix, scope=SecretScope(scope)
-            )
-        else:
-            return client.get_secret(name_id_or_prefix=name_id_or_prefix)
+        return client.get_secret(
+            name_id_or_prefix=name_id_or_prefix, private=private
+        )
     except ZenKeyError as e:
         error(
             f"Error fetching secret with name id or prefix "
@@ -267,9 +268,12 @@ def _get_secret(
     type=click.STRING,
 )
 @click.option(
-    "--new-scope",
-    "-s",
-    type=click.Choice([scope.value for scope in list(SecretScope)]),
+    "--private",
+    "-p",
+    "private",
+    type=click.BOOL,
+    required=False,
+    help="Update the private status of the secret.",
 )
 @click.option(
     "--interactive",
@@ -293,7 +297,7 @@ def _get_secret(
 def update_secret(
     name_or_id: str,
     extra_args: List[str],
-    new_scope: Optional[str] = None,
+    private: Optional[bool] = None,
     remove_keys: List[str] = [],
     interactive: bool = False,
     values: str = "",
@@ -302,7 +306,7 @@ def update_secret(
 
     Args:
         name_or_id: The name or id of the secret to update.
-        new_scope: The new scope of the secret.
+        private: Private status of the secret to update.
         extra_args: The arguments to pass to the secret.
         interactive: Whether to use interactive mode to update the secret.
         remove_keys: The keys to remove from the secret.
@@ -331,10 +335,7 @@ def update_secret(
         except NotImplementedError as e:
             error(f"Centralized secrets management is disabled: {str(e)}")
 
-    declare(
-        f"Updating secret with name '{secret.name}' and ID '{secret.id}' in "
-        f"scope '{secret.scope.value}:"
-    )
+    declare(f"Updating secret with name '{secret.name}' and ID '{secret.id}'")
 
     if "name" in parsed_args:
         error("The word 'name' cannot be used as a key for a secret.")
@@ -388,7 +389,7 @@ def update_secret(
 
     client.update_secret(
         name_id_or_prefix=secret.id,
-        new_scope=SecretScope(new_scope) if new_scope else None,
+        update_private=private,
         add_or_update_values=secret_args_add_update,
         remove_values=remove_keys,
     )
@@ -492,10 +493,12 @@ def delete_secret(name_or_id: str, yes: bool = False) -> None:
     type=click.STRING,
 )
 @click.option(
-    "--scope",
-    "-s",
-    type=click.Choice([scope.value for scope in list(SecretScope)]),
-    default=None,
+    "--private",
+    "-p",
+    "private",
+    type=click.BOOL,
+    required=False,
+    help="Use this flag to explicitly fetch a private secret or a public secret.",
 )
 @click.option(
     "--filename",
@@ -509,7 +512,7 @@ def delete_secret(name_or_id: str, yes: bool = False) -> None:
 )
 def export_secret(
     name_id_or_prefix: str,
-    scope: Optional[str] = None,
+    private: Optional[bool] = None,
     filename: Optional[str] = None,
 ) -> None:
     """Export a secret as a YAML file.
@@ -519,12 +522,12 @@ def export_secret(
 
     Args:
         name_id_or_prefix: The name of the secret to export.
-        scope: The scope of the secret to export.
+        private: Private status of the secret to export.
         filename: The name of the file to export the secret to.
     """
     from zenml.utils.yaml_utils import write_yaml
 
-    secret = _get_secret(name_id_or_prefix=name_id_or_prefix, scope=scope)
+    secret = _get_secret(name_id_or_prefix=name_id_or_prefix, private=private)
     if not secret.secret_values:
         warning(f"Secret with name `{name_id_or_prefix}` is empty.")
         return

src/zenml/cli/service_connectors.py

@@ -1131,7 +1131,6 @@ def describe_service_connector(
             )
 
         connector = connector_client.to_response_model(
-            workspace=client.active_workspace,
             user=client.active_user,
         )
     else:

src/zenml/cli/stack.py

@@ -503,7 +503,6 @@ def register_stack(
         try:
             created_stack = client.zen_store.create_stack(
                 stack=StackRequest(
-                    user=client.active_user.id,
                     workspace=client.active_workspace.id,
                     name=stack_name,
                     components=components,

src/zenml/cli/tag.py

@@ -82,8 +82,11 @@ def register_tag(name: str, color: Optional[ColorVariants]) -> None:
         color: The color variant for UI.
     """
     request_dict = remove_none_values(dict(name=name, color=color))
+    client = Client()
     try:
-        tag = Client().create_tag(TagRequest(**request_dict))
+        tag = client.create_tag(
+            TagRequest(workspace=client.active_workspace.id, **request_dict)
+        )
     except (EntityExistsError, ValueError) as e:
         cli_utils.error(str(e))
 

src/zenml/cli/utils.py

@@ -1795,7 +1795,6 @@ def print_service_connector_configuration(
                 else "N/A"
             ),
             "OWNER": user_name,
-            "WORKSPACE": connector.workspace.name,
             "CREATED_AT": connector.created,
             "UPDATED_AT": connector.updated,
         }
@@ -2161,9 +2160,6 @@ def print_debug_stack() -> None:
     console.print(f"ID: {str(stack.id)}")
     if stack.user and stack.user.name and stack.user.id:  # mypy check
         console.print(f"User: {stack.user.name} / {str(stack.user.id)}")
-    console.print(
-        f"Workspace: {stack.workspace.name} / {str(stack.workspace.id)}"
-    )
 
     for component_type, components in stack.components.items():
         component = components[0]
@@ -2190,9 +2186,6 @@ def print_debug_stack() -> None:
             console.print(
                 f"User: {component_response.user.name} / {str(component_response.user.id)}"
             )
-        console.print(
-            f"Workspace: {component_response.workspace.name} / {str(component_response.workspace.id)}"
-        )
 
 
 def _component_display_name(