cmem-client 0.6.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

cmem_client/components/marketplace.py

@@ -14,6 +14,7 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
+from eccenca_marketplace_client.models.responses import PackageMetadata
 from httpx import HTTPError
 from xdg_base_dirs import xdg_cache_home
 
@@ -158,6 +159,14 @@ class Marketplace:
 
         return sorted([version.get("package_version") for version in versions])
 
+    def get_available_packages(self) -> list[PackageMetadata]:
+        """Get the available packages from the marketplace server."""
+        url = self.marketplace_url / "api/packages"
+        response = self._client.http.get(url=url)
+        response.raise_for_status()
+        packages_data = response.json()
+        return [PackageMetadata.model_validate(item) for item in packages_data]
+
     @property
     def marketplace_url(self) -> HttpUrl:
         """Get the marketplace server URL."""

cmem_client/models/package.py

@@ -1,7 +1,9 @@
 """Marketplace package models."""
 
+from datetime import UTC, datetime
+
 from eccenca_marketplace_client.package_version import PackageVersion
-from pydantic import ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 
 from cmem_client.models.base import Model, ReadRepositoryItem
 
@@ -33,3 +35,21 @@ class Package(ReadRepositoryItem):
             The package_id which uniquely identifies this package.
         """
         return str(self.package_version.manifest.package_id)
+
+
+class PackageInstallationMetadata(BaseModel):
+    """Metadata about how and when a marketplace package was installed.
+
+    This metadata is stored as JSON in the RDF graph and used to determine
+    whether packages can be automatically removed when they are dependencies.
+    """
+
+    dependency_level: int = Field(
+        ge=0, description="Dependency depth (0 for direct installs, >0 for dependencies", default=0
+    )
+    installed_at: datetime = Field(description="Timestamp when the package was installed", default=datetime.now(tz=UTC))
+
+    @property
+    def is_direct_installed(self) -> bool:
+        """Indicates whether this package was installed directly"""
+        return self.dependency_level == 0

cmem_client/repositories/graphs.py

@@ -209,6 +209,7 @@ class GraphsRepository(PlainListRepository, DeleteItemProtocol, ImportItemProtoc
         params = {"graph": key}
         response = self._client.http.delete(url=url, params=params)
         response.raise_for_status()
+        self._reload_vocabularies(key)
 
     def guess_file_type(self, path: Path) -> GraphFileSerialization:
         """Guess the RDF serialization format from a file path.

cmem_client/repositories/marketplace_packages.py

@@ -8,6 +8,7 @@ from __future__ import annotations
 
 import shutil
 import tempfile
+from datetime import UTC, datetime
 from pathlib import Path
 from typing import TYPE_CHECKING, ClassVar
 from zipfile import BadZipFile, ZipFile
