cbrkit 0.2.1__tar.gz → 0.3.0__tar.gz

{cbrkit-0.2.1 → cbrkit-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cbrkit
-Version: 0.2.1
+Version: 0.3.0
 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.2.1 → cbrkit-0.3.0}/cbrkit/global_sim/graph/_astar.py

@@ -22,7 +22,7 @@ from cbrkit.typing import Casebase, FloatProtocol, KeyType, SimPairFunc, SimType
 logger = logging.getLogger(__name__)
 
 
-@dataclass
+@dataclass(slots=True)
 class GraphMapping(Generic[GraphData, NodeKey, NodeData, EdgeKey, EdgeData]):
     """Store all mappings and perform integrity checks on them"""
 
@@ -107,7 +107,7 @@ class GraphMapping(Generic[GraphData, NodeKey, NodeData, EdgeKey, EdgeData]):
         self.edge_mappings[x] = y
 
 
-@dataclass
+@dataclass(slots=True)
 class SearchNode(Generic[GraphData, NodeKey, NodeData, EdgeKey, EdgeData]):
     """Specific search node"""
 

{cbrkit-0.2.1 → cbrkit-0.3.0}/cbrkit/global_sim/graph/_model.py

@@ -19,7 +19,7 @@ class NodeProtocol(Hashable, Protocol[NodeData]):
     data: NodeData
 
 
-@dataclass
+@dataclass(slots=True)
 class Graph(Generic[GraphData, NodeKey, NodeData, EdgeKey, EdgeData]):
     nodes: dict[NodeKey, NodeProtocol[NodeData]]
     edges: dict[EdgeKey, EdgeProtocol[EdgeData, NodeKey]]

{cbrkit-0.2.1 → cbrkit-0.3.0}/cbrkit/loaders.py

@@ -53,6 +53,8 @@ def python(import_name: str) -> Any:
 
 
 class DataFrameCasebase(abc.Mapping):
+    __slots__ = ("df",)
+
     df: DataFrame
 
     def __init__(self, df: DataFrame) -> None:
@@ -96,9 +98,16 @@ def _csv_pandas(path: FilePath) -> dict[int, pd.Series]:
     return cast(dict[int, pd.Series], dataframe(df))
 
 
-def json(path: FilePath) -> dict[str, Any]:
+def json(path: FilePath) -> dict[Any, Any]:
     with open(path, "rb") as fp:
-        return orjson.loads(fp.read())
+        data = orjson.loads(fp.read())
+
+        if isinstance(data, list):
+            return dict(enumerate(data))
+        elif isinstance(data, dict):
+            return data
+        else:
+            raise TypeError(f"Invalid data type: {type(data)}")
 
 
 def toml(path: FilePath) -> dict[str, Any]:
@@ -106,12 +115,18 @@ def toml(path: FilePath) -> dict[str, Any]:
         return tomllib.load(fp)
 
 
-def yaml(path: FilePath) -> dict[str, Any]:
-    data: dict[str, Any] = {}
+def yaml(path: FilePath) -> dict[Any, Any]:
+    data: dict[Any, Any] = {}
 
     with open(path, "rb") as fp:
-        for doc in yamllib.safe_load_all(fp):
-            data |= doc
+        for doc_idx, doc in enumerate(yamllib.safe_load_all(fp)):
+            if isinstance(doc, list):
+                for idx, item in enumerate(doc):
+                    data[doc_idx + idx] = item
+            elif isinstance(doc, dict):
+                data |= doc
+            else:
+                raise TypeError(f"Invalid document type: {type(doc)}")
 
     return data
 

{cbrkit-0.2.1 → cbrkit-0.3.0}/cbrkit/retrieval.py

@@ -29,7 +29,7 @@ def _similarities2ranking(
     return sorted(sim_map, key=lambda key: unpack_sim(sim_map[key]), reverse=True)
 
 
-@dataclass
+@dataclass(slots=True)
 class _Result(Generic[KeyType, ValueType, SimType]):
     similarities: SimMap[KeyType, SimType]
     ranking: list[KeyType]
@@ -47,7 +47,7 @@ class _Result(Generic[KeyType, ValueType, SimType]):
         return cls(similarities=similarities, ranking=ranking, casebase=casebase)
 
 
-@dataclass
+@dataclass(slots=True)
 class Result(Generic[KeyType, ValueType, SimType]):
     final: _Result[KeyType, ValueType, SimType]
     intermediate: list[_Result[KeyType, ValueType, SimType]]

{cbrkit-0.2.1 → cbrkit-0.3.0}/cbrkit/sim/taxonomy.py

@@ -11,7 +11,7 @@ class SerializedNode(TypedDict, total=False):
     children: list["SerializedNode | str"]
 
 
-@dataclass
+@dataclass(slots=True)
 class TaxonomyNode:
     key: str
     weight: float | None
@@ -21,6 +21,8 @@ class TaxonomyNode:
 
 
 class Taxonomy:
+    __slots__ = ("root", "nodes")
+
     root: TaxonomyNode
     nodes: dict[str, TaxonomyNode]
 

{cbrkit-0.2.1 → cbrkit-0.3.0}/pyproject.toml

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