lamindb 0.69.3__py3-none-any.whl → 0.69.5__py3-none-any.whl

lamindb/_collection.py

@@ -64,7 +64,7 @@ def __init__(
     # now we proceed with the user-facing constructor
     if len(args) > 1:
         raise ValueError("Only one non-keyword arg allowed: data")
-    data: Union[pd.DataFrame, ad.AnnData, Artifact, Iterable[Artifact]] = (
+    data: Union[Artifact, Iterable[Artifact]] = (
         kwargs.pop("data") if len(args) == 0 else args[0]
     )
     meta: Optional[str] = kwargs.pop("meta") if "meta" in kwargs else None
@@ -108,57 +108,24 @@ def __init__(
         if name is None:
             name = is_new_version_of.name
     run = get_run(run)
-    data_init_complete = False
-    artifact = None
-    artifacts = None
-    # now handle potential metadata
+    if isinstance(data, Artifact):
+        data = [data]
+    else:
+        if not hasattr(data, "__getitem__"):
+            raise ValueError("Artifact or List[Artifact] is allowed.")
+        assert isinstance(data[0], Artifact)  # type: ignore
+    hash, feature_sets = from_artifacts(data)  # type: ignore
     if meta is not None:
-        if not isinstance(meta, (pd.DataFrame, ad.AnnData, Artifact)):
-            raise ValueError(
-                "meta has to be of type `(pd.DataFrame, ad.AnnData, Artifact)`"
-            )
-        data = meta
-    # init artifact - is either data or metadata
-    if isinstance(data, (pd.DataFrame, ad.AnnData, Artifact)):
-        if isinstance(data, Artifact):
-            artifact = data
-            if artifact._state.adding:
-                raise ValueError("Save artifact before creating collection!")
+        if not isinstance(meta, Artifact):
+            raise ValueError("meta has to be an Artifact")
+        if isinstance(meta, Artifact):
+            if meta._state.adding:
+                raise ValueError("Save meta artifact before creating collection!")
             if not feature_sets:
-                feature_sets = artifact.features._feature_set_by_slot
+                feature_sets = meta.features._feature_set_by_slot
             else:
-                if len(artifact.features._feature_set_by_slot) > 0:
+                if len(meta.features._feature_set_by_slot) > 0:
                     logger.info("overwriting feature sets linked to artifact")
-        else:
-            artifact_is_new_version_of = (
-                is_new_version_of.artifact if is_new_version_of is not None else None
-            )
-            artifact = Artifact(
-                data,
-                run=run,
-                description="tmp",
-                version=version,
-                is_new_version_of=artifact_is_new_version_of,
-                accessor=accessor,
-            )
-            # do we really want to update the artifact here?
-            if feature_sets:
-                artifact._feature_sets = feature_sets
-        hash = artifact.hash  # type: ignore
-        provisional_uid = artifact.uid  # type: ignore
-        if artifact.description is None or artifact.description == "tmp":
-            artifact.description = f"See collection {provisional_uid}"  # type: ignore
-        data_init_complete = True
-    if not data_init_complete:
-        if hasattr(data, "__getitem__"):
-            assert isinstance(data[0], Artifact)  # type: ignore
-            artifacts = data
-            hash, feature_sets = from_artifacts(artifacts)  # type: ignore
-            data_init_complete = True
-        else:
-            raise ValueError(
-                "Only DataFrame, AnnData, Artifact or list of artifacts is allowed."
-            )
     # we ignore collections in trash containing the same hash
     if hash is not None:
         existing_collection = Collection.filter(hash=hash).one_or_none()
@@ -183,88 +150,19 @@ def __init__(
             description=description,
             reference=reference,
             reference_type=reference_type,
-            artifact=artifact,
+            artifact=meta,
             hash=hash,
             run=run,
             version=version,
             visibility=visibility,
             **kwargs,
         )
-    collection._artifacts = artifacts
+    collection._artifacts = data
     collection._feature_sets = feature_sets
     # register provenance
     if is_new_version_of is not None:
         _track_run_input(is_new_version_of, run=run)
-    if artifact is not None and artifact.run != run:
-        _track_run_input(artifact, run=run)
-    elif artifacts is not None:
-        _track_run_input(artifacts, run=run)
-
-
-@classmethod  # type: ignore
-@doc_args(Collection.from_df.__doc__)
-def from_df(
-    cls,
-    df: "pd.DataFrame",
-    name: Optional[str] = None,
-    description: Optional[str] = None,
-    run: Optional[Run] = None,
-    reference: Optional[str] = None,
-    reference_type: Optional[str] = None,
-    version: Optional[str] = None,
-    is_new_version_of: Optional["Artifact"] = None,
-    **kwargs,
-) -> "Collection":
-    """{}."""
-    if isinstance(df, Artifact):
-        assert not df._state.adding
-        assert df.accessor == "DataFrame"
-    collection = Collection(
-        data=df,
-        name=name,
-        run=run,
-        description=description,
-        reference=reference,
-        reference_type=reference_type,
-        version=version,
-        is_new_version_of=is_new_version_of,
-        accessor="DataFrame",
-        **kwargs,
-    )
-    return collection
-
-
-@classmethod  # type: ignore
-@doc_args(Collection.from_anndata.__doc__)
-def from_anndata(
-    cls,
-    adata: "AnnData",
-    name: Optional[str] = None,
-    description: Optional[str] = None,
-    run: Optional[Run] = None,
-    reference: Optional[str] = None,
-    reference_type: Optional[str] = None,
-    version: Optional[str] = None,
-    is_new_version_of: Optional["Artifact"] = None,
-    **kwargs,
-) -> "Collection":
-    """{}."""
-    if isinstance(adata, Artifact):
-        assert not adata._state.adding
-        assert adata.accessor == "AnnData"
-    collection = Collection(
-        data=adata,
-        run=run,
-        name=name,
-        description=description,
-        reference=reference,
-        reference_type=reference_type,
-        version=version,
-        is_new_version_of=is_new_version_of,
-        accessor="AnnData",
-        **kwargs,
-    )
-    return collection
+    _track_run_input(data, run=run)
 
 
 # internal function, not exposed to user
@@ -373,18 +271,6 @@ def stage(self, is_run_input: Optional[bool] = None) -> List[UPath]:
     return path_list
 
 
-# docstring handled through attach_func_to_class_method
-def backed(
-    self, is_run_input: Optional[bool] = None
-) -> Union["AnnDataAccessor", "BackedAccessor"]:
-    _track_run_input(self, is_run_input)
-    if self.artifact is None:
-        raise RuntimeError(
-            "Can only call backed() for collections with a single artifact"
-        )
-    return self.artifact.backed()
-
-
 # docstring handled through attach_func_to_class_method
 def load(
     self,
@@ -393,29 +279,25 @@ def load(
     **kwargs,
 ) -> DataLike:
     # cannot call _track_run_input here, see comment further down
-    if self.artifact is not None:
-        _track_run_input(self, is_run_input)
-        return self.artifact.load()
-    else:
-        all_artifacts = self.artifacts.all()
-        suffixes = [artifact.suffix for artifact in all_artifacts]
-        if len(set(suffixes)) != 1:
-            raise RuntimeError(
-                "Can only load collections where all artifacts have the same suffix"
-            )
-        # because we're tracking data flow on the collection-level, here, we don't
-        # want to track it on the artifact-level
-        objects = [artifact.load(is_run_input=False) for artifact in all_artifacts]
-        artifact_uids = [artifact.uid for artifact in all_artifacts]
-        if isinstance(objects[0], pd.DataFrame):
-            concat_object = pd.concat(objects, join=join)
-        elif isinstance(objects[0], ad.AnnData):
-            concat_object = ad.concat(
-                objects, join=join, label="artifact_uid", keys=artifact_uids
-            )
-        # only call it here because there might be errors during concat
-        _track_run_input(self, is_run_input)
-        return concat_object
+    all_artifacts = self.artifacts.all()
+    suffixes = [artifact.suffix for artifact in all_artifacts]
+    if len(set(suffixes)) != 1:
+        raise RuntimeError(
+            "Can only load collections where all artifacts have the same suffix"
+        )
+    # because we're tracking data flow on the collection-level, here, we don't
+    # want to track it on the artifact-level
+    objects = [artifact.load(is_run_input=False) for artifact in all_artifacts]
+    artifact_uids = [artifact.uid for artifact in all_artifacts]
+    if isinstance(objects[0], pd.DataFrame):
+        concat_object = pd.concat(objects, join=join)
+    elif isinstance(objects[0], ad.AnnData):
+        concat_object = ad.concat(
+            objects, join=join, label="artifact_uid", keys=artifact_uids
+        )
+    # only call it here because there might be errors during concat
+    _track_run_input(self, is_run_input)
+    return concat_object
 
 
 # docstring handled through attach_func_to_class_method
@@ -484,11 +366,8 @@ def artifacts(self) -> QuerySet:
 
 METHOD_NAMES = [
     "__init__",
-    "from_anndata",
-    "from_df",
     "mapped",
     "stage",
-    "backed",
     "load",
     "delete",
     "save",

lamindb/_finish.py

@@ -8,6 +8,7 @@ from typing import Optional
 import lamindb_setup as ln_setup
 from lamin_utils import logger
 from lnschema_core import Run, Transform
+from lnschema_core.types import TransformType
 
 from ._query_set import QuerySet
 from .core._run_context import is_run_from_ipython, run_context
@@ -69,7 +70,7 @@ def save_run_context_core(
 
     ln.settings.verbosity = "success"
 
-    if transform.type == "notebook":
+    if transform.type == TransformType.notebook:
         try:
             import nbstripout
             from nbproject.dev import (
@@ -187,7 +188,7 @@ def save_run_context_core(
         run.environment = artifact
         logger.success(f"saved run.environment: {run.environment}")
     # save report file
-    if not transform.type == "notebook":
+    if not transform.type == TransformType.notebook:
         run.save()
     else:
         if run.report_id is not None:
@@ -212,7 +213,7 @@ def save_run_context_core(
         run.save()
         transform.latest_report = run.report
     transform.save()
-    if transform.type == "notebook":
+    if transform.type == TransformType.notebook:
         logger.success(f"saved transform.latest_report: {transform.latest_report}")
     identifier = ln_setup.settings.instance.slug
     logger.success(f"go to: https://lamin.ai/{identifier}/transform/{transform.uid}")

lamindb/core/_data.py

@@ -36,9 +36,7 @@ from ._label_manager import LabelManager, print_labels
 from ._run_context import run_context
 from .exceptions import ValidationError
 
-WARNING_RUN_TRANSFORM = (
-    "no run & transform get linked, consider passing a `run` or calling ln.track()"
-)
+WARNING_RUN_TRANSFORM = "no run & transform get linked, consider calling ln.track()"
 
 
 def get_run(run: Optional[Run]) -> Optional[Run]:

lamindb/core/_feature_manager.py

@@ -253,8 +253,7 @@ class FeatureManager:
         if isinstance(self._host, Artifact):
             assert self._host.accessor == "AnnData"
         else:
-            # Collection
-            assert self._host.artifact.accessor == "AnnData"
+            raise NotImplementedError()
 
         # parse and register features
         adata = self._host.load()

lamindb/integrations/__init__.py

@@ -0,0 +1,8 @@
+"""Integrations.
+
+.. autosummary::
+   :toctree: .
+
+   save_vitessce_config
+"""
+from ._vitessce import save_vitessce_config

lamindb/integrations/_vitessce.py

@@ -0,0 +1,39 @@
+import json
+from datetime import datetime, timezone
+
+import lamindb_setup as ln_setup
+from lamin_utils import logger
+
+from lamindb._artifact import Artifact
+
+
+# tested in lamin-spatial
+# can't type vitessce_config because can't assume it's installed
+def save_vitessce_config(vitessce_config, description: str) -> Artifact:
+    """Takes a ``VitessceConfig`` object and saves it as an artifact.
+
+    Args:
+        vitessce_config (``VitessceConfig``): A VitessceConfig object.
+        description: A description for the artifact.
+    """
+    from vitessce import VitessceConfig
+
+    assert isinstance(vitessce_config, VitessceConfig)
+    timestamp = datetime.now(timezone.utc).isoformat().split(".")[0]
+    vitesse_export = f"./vitessce_export_{timestamp}.vitessce"
+    vitessce_config.export(to="files", base_url="", out_dir=vitesse_export)
+    logger.important(f"local export: {vitesse_export}")
+    artifact = Artifact(vitesse_export, description=description)
+    artifact.save()
+    config_dict = vitessce_config.to_dict(base_url=artifact.path.to_url())
+    logger.important(f"base url: {artifact.path.to_url()}")
+    config_filename = "vitessce_config.json"
+    config_file_local_path = f"{vitesse_export}/{config_filename}"
+    with open(config_file_local_path, "w") as file:
+        json.dump(config_dict, file)
+    config_file_path = artifact.path / config_filename
+    config_file_path.upload_from(config_file_local_path)
+    logger.important(f"config url: {config_file_path.to_url()}")
+    slug = ln_setup.settings.instance.slug
+    logger.important(f"go to: https://lamin.ai/{slug}/artifact/{artifact.uid}")
+    return artifact

{lamindb-0.69.3.dist-info → lamindb-0.69.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamindb
-Version: 0.69.3
+Version: 0.69.5
 Summary: A data framework for biology.
 Author-email: Lamin Labs <open-source@lamin.ai>
 Requires-Python: >=3.8
@@ -9,10 +9,10 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: lnschema_core==0.64.1
-Requires-Dist: lamindb_setup==0.68.1
+Requires-Dist: lnschema_core==0.64.4
+Requires-Dist: lamindb_setup==0.68.3
 Requires-Dist: lamin_utils==0.13.1
-Requires-Dist: lamin_cli==0.10.2
+Requires-Dist: lamin_cli==0.11.0
 Requires-Dist: rapidfuzz
 Requires-Dist: pyarrow
 Requires-Dist: typing_extensions!=4.6.0

{lamindb-0.69.3.dist-info → lamindb-0.69.5.dist-info}/RECORD

@@ -1,12 +1,12 @@
-lamindb/__init__.py,sha256=Xy8yw0Woc26c9DxrgHP5c_UvVJpocigGwfCj8Ho_VZo,2108
-lamindb/_annotate.py,sha256=k9Is43plKcQaMvGnzVw6OeWvZDWcSxw3FQ7nsQVDHzw,27744
+lamindb/__init__.py,sha256=cWnU0vX4YUkRJTNOMNyjJHRQzTAWQDAj5R7Vp_6EB4M,2163
+lamindb/_annotate.py,sha256=mM-GCej7i9eUH0cU5AcxWZ916k8NRI41WF84dfjJfu4,29955
 lamindb/_artifact.py,sha256=RV36tcHMZ6wH6u65jOAQ_H4rfmFiIzZmAr8IY7kFhm0,35817
 lamindb/_can_validate.py,sha256=w7lrUGTWldpvwaRiXBRrjfU_ZRidA7CooOu_r5MbocY,14569
-lamindb/_collection.py,sha256=03CQ0u8eCY_dx31pIT5ZMZsmxbbj6J5dJ9zUqJLrDGY,18427
+lamindb/_collection.py,sha256=SdNNhhMh2O4q0hG4Hf_y1bcwcbkMF_sqk6MIYc-hLZo,14525
 lamindb/_feature.py,sha256=ahRv87q1tcRLQ0UM5FA3KtcMQvIjW__fZq1yAdRAV7s,6728
 lamindb/_feature_set.py,sha256=G_Ss6mKh4D0Eji-xSfLRbKVFXwgUE82YOqIUmkV0CAA,8767
 lamindb/_filter.py,sha256=_PjyQWQBR3ohDAvJbR3hMvZ-2p2GvzFxLfKGC-gPnHI,1320
-lamindb/_finish.py,sha256=it-fSpSmMW9ybdsylBV5Lbugh6iXRGWgIiSLwPaow_8,8590
+lamindb/_finish.py,sha256=8lfJzRedTDCA_XXBUf4ECOevpPhVxKqMMj9qgVkmF8M,8672
 lamindb/_from_values.py,sha256=Ei11ml77Q1xubVekt2C4-mbox2-qnC7kP18B-LhCdSc,11886
 lamindb/_is_versioned.py,sha256=DXp5t-1DwErpqqMc9eb08kpQPCHOC2fNzaozMoBunR4,1337
 lamindb/_parents.py,sha256=pTDsW8HjQ_txFbPKrBU0WjjtCNH6sx2LASUuGWpJuYE,14742
@@ -21,8 +21,8 @@ lamindb/_ulabel.py,sha256=euXsDPD7wC99oopLXVkT-vq7f3E6-zP4Z4akI-yh0aM,1913
 lamindb/_utils.py,sha256=LGdiW4k3GClLz65vKAVRkL6Tw-Gkx9DWAdez1jyA5bE,428
 lamindb/_view.py,sha256=yFMu4vnt0YqvN1q11boAkwigxCH1gdliDUSbzh3IuDw,2175
 lamindb/core/__init__.py,sha256=Mw4sI-xgnMXNsu84oYFQBZOF8mxxxhp6-e3BjTQqjlA,1131
-lamindb/core/_data.py,sha256=Q8w1I8pXXOaLVIxfjWBkLV6GGnzaQxCXamu9tplFgsA,17287
-lamindb/core/_feature_manager.py,sha256=II0nuxtjOdEtU_9a7eB18_Clw9d1n5k1JOqk_vHisRw,13940
+lamindb/core/_data.py,sha256=SCyUjS9bL7MMqyZTJl8PxnNtLKL7eNiUcLvmwFrqP-k,17260
+lamindb/core/_feature_manager.py,sha256=_Bicjal2DQbpl6tR7p5o7Alb9rq0XYzAxrF_bV9sTjE,13894
 lamindb/core/_label_manager.py,sha256=zrWDSd2AkR6fKsGDxLSWqHC9fz9BcGlavPZEh92Wzjg,9063
 lamindb/core/_mapped_collection.py,sha256=e4P3AoykIMjD4_88BWbISWvKyWWTklwHl-_WLa72ZG4,16841
 lamindb/core/_run_context.py,sha256=EK0lFJWx32NY2FdqFR1YozR9zioC-BjA394nPu-KwLQ,17510
@@ -44,9 +44,11 @@ lamindb/core/storage/_backed_access.py,sha256=DUJIDjkGkemjmKLD05blndP_rO5DpUD0EZ
 lamindb/core/storage/_zarr.py,sha256=bMQSCsTOCtQy4Yo3KwCVpbUkKdWRApN9FM1rM-d2_G0,2839
 lamindb/core/storage/file.py,sha256=WTeC4ENn_O6HEoinmTviB89W81UrJT3bSGtnpqPpIyE,7242
 lamindb/core/storage/object.py,sha256=MPUb2M8Fleq2j9x1Ryqr3BETmvsDKyf11Ifvbxd3NpA,1097
+lamindb/integrations/__init__.py,sha256=aH2PmO2m4-vwIifMYTB0Fyyr_gZWtVnV71jT0tVWSw0,123
+lamindb/integrations/_vitessce.py,sha256=n85g8YRP8Y2sfU5DPJdbU84BGPrTfU3Dg2jStdmBBRI,1637
 lamindb/setup/__init__.py,sha256=OwZpZzPDv5lPPGXZP7-zK6UdO4FHvvuBh439yZvIp3A,410
 lamindb/setup/core/__init__.py,sha256=LqIIvJNcONxkqjbnP6CUaP4d45Lbd6TSMAcXFp4C7_8,231
-lamindb-0.69.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lamindb-0.69.3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-lamindb-0.69.3.dist-info/METADATA,sha256=X4upu_QrdDsy861PJvPiQ_nw1f6N89NrVqN1Zxn6i14,2856
-lamindb-0.69.3.dist-info/RECORD,,
+lamindb-0.69.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lamindb-0.69.5.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+lamindb-0.69.5.dist-info/METADATA,sha256=meDN6DOhRAnUt2jbDcykj9Hclhos_uyO_UbtSPNukG4,2856
+lamindb-0.69.5.dist-info/RECORD,,