linkml-store 0.1.7__tar.gz → 0.1.8__tar.gz

{linkml_store-0.1.7 → linkml_store-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linkml-store
-Version: 0.1.7
+Version: 0.1.8
 Summary: linkml-store
 License: MIT
 Author: Author 1
@@ -27,6 +27,7 @@ Requires-Dist: click
 Requires-Dist: duckdb (>=0.10.1,<0.11.0)
 Requires-Dist: duckdb-engine (>=0.11.2)
 Requires-Dist: h5py ; extra == "h5py"
+Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: linkml ; extra == "validation"
 Requires-Dist: linkml-runtime (>=1.7.5,<2.0.0)
 Requires-Dist: linkml_map ; extra == "map"
@@ -53,3 +54,5 @@ There is also experimental support for vector-based indexing using OpenAI test e
 The goals of this project are to provide high level access to data stored in heterogeneous databases,
 with optional schema management using LinkML.
 
+See [these slides](https://docs.google.com/presentation/d/e/2PACX-1vSgtWUNUW0qNO_ZhMAGQ6fYhlXZJjBNMYT0OiZz8DDx8oj7iG9KofRs6SeaMXBBOICGknoyMG2zaHnm/embed?start=false&loop=false&delayms=3000) for more details
+

{linkml_store-0.1.7 → linkml_store-0.1.8}/README.md

@@ -8,3 +8,5 @@ There is also experimental support for vector-based indexing using OpenAI test e
 
 The goals of this project are to provide high level access to data stored in heterogeneous databases,
 with optional schema management using LinkML.
+
+See [these slides](https://docs.google.com/presentation/d/e/2PACX-1vSgtWUNUW0qNO_ZhMAGQ6fYhlXZJjBNMYT0OiZz8DDx8oj7iG9KofRs6SeaMXBBOICGknoyMG2zaHnm/embed?start=false&loop=false&delayms=3000) for more details

{linkml_store-0.1.7 → linkml_store-0.1.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "linkml-store"
-version = "0.1.7"
+version = "0.1.8"
 description = "linkml-store"
 authors = ["Author 1 <author@org.org>"]
 license = "MIT"
@@ -27,6 +27,7 @@ h5py = { version="*", optional = true }
 linkml = { version="*", optional = true }
 linkml_map = { version="*", optional = true }
 pandas = ">=2.2.1"
+jinja2 = "^3.1.4"
 
 [tool.poetry.group.dev.dependencies]
 pytest = {version = ">=7.1.2"}
@@ -41,6 +42,7 @@ myst-parser = {version = ">=0.18.1"}
 furo = {version = "*"}
 nbsphinx = "*"
 jupyter = "*"
+jupysql = "*"
 
 [tool.poetry.group.tests.dependencies]
 pytest = "^7.4.0"

{linkml_store-0.1.7 → linkml_store-0.1.8}/src/linkml_store/api/client.py

@@ -1,3 +1,4 @@
+import logging
 from pathlib import Path
 from typing import Dict, Optional, Union
 
@@ -11,6 +12,9 @@ from linkml_store.api.stores.duckdb.duckdb_database import DuckDBDatabase
 from linkml_store.api.stores.mongodb.mongodb_database import MongoDBDatabase
 from linkml_store.api.stores.solr.solr_database import SolrDatabase
 
+logger = logging.getLogger(__name__)
+
+
 HANDLE_MAP = {
     "duckdb": DuckDBDatabase,
     "solr": SolrDatabase,
@@ -23,14 +27,27 @@ class Client:
     """
     A client is the top-level object for interacting with databases.
 
-    A client has access to one or more :class:`Database` objects.
-
-    Each database consists of a number of :class:`.Collection` objects.
+    * A client has access to one or more :class:`.Database` objects.
+    * Each database consists of a number of :class:`.Collection` objects.
 
-    Examples
-    --------
+    Creating a client
+    -----------------
     >>> client = Client()
+
+    Attaching a database
+    --------------------
     >>> db = client.attach_database("duckdb", alias="test")
+
+    Note that normally a handle would be specified by a locator such as ``duckdb:///<PATH>``, but
+    for convenience, an in-memory duckdb object can be specified without a full locator
+
+    We can check the actual handle:
+
+    >>> db.handle
+    'duckdb:///:memory:'
+
+    Creating a new collection
+    -------------------------
     >>> collection = db.create_collection("Person")
     >>> objs = [{"id": "P1", "name": "John", "age_in_years": 30}, {"id": "P2", "name": "Alice", "age_in_years": 25}]
     >>> collection.insert(objs)
@@ -151,6 +168,8 @@ class Client:
         if ":" not in handle:
             scheme = handle
             handle = None
+            if alias is None:
+                alias = scheme
         else:
             scheme, _ = handle.split(":", 1)
         if scheme not in HANDLE_MAP:
@@ -165,6 +184,11 @@ class Client:
             self._databases = {}
         self._databases[alias] = db
         db.parent = self
+        if db.alias:
+            if db.alias != alias:
+                raise AssertionError(f"Inconsistent alias: {db.alias} != {alias}")
+        else:
+            db.metadata.alias = alias
         return db
 
     def get_database(self, name: Optional[str] = None, create_if_not_exists=True, **kwargs) -> Database:
@@ -195,6 +219,7 @@ class Client:
             self._databases = {}
         if name not in self._databases:
             if create_if_not_exists:
+                logger.info(f"Creating database: {name}")
                 self.attach_database(name, **kwargs)
             else:
                 raise ValueError(f"Database {name} does not exist")

{linkml_store-0.1.7 → linkml_store-0.1.8}/src/linkml_store/api/collection.py

@@ -1,3 +1,5 @@
+"""A structure for representing collections of similar objects."""
+
 import hashlib
 import logging
 from collections import defaultdict
@@ -10,6 +12,7 @@ from linkml_runtime.linkml_model.meta import ArrayExpression
 from pydantic import BaseModel
 
 from linkml_store.index import get_indexer
+from linkml_store.utils.format_utils import load_objects
 from linkml_store.utils.object_utils import clean_empties
 
 try:
@@ -39,7 +42,17 @@ class Collection:
 
     - For relational databases, a collection is typically a table
     - For document databases such as MongoDB, a collection is the native type
-    - For a file system, a collection could be a single tabular file such as Parquet or CSV
+    - For a file system, a collection could be a single tabular file such as Parquet or CSV.
+
+    Collection objects are typically not created directly - instead they are generated
+    from a parent :class:`.Database` object:
+
+    >>> from linkml_store import Client
+    >>> client = Client()
+    >>> db = client.attach_database("duckdb", alias="test")
+    >>> collection = db.create_collection("Person")
+    >>> objs = [{"id": "P1", "name": "John", "age_in_years": 30}, {"id": "P2", "name": "Alice", "age_in_years": 25}]
+    >>> collection.insert(objs)
     """
 
     # name: str
@@ -57,15 +70,21 @@ class Collection:
             self.metadata = metadata
         else:
             self.metadata = CollectionConfig(name=name, **kwargs)
-        if name is not None and self.metadata.name is not None and name != self.metadata.name:
-            raise ValueError(f"Name mismatch: {name} != {self.metadata.name}")
+            if not self.metadata.alias:
+                self.metadata.alias = name
+            if not self.metadata.type:
+                self.metadata.type = name
+        # if name is not None and self.metadata.name is not None and name != self.metadata.name:
+        #    raise ValueError(f"Name mismatch: {name} != {self.metadata.name}")
 
     @property
     def name(self) -> str:
         """
-        Return the name of the collection
+        Return the name of the collection.
 
-        :return:
+        TODO: deprecate in favor of Type
+
+        :return: name of the collection
         """
         return self.metadata.name
 
@@ -79,7 +98,7 @@ class Collection:
 
         :return: True if the collection is hidden
         """
-        return self.metadata.hidden
+        # return self.metadata.hidden
 
     @property
     def target_class_name(self):
@@ -88,7 +107,14 @@ class Collection:
 
         This MUST be a LinkML class name
 
-        :return:
+        >>> from linkml_store import Client
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb", alias="test")
+        >>> collection = db.create_collection("Person", alias="persons")
+        >>> collection.target_class_name
+        'Person'
+
+        :return: name of the class which members of this collection instantiate
         """
         # TODO: this is a shim layer until we can normalize on this
         if self.metadata.type:
@@ -104,15 +130,34 @@ class Collection:
         to have an alias, for example "persons" which collects all instances
         of class Person.
 
-        The _alias SHOULD be used for Table names in SQL.
+        >>> from linkml_store import Client
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb", alias="test")
+        >>> collection = db.create_collection("Person", alias="persons")
+        >>> collection.alias
+        'persons'
+
+        If no explicit alias is provided, then the target class name is used:
+
+        >>> from linkml_store import Client
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb", alias="test")
+        >>> collection = db.create_collection("Person")
+        >>> collection.alias
+        'Person'
+
+        The alias SHOULD be used for Table names in SQL.
 
         For nested data, the alias SHOULD be used as the key; e.g
 
-         ``{ "persons": [ { "name": "Alice" }, { "name": "Bob" } ] }``
+        .. code-block:: json
+
+           { "persons": [ { "name": "Alice" }, { "name": "Bob" } ] }
 
         :return:
         """
         # TODO: this is a shim layer until we can normalize on this
+        # TODO: this is a shim layer until we can normalize on this
         if self.metadata.alias:
             return self.metadata.alias
         return self.name
@@ -121,6 +166,13 @@ class Collection:
         """
         Replace entire collection with objects.
 
+        >>> from linkml_store import Client
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb", alias="test")
+        >>> collection = db.create_collection("Person")
+        >>> objs = [{"id": "P1", "name": "John", "age_in_years": 30}, {"id": "P2", "name": "Alice", "age_in_years": 25}]
+        >>> collection.insert(objs)
+
         :param objs:
         :param kwargs:
         :return:
@@ -130,7 +182,14 @@ class Collection:
 
     def insert(self, objs: Union[OBJECT, List[OBJECT]], **kwargs):
         """
-        Add one or more objects to the collection
+        Add one or more objects to the collection.
+
+        >>> from linkml_store import Client
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb", alias="test")
+        >>> collection = db.create_collection("Person")
+        >>> objs = [{"id": "P1", "name": "John", "age_in_years": 30}, {"id": "P2", "name": "Alice", "age_in_years": 25}]
+        >>> collection.insert(objs)
 
         :param objs:
         :param kwargs:
@@ -138,9 +197,32 @@ class Collection:
         """
         raise NotImplementedError
 
-    def delete(self, objs: Union[OBJECT, List[OBJECT]], **kwargs) -> int:
+    def delete(self, objs: Union[OBJECT, List[OBJECT]], **kwargs) -> Optional[int]:
         """
-        Delete one or more objects from the collection
+        Delete one or more objects from the collection.
+
+        First let's set up a collection:
+
+        >>> from linkml_store import Client
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb", alias="test")
+        >>> collection = db.create_collection("Person")
+        >>> objs = [{"id": "P1", "name": "John", "age_in_years": 30}, {"id": "P2", "name": "Alice", "age_in_years": 25}]
+        >>> collection.insert(objs)
+        >>> collection.find({}).num_rows
+        2
+
+        Now let's delete an object:
+
+        >>> collection.delete(objs[0])
+        >>> collection.find({}).num_rows
+        1
+
+        Deleting the same object again should have no effect:
+
+        >>> collection.delete(objs[0])
+        >>> collection.find({}).num_rows
+        1
 
         :param objs:
         :param kwargs:
@@ -148,9 +230,30 @@ class Collection:
         """
         raise NotImplementedError
 
-    def delete_where(self, where: Optional[Dict[str, Any]] = None, missing_ok=True, **kwargs) -> int:
+    def delete_where(self, where: Optional[Dict[str, Any]] = None, missing_ok=True, **kwargs) -> Optional[int]:
         """
-        Delete objects that match a query
+        Delete objects that match a query.
+
+        First let's set up a collection:
+
+        >>> from linkml_store import Client
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb", alias="test")
+        >>> collection = db.create_collection("Person")
+        >>> objs = [{"id": "P1", "name": "John", "age_in_years": 30}, {"id": "P2", "name": "Alice", "age_in_years": 25}]
+        >>> collection.insert(objs)
+
+        Now let's delete an object:
+
+        >>> collection.delete_where({"id": "P1"})
+        >>> collection.find({}).num_rows
+        1
+
+        Match everything:
+
+        >>> collection.delete_where({})
+        >>> collection.find({}).num_rows
+        0
 
         :param where: where conditions
         :param missing_ok: if True, do not raise an error if the collection does not exist
@@ -161,7 +264,7 @@ class Collection:
 
     def update(self, objs: Union[OBJECT, List[OBJECT]], **kwargs):
         """
-        Update one or more objects in the collection
+        Update one or more objects in the collection.
 
         :param objs:
         :param kwargs:
@@ -174,7 +277,21 @@ class Collection:
 
     def query(self, query: Query, **kwargs) -> QueryResult:
         """
-        Run a query against the collection
+        Run a query against the collection.
+
+        First let's load a collection:
+
+        >>> from linkml_store import Client
+        >>> from linkml_store.utils.format_utils import load_objects
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb")
+        >>> collection = db.create_collection("Country")
+        >>> objs = load_objects("tests/input/countries/countries.jsonl")
+        >>> collection.insert(objs)
+
+        Now let's run a query:
+
+        TODO
 
         :param query:
         :param kwargs:
@@ -207,7 +324,7 @@ class Collection:
         """
         raise NotImplementedError
 
-    def get(self, ids: Optional[IDENTIFIER], **kwargs) -> QueryResult:
+    def get(self, ids: Optional[List[IDENTIFIER]], **kwargs) -> QueryResult:
         """
         Get one or more objects by ID.
 
@@ -217,6 +334,8 @@ class Collection:
         """
         # TODO
         id_field = self.identifier_attribute_name
+        if not id_field:
+            raise ValueError(f"No identifier for {self.name}")
         return self.find({id_field: ids})
 
     def get_one(self, id: IDENTIFIER, **kwargs) -> Optional[OBJECT]:
@@ -242,6 +361,31 @@ class Collection:
         """
         Find objects in the collection using a where query.
 
+        As an example, first load a collection:
+
+        >>> from linkml_store import Client
+        >>> from linkml_store.utils.format_utils import load_objects
+        >>> client = Client()
+        >>> db = client.attach_database("duckdb")
+        >>> collection = db.create_collection("Country")
+        >>> objs = load_objects("tests/input/countries/countries.jsonl")
+        >>> collection.insert(objs)
+
+        Now let's find all objects:
+
+        >>> qr = collection.find({})
+        >>> qr.num_rows
+        20
+
+        We can do a more restrictive query:
+
+        >>> qr = collection.find({"code": "FR"})
+        >>> qr.num_rows
+        1
+        >>> qr.rows[0]["name"]
+        'France'
+
+
         :param where:
         :param kwargs:
         :return:
@@ -290,6 +434,7 @@ class Collection:
             raise ValueError(f"No index named {index_name}")
         qr = ix_coll.find(where=where, limit=-1, **kwargs)
         index_col = ix.index_field
+        # TODO: optimize this for large indexes
         vector_pairs = [(row, np.array(row[index_col], dtype=float)) for row in qr.rows]
         results = ix.search(query, vector_pairs, limit=limit)
         for r in results:
@@ -305,11 +450,15 @@ class Collection:
 
         :return:
         """
-        if not self.name:
-            raise ValueError(f"Collection has no name: {self} // {self.metadata}")
-        return self.name.startswith("internal__")
+        if not self.alias:
+            raise ValueError(f"Collection has no alias: {self} // {self.metadata}")
+        return self.alias.startswith("internal__")
 
-    def attach_indexer(self, index: Union[Indexer, str], name: Optional[str] = True, auto_index=True, **kwargs):
+    def load_from_source(self):
+        objects = load_objects(self.metadata.source_location)
+        self.insert(objects)
+
+    def attach_indexer(self, index: Union[Indexer, str], name: Optional[str] = None, auto_index=True, **kwargs):
         """
         Attach an index to the collection.
 
@@ -333,6 +482,7 @@ class Collection:
         self._indexers[index_name] = index
         if auto_index:
             all_objs = self.find(limit=-1).rows
+            logger.info(f"Auto-indexing {len(all_objs)} objects")
             self.index_objects(all_objs, index_name, replace=True, **kwargs)
 
     def _index_collection_name(self, index_name: str) -> str:
@@ -340,6 +490,7 @@ class Collection:
         Create a name for a special collection that holds index data
 
         :param index_name:
+        :param indexer:
         :return:
         """
         return f"internal__index__{self.name}__{index_name}"
@@ -370,6 +521,7 @@ class Collection:
             logger.info(f"Checking if {ix_coll_name} is in {schema.classes.keys()}")
             if ix_coll_name in schema.classes:
                 ix_coll.delete_where()
+
         ix_coll.insert(objects_with_ix, **kwargs)
 
     def list_index_names(self) -> List[str]:
@@ -457,6 +609,8 @@ class Collection:
         :param max_sample_size:
         :return:
         """
+        if not self.target_class_name:
+            raise ValueError(f"No target_class_name for {self.alias}")
         cd = ClassDefinition(self.target_class_name)
         keys = defaultdict(list)
         for obj in objs[0:max_sample_size]:

{linkml_store-0.1.7 → linkml_store-0.1.8}/src/linkml_store/api/config.py

@@ -16,7 +16,7 @@ class CollectionConfig(BaseModel):
         default=None,
         description="The type of object in the collection. TODO; use this instead of name",
     )
-    metadata: Optional[Dict] = Field(
+    additional_properties: Optional[Dict] = Field(
         default=None,
         description="Optional metadata for the collection",
     )
@@ -36,6 +36,10 @@ class CollectionConfig(BaseModel):
         default=False,
         description="Whether the collection is prepopulated",
     )
+    source_location: Optional[str] = Field(
+        default=None,
+        description="Filesystem or remote URL that stores the data",
+    )
 
 
 class DatabaseConfig(BaseModel):
@@ -55,7 +59,7 @@ class DatabaseConfig(BaseModel):
         default=None,
         description="The LinkML schema as a dictionary",
     )
-    collections: Dict[str, CollectionConfig] = Field(
+    collections: Optional[Dict[str, CollectionConfig]] = Field(
         default={},
         description="A dictionary of collection configurations",
     )