gooddata-sdk 1.62.1.dev2__tar.gz → 1.63.0__tar.gz

{gooddata_sdk-1.62.1.dev2 → gooddata_sdk-1.63.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: gooddata-sdk
-Version: 1.62.1.dev2
+Version: 1.63.0
 Summary: GoodData Cloud Python SDK
-Project-URL: Documentation, https://www.gooddata.com/docs/python-sdk/1.62.1.dev2
+Project-URL: Documentation, https://www.gooddata.com/docs/python-sdk/1.63.0
 Project-URL: Source, https://github.com/gooddata/gooddata-python-sdk
 Author-email: GoodData <support@gooddata.com>
 License-Expression: MIT
@@ -23,7 +23,8 @@ Requires-Python: <4.0,>=3.10
 Requires-Dist: attrs<=24.2.0,>=21.4.0
 Requires-Dist: brotli==1.2.0
 Requires-Dist: cattrs<=24.1.1,>=22.1.0
-Requires-Dist: gooddata-api-client~=1.62.1.dev2
+Requires-Dist: gooddata-api-client~=1.63.0
+Requires-Dist: gooddata-code-convertors
 Requires-Dist: python-dateutil>=2.5.3
 Requires-Dist: python-dotenv<2.0.0,>=1.0.0
 Requires-Dist: pyyaml>=6.0
@@ -46,7 +47,7 @@ At the moment the SDK provides services to inspect and interact with the Semanti
 * Compute Service
 * Table Service
 
-See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.62.1.dev2) for more details.
+See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.63.0) for more details.
 
 ## Requirements
 

{gooddata_sdk-1.62.1.dev2 → gooddata_sdk-1.63.0}/README.md

@@ -14,7 +14,7 @@ At the moment the SDK provides services to inspect and interact with the Semanti
 * Compute Service
 * Table Service
 