@@ -16,6 +17,7 @@ from eccenca_marketplace_client.models.dependencies import MarketplacePackageDep
 from eccenca_marketplace_client.models.files import GraphFileSpec, ImageFileSpec, ProjectFileSpec, TextFileSpec
 from eccenca_marketplace_client.ontology import (
     NS_IRI,
+    NS_PREFIX,
     get_data_graph_iri,
     get_delete_query,
     get_fetch_query,
@@ -23,6 +25,7 @@ from eccenca_marketplace_client.ontology import (
 )
 from eccenca_marketplace_client.package_graph import PackageGraph
 from eccenca_marketplace_client.package_version import PackageVersion
+from rdflib import Literal, Namespace, Variable
 
 from cmem_client.exceptions import (
     BaseError,
@@ -37,10 +40,13 @@ from cmem_client.repositories.graph_imports import GraphImport
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-from eccenca_marketplace_client.fields import PackageVersionIdentifier  # noqa: TC002  # Pydantic needs this at runtime
+from eccenca_marketplace_client.fields import (  # Pydantic needs this at runtime
+    MANIFEST_NAME,
+    PackageVersionIdentifier,
+)
 
 from cmem_client.models.item import DirectoryImportItem, FileImportItem, ImportItem, ZipImportItem
-from cmem_client.models.package import Package
+from cmem_client.models.package import Package, PackageInstallationMetadata
 from cmem_client.repositories.base.abc import Repository
 from cmem_client.repositories.graphs import GraphImportConfig
 from cmem_client.repositories.protocols.delete_item import DeleteConfig, DeleteItemProtocol
@@ -51,6 +57,18 @@ MAX_DEPENDENCY_DEPTH = 5
 MARKETPLACE_PROJECT_ID = "marketplace-packages"
 
 
+def get_installation_metadata_query(package_iri: str) -> str:
+    """Get the query for the installation metadata of the package."""
+    return f"""
+    PREFIX {NS_PREFIX}: <{NS_IRI}>
+
+    SELECT ?installation_metadata
+    WHERE {{
+            <{get_data_graph_iri()}{package_iri}> {NS_PREFIX}:installationMetadata ?installation_metadata .
+    }}
+    """
+
+
 class MarketplacePackagesImportConfig(ImportConfig):
     """Configuration for marketplace package import operations.
 
@@ -258,7 +276,7 @@ class MarketplacePackagesRepository(Repository, ImportItemProtocol, ExportItemPr
                 )
                 imported_files.append(composite_key)
 
-            self._add_package_triples(package_version)
+            self._add_package_triples(package_version, configuration)
 
         # Rollback graphs + imports, projects, python packages
         except (BaseError, BadZipFile) as error:
@@ -276,6 +294,8 @@ class MarketplacePackagesRepository(Repository, ImportItemProtocol, ExportItemPr
                 self._client.marketplace_packages.delete_item(key=vocabulary_id, skip_if_missing=True)
             for file in imported_files:
                 self._client.files.delete_item(key=file, skip_if_missing=True)
+            if len(self._dict) == 0:
+                self._client.projects.delete_item(MARKETPLACE_PROJECT_ID, skip_if_missing=True)
             raise MarketplacePackagesImportError(f"Failed to import package ({error!s})") from error
 
         self.fetch_data()
@@ -341,7 +361,7 @@ class MarketplacePackagesRepository(Repository, ImportItemProtocol, ExportItemPr
                     self._client.files.export_item(key=composite_key, path=file_path)
                     exported_files.append((file_path, file_spec.file_path))
 
-            manifest_path = tmp_path / "manifest.json"
+            manifest_path = tmp_path / MANIFEST_NAME
             manifest_path.write_text(manifest_json_str, encoding="utf-8")
 
             if path is None:
@@ -357,18 +377,18 @@ class MarketplacePackagesRepository(Repository, ImportItemProtocol, ExportItemPr
                 with ZipFile(path, mode="w") as zipf:
                     for file_path, file_name in exported_files:
                         zipf.write(file_path, file_name)
-                    zipf.write(manifest_path, "manifest.json")
+                    zipf.write(manifest_path, MANIFEST_NAME)
             else:
                 path.mkdir(parents=True, exist_ok=True)
                 for file_path, file_name in exported_files:
                     file_dest = path / file_name
                     file_dest.parent.mkdir(parents=True, exist_ok=True)
                     shutil.copy(file_path, file_dest)
-                shutil.copy(manifest_path, path / "manifest.json")
+                shutil.copy(manifest_path, path / MANIFEST_NAME)
 
         return path
 
-    def _delete_item(self, key: str, configuration: MarketplacePackagesDeleteConfig | None = None) -> None:  # noqa: C901
+    def _delete_item(self, key: str, configuration: MarketplacePackagesDeleteConfig | None = None) -> None:  # noqa: C901, PLR0912
         """Delete a package by its package_id.
 
         This method need be extended for new FileSpecs.
@@ -408,6 +428,21 @@ class MarketplacePackagesRepository(Repository, ImportItemProtocol, ExportItemPr
                         f"use by other packages: {', '.join(dependants)}"
                     )
                     continue
+
+                # check if to be deleted package was directly installed prior
+                install_metadata_bindings = self._client.store.sparql.query(
+                    get_installation_metadata_query(dependency.package_id)
+                ).bindings
+                if install_metadata_bindings:
+                    metadata_json_str = str(install_metadata_bindings[0][Variable("installation_metadata")])
+                    metadata = PackageInstallationMetadata.model_validate_json(metadata_json_str)
+                    if metadata.is_direct_installed:
+                        self._logger.warning(
+                            f"Marketplace package '{dependency.package_id}' can not be removed since "
+                            f"it was installed directly, not just via dependencies'"
+                        )
+                        continue
+
                 self._client.marketplace_packages.delete_item(
                     key=dependency.package_id, skip_if_missing=configuration.skip_missing_dependencies
                 )
@@ -435,7 +470,7 @@ class MarketplacePackagesRepository(Repository, ImportItemProtocol, ExportItemPr
             self._client.graphs.delete_item(NS_IRI, skip_if_missing=True)
             self._client.projects.delete_item(MARKETPLACE_PROJECT_ID, skip_if_missing=True)
 
-    def _add_package_triples(self, package: PackageVersion) -> None:
+    def _add_package_triples(self, package: PackageVersion, config: MarketplacePackagesImportConfig) -> None:
         """Add a package to the data config graph in the Corporate Memory instance.
 
         Converts the package metadata to RDF triples and inserts them into the
@@ -444,10 +479,22 @@ class MarketplacePackagesRepository(Repository, ImportItemProtocol, ExportItemPr
 
         Args:
             package: The package metadata to add to the catalog.
+            config: The config object to determine if package was installed directly or
+                    as a dependency and more metadata.
         """
         self._add_marketplace_vocabulary()
         g = package.to_rdf_graph()
 
+        eccm = Namespace(NS_IRI)
+
+        metadata = PackageInstallationMetadata(
+            dependency_level=config.dependency_level,
+            installed_at=datetime.now(tz=UTC),
+        )
+
+        json_literal = Literal(metadata.model_dump_json())
+        g.add((package.iri(), eccm.installationMetadata, json_literal))
+
         triples = g.serialize(format="nt")
 
         sparql_update = f"""

cmem_client/repositories/protocols/create_item.py

@@ -81,6 +81,7 @@ class CreateItemProtocol(Protocol[ItemType, CreateItemConfig_contra]):
         response = self._create_item(item)
         if isinstance(response, Response):
             self.raise_modification_error(response)
+        self.logger.info("Repository item '%s' created.", item.get_id())
         self.fetch_data()
 
     def raise_modification_error(self, response: Response) -> None:

cmem_client/repositories/protocols/delete_item.py

@@ -76,7 +76,7 @@ class DeleteItemProtocol(Protocol[ItemType, DeleteItemConfig_contra]):
             self._delete_item(key=key, configuration=configuration)
         except HTTPError as error:
             raise RepositoryModificationError(f"Error on deleting repository item '{key}'.") from error
-
+        self.logger.info("Repository item '%s' deleted.", key)
         del self._dict[key]
 
     @abstractmethod

cmem_client/repositories/protocols/export_item.py

@@ -86,6 +86,7 @@ class ExportItemProtocol(Protocol[ItemType, ExportItemConfig_contra]):
             raise RepositoryReadError(
                 f"Repository export returned different path than requested: '{path}' != `{new_path}`"
             )
+        self.logger.info("Repository item '%s' exported.", key)
         if path:
             return path
 

cmem_client/repositories/protocols/import_item.py

@@ -122,6 +122,7 @@ class ImportItemProtocol(Protocol[ItemType, ImportItemConfig_contra]):
             )
         if key and key not in self._dict:
             raise RepositoryModificationError(f"Repository item '{key}' not there after import.")
+        self.logger.info("Repository item '%s' imported.", key)
         if key:
             return key
         return new_key

cmem_client/repositories/python_packages.py

@@ -38,7 +38,10 @@ class PythonPackagesRepository(PlainListRepository, DeleteItemProtocol, CreateIt
         """Install a Python package."""
         _ = configuration
         url = self._url("/api/python/installPackageByName")
-        return self._client.http.post(url, params={"name": item.name})
+        response = self._client.http.post(url, params={"name": item.name})
+        response.raise_for_status()
+        self._update_plugins()
+        return response
 
     def _delete_item(self, key: str, configuration: PythonPackagesDeleteConfig | None = None) -> None:
         """Delete item from repository."""
@@ -46,6 +49,7 @@ class PythonPackagesRepository(PlainListRepository, DeleteItemProtocol, CreateIt
         url = self._url("/api/python/uninstallPackage")
         response = self._client.http.post(url, params={"name": key})
         response.raise_for_status()
+        self._update_plugins()
 
     def delete_all(self) -> None:
         """Delete all items from the repository
@@ -56,3 +60,9 @@ class PythonPackagesRepository(PlainListRepository, DeleteItemProtocol, CreateIt
         self._delete_item("--all")
         if hasattr(self, "fetch_data"):
             self.fetch_data()
+
+    def _update_plugins(self) -> None:
+        """Update the python packages in CMEM"""
+        url = self._url("/api/python/updatePlugins")
+        response = self._client.http.get(url)
+        response.raise_for_status()

{cmem_client-0.6.0.dist-info → cmem_client-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmem-client
-Version: 0.6.0
+Version: 0.8.0
 Summary: Next generation eccenca Corporate Memory client library.
 License: Apache-2.0
 License-File: LICENSE
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: eccenca-marketplace-client (>=0.6.0,<0.7.0)
+Requires-Dist: eccenca-marketplace-client (>=0.7.0,<0.8.0)
 Requires-Dist: httpx (>=0.27.0,<0.28.0)
 Requires-Dist: pydantic (>=2.8.2,<3.0.0)
 Requires-Dist: pyjwt (>=2.8.0,<3.0.0)

{cmem_client-0.6.0.dist-info → cmem_client-0.8.0.dist-info}/RECORD

@@ -7,7 +7,7 @@ cmem_client/auth_provider/prefetched_token.py,sha256=pwT_gPtUaebMqpYnv1sKodHhAus
 cmem_client/client.py,sha256=qugUUEdRFhF39ib48uubCyjJmqxPzhbr4GDjrT-_95c,19287
 cmem_client/components/__init__.py,sha256=DjuLm0R-UNidKROXBZFRa2SkTElqcFpFTkodLrGsJqk,448
 cmem_client/components/graph_store.py,sha256=N3cJXNbebt6ov8UVs368gg8DfOE_62cJtoQw4nLLNBU,13905
-cmem_client/components/marketplace.py,sha256=aPswFFdyV9yibDDqQ5cOCsOhzrG9kEgM5Q6Hu0DbOac,6658
+cmem_client/components/marketplace.py,sha256=t82BmICtJuJfF1EveukMyezPwgAVUmdn7rTcwrLdIHg,7122
 cmem_client/components/sparql_wrapper.py,sha256=75fo52S3S_XQ8z8ShSwHaFoHtKCLJxE-H-xNLFJnWLo,1630
 cmem_client/components/workspace.py,sha256=L5DtVU-tf4EL56Uu3UCWBJBHODfu4ptDrZ6ZobPS_Z0,8866
 cmem_client/config.py,sha256=YgciVNv4eP7jlGXT4wGM5FPkx9oIfPuf7jvh56PQEJ0,14108
@@ -21,7 +21,7 @@ cmem_client/models/error.py,sha256=id-xyQGSlGqI9ePgVdUdB7SJmwBDORdCbeYugSa7RkI,1
 cmem_client/models/graph.py,sha256=5IzQWuCd45U2j81kyl935cQLSjeBTZRVM9QcUCUAhL8,785
 cmem_client/models/item.py,sha256=gXp1Yh_hsgZKy-sbkGt78tTvV_2ODXT_PfbMS1OWh34,4108
 cmem_client/models/logging_config.py,sha256=_pzI545AjyPf2LGaq_bqa9XbkFQa27R4bFjjdPQqRgs,1283
-cmem_client/models/package.py,sha256=I8cL4pSNtVw1sZM2x7s5h6GfR-IpGXHc75MytrDe_ww,954
+cmem_client/models/package.py,sha256=kFE9U_2ZA-IBfc-c_UIc4ffqyTAHQaNBWsyy7kTR65w,1721
 cmem_client/models/project.py,sha256=jfOZzw5ESqkgyn2InpiVDKdyzh-G5YQpc_zI6PJJ3gA,1457
 cmem_client/models/python_package.py,sha256=4grVO5y57X0xwHhyRp51KYDzzjpX-IIn1fj20PEPlDw,689
 cmem_client/models/resource.py,sha256=LR5Y6ptJdh6jY6yugtp83XH5TX8eJSNVu9UMPB6htrc,710
@@ -38,17 +38,17 @@ cmem_client/repositories/base/task_search.py,sha256=zeDFQLTn8Sbsvjjo0ntge8tUfbGj
 cmem_client/repositories/datasets.py,sha256=y5dq665rqA_Sm4Zpgu90ojZjy-KkqCG1vBlmegEMT9A,1351
 cmem_client/repositories/files.py,sha256=n8wCiwAEQLpQYAplHlCWboaDL-2vIUPqigdNV9TMp0A,6404
 cmem_client/repositories/graph_imports.py,sha256=NTVR6lAgUpGkKJsxbOWswG9AS2FwzkIJUX73C-vAJb8,3070
-cmem_client/repositories/graphs.py,sha256=Y7jz0DCUj1y55lO2egSc9Ys607le1vg4TmVLdINju40,17847
-cmem_client/repositories/marketplace_packages.py,sha256=mLpVlG_HZFneyCLlDiR_EkmbxJEFAmShwJeQFwILFAo,24605
+cmem_client/repositories/graphs.py,sha256=BjeC-BW3jzJSO-zNYo_b9a1S0Xi6EaNzVSlpYyzEppo,17886
+cmem_client/repositories/marketplace_packages.py,sha256=fzbuw4aZH69Y0togyzWIPjUvJqcxepkeLFFDd_rzbx4,26620
 cmem_client/repositories/projects.py,sha256=aY35uw1wp_ocV-WKh3ouFBClkBB5MTsQaKC1cZ95RY8,8642
 cmem_client/repositories/protocols/__init__.py,sha256=qXSmMthpY6Tp9FpLZP32GM4cERDflTZoWpSCrEQHNcc,656
-cmem_client/repositories/protocols/create_item.py,sha256=9ZFOcfFc9yqtNnclk7LpqMBiE7iGKASxpx49YYLCzbw,4771
-cmem_client/repositories/protocols/delete_item.py,sha256=T8Odl7x5ZTZyuHMLfkXzRiBZDNa7yTPLi-TYYEfARKE,3431
-cmem_client/repositories/protocols/export_item.py,sha256=wI0UDF8zpeEeUl5T-DzNGExlAf9csh_gqstKQI9TWN0,4193
-cmem_client/repositories/protocols/import_item.py,sha256=k4Z0XjDEC2KEIcCSN9-fBqarxAAoEFltoJnQXo2Rylk,5708
-cmem_client/repositories/python_packages.py,sha256=_XlMzvXhzt-33QTuiJnxWSVSeBUYOxufFaGAq0UoLm4,2120
+cmem_client/repositories/protocols/create_item.py,sha256=mwQNnxZbRv0XkzKJ7gKEuetqTHoQdaa6AGsG9rgTCQc,4844
+cmem_client/repositories/protocols/delete_item.py,sha256=QymEckCgCSbLXmVA_-tBOGWt6iXmyALxn66BXa-baKc,3493
+cmem_client/repositories/protocols/export_item.py,sha256=k7k6N-P-CETkyihk5f_2MQoZm2Hr3FLtYz1oJYNm5nI,4257
+cmem_client/repositories/protocols/import_item.py,sha256=vFDRkH_P_GtMx8u99NToRbOGyJMJd8nE_oGB9F5Dt1A,5772
+cmem_client/repositories/python_packages.py,sha256=Hs5ydf2nb4JW8j_jtjju4VgyUidBrlIZkJBzHVrQQFY,2470
 cmem_client/repositories/workflows.py,sha256=ZTlKIwQXGgad96UKa6Ic1wh3Xhpy6KIOR2LolGW519U,4893
-cmem_client-0.6.0.dist-info/METADATA,sha256=maaDIfIO2A8pE7LydnN6Xe59c00wg4Z3YP4N2U25WuQ,2916
-cmem_client-0.6.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-cmem_client-0.6.0.dist-info/licenses/LICENSE,sha256=5t6lcWcFU3TBO5wwq9PYNbgzfVfFUuL-80v5BTGuuMQ,11334
-cmem_client-0.6.0.dist-info/RECORD,,
+cmem_client-0.8.0.dist-info/METADATA,sha256=vtDdWgswKBNhp1xxW3zzxXiucoQTon5RLSm1co63gj4,2916
+cmem_client-0.8.0.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+cmem_client-0.8.0.dist-info/licenses/LICENSE,sha256=5t6lcWcFU3TBO5wwq9PYNbgzfVfFUuL-80v5BTGuuMQ,11334
+cmem_client-0.8.0.dist-info/RECORD,,

{cmem_client-0.6.0.dist-info → cmem_client-0.8.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.3.0
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any