cbrkit 0.12.0__tar.gz → 0.12.2__tar.gz

{cbrkit-0.12.0 → cbrkit-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cbrkit
-Version: 0.12.0
+Version: 0.12.2
 Summary: Customizable Case-Based Reasoning (CBR) toolkit for Python with a built-in API and CLI.
 Home-page: https://wi2trier.github.io/cbrkit/
 License: MIT

{cbrkit-0.12.0 → cbrkit-0.12.2}/cbrkit/api.py

@@ -23,13 +23,13 @@ retriever = []
 retriever_map = {}
 
 if settings.retriever is not None and settings.retriever_map is not None:
-    retriever = cbrkit.retrieval.load(settings.retriever)
-    retriever_map = cbrkit.retrieval.load_map(settings.retriever_map)
+    retriever = cbrkit.retrieval.load(settings.retriever.split(","))
+    retriever_map = cbrkit.retrieval.load_map(settings.retriever_map.split(","))
 elif settings.retriever is not None:
-    retriever = cbrkit.retrieval.load(settings.retriever)
+    retriever = cbrkit.retrieval.load(settings.retriever.split(","))
     retriever_map = {str(idx): retriever for idx, retriever in enumerate(retriever)}
 elif settings.retriever_map is not None:
-    retriever_map = cbrkit.retrieval.load_map(settings.retriever_map)
+    retriever_map = cbrkit.retrieval.load_map(settings.retriever_map.split(","))
     retriever = list(retriever_map.values())
 
 

{cbrkit-0.12.0 → cbrkit-0.12.2}/cbrkit/cli.py

@@ -3,11 +3,13 @@
 """
 
 import os
+import sys
 from pathlib import Path
+from typing import Annotated
 
 try:
+    import typer
     from rich import print
-    from typer import Typer
 except ModuleNotFoundError:
     print(
         "Please install cbrkit with the [cli] extra to use the command line interface."
@@ -16,7 +18,7 @@ except ModuleNotFoundError:
 
 import cbrkit
 
-app = Typer()
+app = typer.Typer()
 
 
 @app.callback()
@@ -25,27 +27,45 @@ def app_callback():
 
 
 @app.command()
-def retrieve(casebase_path: Path, queries_path: Path, retriever: str):
+def retrieve(
+    casebase_path: Path,
+    queries_path: Path,
+    retriever: str,
+    print_ranking: bool = True,
+) -> None:
     casebase = cbrkit.loaders.path(casebase_path)
     queries = cbrkit.loaders.path(queries_path)
     retrievers = cbrkit.retrieval.load(retriever)
 
     for query_name, query in queries.items():
         result = cbrkit.retrieval.apply(casebase, query, retrievers)
-        print(f"Query: {query_name}")
-        print(result.ranking)
-        print()
+
+        if print_ranking:
+            print(f"Query: {query_name}")
+            print(result.ranking)
+            print()
 
 
 @app.command()
-def serve(retriever: str, reload: bool = False) -> None:
+def serve(
+    retriever: list[str],
+    search_path: Annotated[list[Path], typer.Option(default_factory=list)],
+    host: str = "0.0.0.0",
+    port: int = 8080,
+    reload: bool = False,
+    root_path: str = "",
+) -> None:
     import uvicorn
 
-    os.environ["CBRKIT_RETRIEVER"] = retriever
+    sys.path.extend(str(x) for x in search_path)
+    os.environ["CBRKIT_RETRIEVER"] = ",".join(retriever)
 
     uvicorn.run(
         "cbrkit.api:app",
+        host=host,
+        port=port,
         reload=reload,
+        root_path=root_path,
     )
 
 

{cbrkit-0.12.0 → cbrkit-0.12.2}/cbrkit/loaders.py

@@ -70,7 +70,7 @@ class DataFrameCasebase(abc.Mapping):
         if isinstance(key, int):
             return self.df.iloc[key]
         elif isinstance(key, str):
-            return self.df.loc[key]
+            return cast(Series, self.df.loc[key])
 
         raise TypeError(f"Invalid key type: {type(key)}")
 

{cbrkit-0.12.0 → cbrkit-0.12.2}/cbrkit/sim/_aggregator.py

@@ -68,7 +68,7 @@ def aggregator(
     pooling_func = _pooling_funcs[pooling] if isinstance(pooling, str) else pooling
 
     def wrapped_func(similarities: SimSeqOrMap[KeyType, AnyFloat]) -> float:
-        assert pooling_weights is None or type(similarities) == type(pooling_weights)
+        assert pooling_weights is None or type(similarities) is type(pooling_weights)
 
         sims: Sequence[float]  # noqa: F821
 

{cbrkit-0.12.0 → cbrkit-0.12.2}/cbrkit/sim/collections.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable, Collection, Sequence, Set
 from dataclasses import dataclass, field
 from itertools import product
-from typing import Any, Generic
+from typing import Any, Generic, cast
 
 from cbrkit.helpers import dist2sim, unpack_sim
 from cbrkit.typing import FloatProtocol, SimPairFunc, SimType, ValueType
@@ -52,7 +52,7 @@ def smith_waterman(
 
     def wrapped_func(x: Sequence[ValueType], y: Sequence[ValueType]) -> float:
         try:
-            alignment = smith.SmithWaterman(x, y)
+            alignment = smith.SmithWaterman(cast(Sequence, x), cast(Sequence, y))
             alignment.change_matrix(
                 core.ScoreMatrix(
                     match=match_score, miss=mismatch_penalty, gap=gap_penalty

{cbrkit-0.12.0 → cbrkit-0.12.2}/cbrkit/sim/graph/_astar.py

@@ -72,7 +72,7 @@ class GraphMapping(Generic[GraphData, NodeKey, NodeData, EdgeKey, EdgeData]):
     def is_legal_node_mapping(self, x: NodeKey, y: NodeKey) -> bool:
         """Check if mapping is legal"""
 
-        return not (self._is_node_mapped(x) or type(x) != type(y))
+        return not (self._is_node_mapped(x) or type(x) is not type(y))
 
     def is_legal_edge_mapping(self, x: EdgeKey, y: EdgeKey) -> bool:
         """Check if mapping is legal"""

{cbrkit-0.12.0 → cbrkit-0.12.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cbrkit"
-version = "0.12.0"
+version = "0.12.2"
 description = "Customizable Case-Based Reasoning (CBR) toolkit for Python with a built-in API and CLI."
 authors = ["Mirko Lenz <mirko@mirkolenz.com>"]
 license = "MIT"