-See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.62.1.dev2) for more details.
+See [DOCUMENTATION](https://www.gooddata.com/docs/python-sdk/1.63.0) for more details.
 
 ## Requirements
 

{gooddata_sdk-1.62.1.dev2 → gooddata_sdk-1.63.0}/pyproject.toml

@@ -1,7 +1,7 @@
 # (C) 2025 GoodData Corporation
 [project]
 name = "gooddata-sdk"
-version = "1.62.1.dev2"
+version = "1.63.0"
 description = "GoodData Cloud Python SDK"
 readme = "README.md"
 license = "MIT"
@@ -26,7 +26,7 @@ keywords = [
 ]
 requires-python = ">=3.10,<4.0"
 dependencies = [
-    "gooddata-api-client~=1.62.1.dev2",
+    "gooddata-api-client~=1.63.0",
     "python-dateutil>=2.5.3",
     "pyyaml>=6.0",
     "attrs>=21.4.0,<=24.2.0",
@@ -34,6 +34,7 @@ dependencies = [
     "brotli==1.2.0",
     "requests~=2.32.0",
     "python-dotenv>=1.0.0,<2.0.0",
+    "gooddata-code-convertors",
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -50,7 +51,7 @@ classifiers = [
 ]
 
 [project.urls]
-Documentation = "https://www.gooddata.com/docs/python-sdk/1.62.1.dev2"
+Documentation = "https://www.gooddata.com/docs/python-sdk/1.63.0"
 Source = "https://github.com/gooddata/gooddata-python-sdk"
 
 [project.scripts]
@@ -75,9 +76,6 @@ allowed-unresolved-imports = ["gooddata_api_client.**"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/gooddata_sdk"]
-include = [
-    "src/gooddata_sdk/cli/package.json",
-]
 
 [tool.coverage.run]
 source = ["gooddata_sdk"]

{gooddata_sdk-1.62.1.dev2 → gooddata_sdk-1.63.0}/src/gooddata_sdk/__init__.py

@@ -180,6 +180,25 @@ from gooddata_sdk.catalog.user.management_model.management import (
     CatalogWorkspacePermissionAssignment,
 )
 from gooddata_sdk.catalog.validate_by_item import CatalogValidateByItem
+from gooddata_sdk.catalog.workspace.aac import (
+    aac_attribute_hierarchy_to_declarative,
+    aac_dashboard_to_declarative,
+    aac_dataset_to_declarative,
+    aac_date_dataset_to_declarative,
+    aac_metric_to_declarative,
+    aac_plugin_to_declarative,
+    aac_visualization_to_declarative,
+    declarative_attribute_hierarchy_to_aac,
+    declarative_dashboard_to_aac,
+    declarative_dataset_to_aac,
+    declarative_date_instance_to_aac,
+    declarative_metric_to_aac,
+    declarative_plugin_to_aac,
+    declarative_visualization_to_aac,
+    detect_yaml_format,
+    load_aac_workspace_from_disk,
+    store_aac_workspace_to_disk,
+)
 from gooddata_sdk.catalog.workspace.content_service import CatalogWorkspaceContent, CatalogWorkspaceContentService
 from gooddata_sdk.catalog.workspace.declarative_model.workspace.analytics_model.analytics_model import (
     CatalogDeclarativeAnalytics,

gooddata_sdk-1.63.0/src/gooddata_sdk/catalog/workspace/aac.py

@@ -0,0 +1,407 @@
+# (C) 2026 GoodData Corporation
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any, Literal
+
+from gooddata_code_convertors import (
+    declarative_attribute_hierarchy_to_yaml,
+    declarative_dashboard_to_yaml,
+    declarative_dataset_to_yaml,
+    declarative_date_instance_to_yaml,
+    declarative_metric_to_yaml,
+    declarative_plugin_to_yaml,
+    declarative_visualisation_to_yaml,
+    yaml_attribute_hierarchy_to_declarative,
+    yaml_dashboard_to_declarative,
+    yaml_dataset_to_declarative,
+    yaml_date_dataset_to_declarative,
+    yaml_metric_to_declarative,
+    yaml_plugin_to_declarative,
+    yaml_visualisation_to_declarative,
+)
+
+from gooddata_sdk.catalog.workspace.declarative_model.workspace.workspace import CatalogDeclarativeWorkspaceModel
+from gooddata_sdk.utils import read_layout_from_file
+
+# AAC types that map to visualization objects (all go through yaml_visualisation_to_declarative)
+_VISUALIZATION_TYPES = frozenset(
+    {
+        "bar_chart",
+        "column_chart",
+        "line_chart",
+        "area_chart",
+        "pie_chart",
+        "donut_chart",
+        "scatter_chart",
+        "bubble_chart",
+        "heatmap_chart",
+        "treemap_chart",
+        "bullet_chart",
+        "funnel_chart",
+        "pyramid_chart",
+        "waterfall_chart",
+        "sankey_chart",
+        "dependency_wheel_chart",
+        "combo_chart",
+        "headline_chart",
+        "geo_chart",
+        "geo_area_chart",
+        "repeater_chart",
+        "table",
+    }
+)
+
+# All known AAC type values
+_ALL_AAC_TYPES = (
+    frozenset({"dataset", "date", "metric", "dashboard", "plugin", "attribute_hierarchy"}) | _VISUALIZATION_TYPES
+)
+
+# Types that are "dataset-like" for the entities array
+_DATASET_TYPES = frozenset({"dataset", "date"})
+
+
+# ---------------------------------------------------------------------------
+# Entities list builder (needed for cross-reference resolution)
+# ---------------------------------------------------------------------------
+
+
+def _build_entities(aac_objects: list[dict[str, Any]]) -> list[dict[str, Any]]:
+    """Build the entities array expected by convertor functions.
+
+    Some convertor functions (dataset, visualization, dashboard) need access to
+    all objects for cross-reference resolution (e.g., dataset references).
+    """
+    return [
+        {
+            "id": obj["id"],
+            "type": obj["type"],
+            "path": f"{obj['id']}.yaml",
+            "data": obj,
+        }
+        for obj in aac_objects
+    ]
+
+
+# ---------------------------------------------------------------------------
+# Individual object conversions: AAC dict → Declarative dict
+# ---------------------------------------------------------------------------
+
+
+def aac_dataset_to_declarative(
+    aac: dict[str, Any],
+    entities: list[dict[str, Any]] | None = None,
+    data_source_id: str | None = None,
+) -> dict[str, Any]:
+    """Convert an AAC dataset dict to declarative format.
+
+    Args:
+        aac: The AAC dataset dict (parsed YAML).
+        entities: Optional list of all AAC objects for cross-reference resolution.
+        data_source_id: Optional data source ID for table-based datasets.
+    """
+    ent = entities if entities is not None else _build_entities([aac])
+    args: list[Any] = [ent, aac]
+    if data_source_id is not None:
+        args.append(data_source_id)
+    return yaml_dataset_to_declarative(*args)
+
+
+def aac_date_dataset_to_declarative(aac: dict[str, Any]) -> dict[str, Any]:
+    """Convert an AAC date dataset dict to declarative format."""
+    return yaml_date_dataset_to_declarative(aac)
+
+
+def aac_metric_to_declarative(aac: dict[str, Any]) -> dict[str, Any]:
+    """Convert an AAC metric dict to declarative format."""
+    return yaml_metric_to_declarative(aac)
+
+
+def aac_visualization_to_declarative(
+    aac: dict[str, Any],
+    entities: list[dict[str, Any]] | None = None,
+) -> dict[str, Any]:
+    """Convert an AAC visualization dict to declarative format.
+
+    Args:
+        aac: The AAC visualization dict (parsed YAML).
+        entities: Optional list of all AAC objects for cross-reference resolution.
+    """
+    ent = entities if entities is not None else _build_entities([aac])
+    return yaml_visualisation_to_declarative(ent, aac)
+
+
+def aac_dashboard_to_declarative(
+    aac: dict[str, Any],
+    entities: list[dict[str, Any]] | None = None,
+) -> dict[str, Any]:
+    """Convert an AAC dashboard dict to declarative format.
+
+    Args:
+        aac: The AAC dashboard dict (parsed YAML).
+        entities: Optional list of all AAC objects for cross-reference resolution.
+    """
+    ent = entities if entities is not None else _build_entities([aac])
+    return yaml_dashboard_to_declarative(ent, aac)
+
+
+def aac_plugin_to_declarative(aac: dict[str, Any]) -> dict[str, Any]:
+    """Convert an AAC plugin dict to declarative format."""
+    return yaml_plugin_to_declarative(aac)
+
+
+def aac_attribute_hierarchy_to_declarative(aac: dict[str, Any]) -> dict[str, Any]:
+    """Convert an AAC attribute hierarchy dict to declarative format."""
+    return yaml_attribute_hierarchy_to_declarative(aac)
+
+
+# ---------------------------------------------------------------------------
+# Individual object conversions: Declarative dict → AAC dict
+# Returns {"json": dict, "content": str}
+# ---------------------------------------------------------------------------
+
+
+def declarative_dataset_to_aac(
+    declarative: dict[str, Any],
+    profile: dict[str, Any] | None = None,
+    tables_map: dict[str, list[dict[str, Any]]] | None = None,
+) -> dict[str, Any]:
+    """Convert a declarative dataset dict to AAC format.
+
+    Args:
+        declarative: The declarative dataset dict.
+        profile: Optional profile dict with host, token, workspace_id, data_source.
+        tables_map: Optional mapping of data source ID to list of table definitions.
+    """
+    p = profile if profile is not None else {}
+    t = tables_map if tables_map is not None else {}
+    return declarative_dataset_to_yaml(declarative, p, t)
+
+
+def declarative_date_instance_to_aac(declarative: dict[str, Any]) -> dict[str, Any]:
+    """Convert a declarative date instance dict to AAC format."""
+    return declarative_date_instance_to_yaml(declarative)
+
+
+def declarative_metric_to_aac(declarative: dict[str, Any]) -> dict[str, Any]:
+    """Convert a declarative metric dict to AAC format."""
+    return declarative_metric_to_yaml(declarative)
+
+
+def declarative_visualization_to_aac(declarative: dict[str, Any]) -> dict[str, Any]:
+    """Convert a declarative visualization dict to AAC format."""
+    return declarative_visualisation_to_yaml(declarative)
+
+
+def declarative_dashboard_to_aac(declarative: dict[str, Any]) -> dict[str, Any]:
+    """Convert a declarative dashboard dict to AAC format."""
+    return declarative_dashboard_to_yaml(declarative)
+
+
+def declarative_plugin_to_aac(declarative: dict[str, Any]) -> dict[str, Any]:
+    """Convert a declarative plugin dict to AAC format."""
+    return declarative_plugin_to_yaml(declarative)
+
+
+def declarative_attribute_hierarchy_to_aac(declarative: dict[str, Any]) -> dict[str, Any]:
+    """Convert a declarative attribute hierarchy dict to AAC format."""
+    return declarative_attribute_hierarchy_to_yaml(declarative)
+
+
+# ---------------------------------------------------------------------------
+# Format detection
+# ---------------------------------------------------------------------------
+
+
+def detect_yaml_format(path: Path) -> Literal["aac", "declarative"]:
+    """Detect whether a directory contains AAC or declarative YAMLs.
+
+    AAC files have a top-level 'type' field (dataset, metric, line_chart, etc.)
+    and live as flat files or in typed subdirectories (datasets/, metrics/, etc.).
+
+    Declarative files follow a nested folder structure with
+    workspaces/<id>/ldm/ and workspaces/<id>/analytics_model/.
+    """
+    # Check for declarative structure markers
+    if (path / "workspaces").is_dir() or (path / "ldm").is_dir() or (path / "analytics_model").is_dir():
+        return "declarative"
+
+    # Check for AAC markers: typed subdirectories
+    aac_subdirs = {"datasets", "metrics", "visualisations", "dashboards", "plugins", "attributeHierarchies"}
+    for subdir in aac_subdirs:
+        if (path / subdir).is_dir():
+            return "aac"
+
+    # Check YAML files for top-level 'type' field
+    for yaml_file in path.glob("*.yaml"):
+        content = read_layout_from_file(yaml_file)
+        if isinstance(content, dict) and content.get("type") in _ALL_AAC_TYPES:
+            return "aac"
+        break  # Only check the first file
+
+    return "declarative"
+
+
+# ---------------------------------------------------------------------------
+# Workspace-level: load AAC from disk → CatalogDeclarativeWorkspaceModel
+# ---------------------------------------------------------------------------
+
+
+def _collect_aac_yaml_files(source_dir: Path) -> list[Path]:
+    """Collect all AAC YAML files from source_dir (flat and typed subdirs)."""
+    files: list[Path] = []
+
+    # Flat YAML files in source_dir root
+    files.extend(sorted(source_dir.glob("*.yaml")))
+    files.extend(sorted(source_dir.glob("*.yml")))
+
+    # Typed subdirectories used by gd CLI
+    for subdir in sorted(source_dir.iterdir()):
+        if subdir.is_dir() and subdir.name not in {
+            "data_sources",
+            "users",
+            "user_groups",
+            "workspaces_data_filters",
+            "workspaces",
+        }:
+            files.extend(sorted(subdir.rglob("*.yaml")))
+            files.extend(sorted(subdir.rglob("*.yml")))
+
+    return files
+
+
+def load_aac_workspace_from_disk(
+    source_dir: Path,
+    data_source_id: str | None = None,
+) -> CatalogDeclarativeWorkspaceModel:
+    """Load AAC YAML files from source_dir and return a declarative workspace model.
+
+    Reads all .yaml/.yml files, detects object type from the 'type' field,
+    converts each to declarative format, and assembles into a
+    CatalogDeclarativeWorkspaceModel.
+
+    Args:
+        source_dir: Path to directory containing AAC YAML files.
+        data_source_id: Optional data source ID for table-based datasets.
+    """
+    # First pass: read all AAC objects and build entities list
+    aac_objects: list[dict[str, Any]] = []
+    for yaml_file in _collect_aac_yaml_files(source_dir):
+        content = read_layout_from_file(yaml_file)
+        if isinstance(content, dict) and "type" in content:
+            aac_objects.append(content)
+
+    entities = _build_entities(aac_objects)
+
+    # Second pass: convert each object
+    datasets: list[dict[str, Any]] = []
+    date_instances: list[dict[str, Any]] = []
+    metrics: list[dict[str, Any]] = []
+    visualization_objects: list[dict[str, Any]] = []
+    analytical_dashboards: list[dict[str, Any]] = []
+    dashboard_plugins: list[dict[str, Any]] = []
+    attribute_hierarchies: list[dict[str, Any]] = []
+
+    for aac in aac_objects:
+        aac_type = aac.get("type")
+
+        match aac_type:
+            case "dataset":
+                datasets.append(aac_dataset_to_declarative(aac, entities, data_source_id))
+            case "date":
+                date_instances.append(aac_date_dataset_to_declarative(aac))
+            case "metric":
+                metrics.append(aac_metric_to_declarative(aac))
+            case "dashboard":
+                result = aac_dashboard_to_declarative(aac, entities)
+                # Dashboard convertor may return dashboard + filterContext
+                if isinstance(result, dict) and "dashboard" in result:
+                    analytical_dashboards.append(result["dashboard"])
+                else:
+                    analytical_dashboards.append(result)
+            case "plugin":
+                dashboard_plugins.append(aac_plugin_to_declarative(aac))
+            case "attribute_hierarchy":
+                attribute_hierarchies.append(aac_attribute_hierarchy_to_declarative(aac))
+            case vis_type if vis_type in _VISUALIZATION_TYPES:
+                visualization_objects.append(aac_visualization_to_declarative(aac, entities))
+
+    workspace_model_dict: dict[str, Any] = {}
+
+    ldm: dict[str, Any] = {}
+    if datasets:
+        ldm["datasets"] = datasets
+    if date_instances:
+        ldm["dateInstances"] = date_instances
+    if ldm:
+        workspace_model_dict["ldm"] = ldm
+
+    analytics: dict[str, Any] = {}
+    if metrics:
+        analytics["metrics"] = metrics
+    if visualization_objects:
+        analytics["visualizationObjects"] = visualization_objects
+    if analytical_dashboards:
+        analytics["analyticalDashboards"] = analytical_dashboards
+    if dashboard_plugins:
+        analytics["dashboardPlugins"] = dashboard_plugins
+    if attribute_hierarchies:
+        analytics["attributeHierarchyObjects"] = attribute_hierarchies
+    if analytics:
+        workspace_model_dict["analytics"] = analytics
+
+    return CatalogDeclarativeWorkspaceModel.from_dict(workspace_model_dict)
+
+
+# ---------------------------------------------------------------------------
+# Workspace-level: CatalogDeclarativeWorkspaceModel → AAC files on disk
+# ---------------------------------------------------------------------------
+
+
+def _write_aac_file(source_dir: Path, subdir: str, obj_id: str, content: str) -> None:
+    """Write a single AAC YAML file to disk."""
+    target_dir = source_dir / subdir
+    target_dir.mkdir(parents=True, exist_ok=True)
+    target_file = target_dir / f"{obj_id}.yaml"
+    target_file.write_text(content, encoding="utf-8")
+
+
+def store_aac_workspace_to_disk(model: CatalogDeclarativeWorkspaceModel, source_dir: Path) -> None:
+    """Convert a declarative workspace model to AAC YAML files and write to disk.
+
+    Creates typed subdirectories (datasets/, metrics/, visualisations/, dashboards/,
+    plugins/, attributeHierarchies/) under source_dir.
+    """
+    source_dir.mkdir(parents=True, exist_ok=True)
+    model_dict = model.to_dict(camel_case=True)
+
+    ldm = model_dict.get("ldm", {})
+    analytics = model_dict.get("analytics", {})
+
+    for dataset in ldm.get("datasets", []):
+        result = declarative_dataset_to_aac(dataset)
+        _write_aac_file(source_dir, "datasets", dataset["id"], result["content"])
+
+    for date_instance in ldm.get("dateInstances", []):
+        result = declarative_date_instance_to_aac(date_instance)
+        _write_aac_file(source_dir, "datasets", date_instance["id"], result["content"])
+
+    for metric in analytics.get("metrics", []):
+        result = declarative_metric_to_aac(metric)
+        _write_aac_file(source_dir, "metrics", metric["id"], result["content"])
+
+    for vis in analytics.get("visualizationObjects", []):
+        result = declarative_visualization_to_aac(vis)
+        _write_aac_file(source_dir, "visualisations", vis["id"], result["content"])
+
+    for dashboard in analytics.get("analyticalDashboards", []):
+        result = declarative_dashboard_to_aac(dashboard)
+        _write_aac_file(source_dir, "dashboards", dashboard["id"], result["content"])
+
+    for plugin in analytics.get("dashboardPlugins", []):
+        result = declarative_plugin_to_aac(plugin)
+        _write_aac_file(source_dir, "plugins", plugin["id"], result["content"])
+
+    for hierarchy in analytics.get("attributeHierarchyObjects", []):
+        result = declarative_attribute_hierarchy_to_aac(hierarchy)
+        _write_aac_file(source_dir, "attributeHierarchies", hierarchy["id"], result["content"])

{gooddata_sdk-1.62.1.dev2 → gooddata_sdk-1.63.0}/src/gooddata_sdk/catalog/workspace/service.py

@@ -20,6 +20,7 @@ from gooddata_api_client.model.resolve_settings_request import ResolveSettingsRe
 from gooddata_sdk import CatalogDeclarativeAutomation
 from gooddata_sdk.catalog.catalog_service_base import CatalogServiceBase
 from gooddata_sdk.catalog.permission.service import CatalogPermissionService
+from gooddata_sdk.catalog.workspace.aac import load_aac_workspace_from_disk, store_aac_workspace_to_disk
 from gooddata_sdk.catalog.workspace.declarative_model.workspace.workspace import (
     CatalogDeclarativeFilterView,
     CatalogDeclarativeUserDataFilters,
@@ -417,6 +418,32 @@ class CatalogWorkspaceService(CatalogServiceBase):
         )
         self.put_declarative_workspace(workspace_id=workspace_id, workspace=declarative_workspace)
 
+    # AAC (Analytics-as-Code) methods
+
+    def load_and_put_aac_workspace(self, workspace_id: str, source_dir: Path) -> None:
+        """Load AAC YAML files from source_dir, convert to declarative, and deploy to workspace.
+
+        Args:
+            workspace_id (str):
+                Workspace identification string e.g. "demo"
+            source_dir (Path):
+                Path to the directory containing AAC YAML files.
+        """
+        workspace_model = load_aac_workspace_from_disk(source_dir)
+        self.put_declarative_workspace(workspace_id=workspace_id, workspace=workspace_model)
+
+    def get_and_store_aac_workspace(self, workspace_id: str, source_dir: Path) -> None:
+        """Get declarative workspace from server, convert to AAC YAML files, and write to disk.
+
+        Args:
+            workspace_id (str):
+                Workspace identification string e.g. "demo"
+            source_dir (Path):
+                Path to the directory where AAC YAML files will be written.
+        """
+        workspace_model = self.get_declarative_workspace(workspace_id=workspace_id)
+        store_aac_workspace_to_disk(workspace_model, source_dir)
+
     def clone_workspace(
         self,
         source_workspace_id: str,

{gooddata_sdk-1.62.1.dev2 → gooddata_sdk-1.63.0}/src/gooddata_sdk/cli/clone.py

@@ -1,49 +1,29 @@
 # (C) 2024 GoodData Corporation
 import argparse
-import json
 import shutil
-import subprocess
 from pathlib import Path
 
-from gooddata_sdk import CatalogDeclarativeWorkspaces, GoodDataSdk
+from gooddata_sdk import GoodDataSdk
+from gooddata_sdk.catalog.workspace.aac import store_aac_workspace_to_disk
 from gooddata_sdk.cli.constants import (
-    BASE_DIR,
     CONFIG_FILE,
     DATA_SOURCES,
-    GD_COMMAND,
     USER_GROUPS,
     USERS,
     WORKSPACES,
     WORKSPACES_DATA_FILTERS,
 )
-from gooddata_sdk.cli.utils import (
-    Bcolors,
-    measure_clone,
-)
-
-
-def _call_gd_stream_in(workspace_objects: CatalogDeclarativeWorkspaces, path: Path) -> None:
-    """
-    Call 'gd stream-in' command to create workspaces file structure using Node.js CLI.
-    """
-    workspaces = json.dumps({WORKSPACES: workspace_objects.to_dict()[WORKSPACES]})
-    p = subprocess.Popen(
-        [GD_COMMAND, "stream-in"],
-        cwd=path,
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-    _, err = p.communicate(input=workspaces.encode())
-    if err:
-        print(f"{Bcolors.FAIL}Clone workspaces failed with the following error {err=}.{Bcolors.ENDC}")
+from gooddata_sdk.cli.deploy import _get_workspace_id
+from gooddata_sdk.cli.utils import measure_clone
 
 
 @measure_clone(step="workspaces")
-def _clone_workspaces(sdk: GoodDataSdk, path: Path) -> None:
-    assert (path / CONFIG_FILE).exists() and (path / BASE_DIR).exists()
-    workspace_objects = sdk.catalog_workspace.get_declarative_workspaces()
-    _call_gd_stream_in(workspace_objects, path)
+def _clone_workspaces(sdk: GoodDataSdk, path: Path, source_dir: str) -> None:
+    config_path = path / CONFIG_FILE
+    workspace_id = _get_workspace_id(config_path)
+    source_path = path / source_dir
+    workspace_model = sdk.catalog_workspace.get_declarative_workspace(workspace_id)
+    store_aac_workspace_to_disk(workspace_model, source_path)
 
 
 @measure_clone(step="data sources")
@@ -70,31 +50,29 @@ def _clone_workspace_data_filters(sdk: GoodDataSdk, analytics_root_dir: Path) ->
     workspace_data_filters.store_to_disk(analytics_root_dir)
 
 
-def clone_all(path: Path) -> None:
-    init_file = path / CONFIG_FILE
-    sdk = GoodDataSdk.create_from_profile(profiles_path=init_file)
-    analytics_root_dir = path / BASE_DIR
+def clone_all(path: Path, source_dir: str) -> None:
+    config_path = path / CONFIG_FILE
+    sdk = GoodDataSdk.create_from_profile(profiles_path=config_path)
+    analytics_root_dir = path / source_dir
 
     # clean the directory
     if analytics_root_dir.exists():
         shutil.rmtree(analytics_root_dir)
-    # create directory
     analytics_root_dir.mkdir()
 
-    print("Cloning the whole organization... ⏲️⏲️️⏲️️")
+    print("Cloning the whole organization...")
     _clone_data_sources(sdk, analytics_root_dir)
     _clone_user_groups(sdk, analytics_root_dir)
     _clone_users(sdk, analytics_root_dir)
     _clone_workspace_data_filters(sdk, analytics_root_dir)
-    _clone_workspaces(sdk, path)
-    print("Cloning finished 🚀🚀🚀")
+    _clone_workspaces(sdk, path, source_dir)
+    print("Cloning finished.")
 
 
-def clone_granular(path: Path, args: argparse.Namespace) -> None:
-    init_file = path / CONFIG_FILE
-    analytics_root_dir = path / "analytics"
-    config_directory = analytics_root_dir.parent
-    sdk = GoodDataSdk.create_from_profile(profiles_path=init_file)
+def clone_granular(path: Path, source_dir: str, args: argparse.Namespace) -> None:
+    config_path = path / CONFIG_FILE
+    analytics_root_dir = path / source_dir
+    sdk = GoodDataSdk.create_from_profile(profiles_path=config_path)
     selected_entities = set(args.only)
     if DATA_SOURCES in selected_entities:
         _clone_data_sources(sdk, analytics_root_dir)
@@ -105,4 +83,4 @@ def clone_granular(path: Path, args: argparse.Namespace) -> None:
     if WORKSPACES_DATA_FILTERS in selected_entities:
         _clone_workspace_data_filters(sdk, analytics_root_dir)
     if WORKSPACES in selected_entities:
-        _clone_workspaces(sdk, config_directory)
+        _clone_workspaces(sdk, path, source_dir)

{gooddata_sdk-1.62.1.dev2 → gooddata_sdk-1.63.0}/src/gooddata_sdk/cli/constants.py

@@ -1,5 +1,4 @@
 # (C) 2024 GoodData Corporation
-from pathlib import Path
 
 DATA_SOURCES = "data_sources"
 USER_GROUPS = "user_groups"
@@ -10,8 +9,4 @@ WORKSPACE = "workspace"
 DATA_SOURCE = "data_source"
 
 CONFIG_FILE = "gooddata.yaml"
-BASE_DIR = "analytics"
-
-GD_ROOT = Path.home() / ".gooddata"
-GD_COMMAND = GD_ROOT / "node_modules/.bin/gd"
-GD_PACKAGE_JSON = GD_ROOT / "node_modules/@gooddata/code-cli/package.json"
+DEFAULT_SOURCE_DIR = "analytics"