cbrkit 0.12.2__tar.gz → 0.12.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cbrkit
-Version: 0.12.2
+Version: 0.12.3
 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.2 → cbrkit-0.12.3}/cbrkit/api.py

@@ -1,5 +1,8 @@
 from typing import Any
 
+from pydantic import ConfigDict
+from pydantic.dataclasses import dataclass
+
 try:
     from fastapi import FastAPI
     from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -9,6 +12,10 @@ except ModuleNotFoundError:
 
 import cbrkit
 
+ApiResult = dataclass(
+    cbrkit.retrieval.Result, config=ConfigDict(arbitrary_types_allowed=True)
+)
+
 
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix="cbrkit_")
@@ -33,7 +40,7 @@ elif settings.retriever_map is not None:
     retriever = list(retriever_map.values())
 
 
-@app.post("/retrieve", response_model=None)
+@app.post("/retrieve", response_model=dict[str, ApiResult])
 def all_retrievers(
     casebase: dict[str, Any], queries: dict[str, Any]
 ) -> dict[str, cbrkit.retrieval.Result]:
@@ -43,7 +50,7 @@ def all_retrievers(
     }
 
 
-@app.post("/retrieve/{retriever_name}", response_model=None)
+@app.post("/retrieve/{retriever_name}", response_model=dict[str, ApiResult])
 def named_retriever(
     retriever_name: str, casebase: dict[str, Any], queries: dict[str, Any]
 ) -> dict[str, cbrkit.retrieval.Result]:

{cbrkit-0.12.2 → cbrkit-0.12.3}/cbrkit/helpers.py

@@ -1,4 +1,3 @@
-from abc import ABC
 from collections.abc import Collection, Iterable, Mapping, Sequence
 from inspect import signature as inspect_signature
 from typing import Any, cast
@@ -21,7 +20,6 @@ __all__ = [
     "sim2map",
     "unpack_sim",
     "unpack_sims",
-    "AbstractFloat",
     "singleton",
 ]
 
@@ -156,8 +154,3 @@ def unpack_sim(sim: AnyFloat) -> float:
 
 def unpack_sims(sims: Iterable[AnyFloat]) -> list[float]:
     return [unpack_sim(sim) for sim in sims]
-
-
-class AbstractFloat(ABC, float):
-    def __new__(cls, *args, **kwargs):
-        return float.__new__(cls, args[0])

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

@@ -4,7 +4,6 @@ This module provides several loaders to read data from different file formats an
 
 import csv as csvlib
 import tomllib
-from collections import abc
 from collections.abc import Callable, Iterator, Mapping
 from importlib import import_module
 from pathlib import Path
@@ -58,7 +57,7 @@ def python(import_name: str) -> Any:
     return getattr(module, obj_name)
 
 
-class DataFrameCasebase(abc.Mapping):
+class DataFrameCasebase(Mapping):
     __slots__ = ("df",)
 
     df: DataFrame

{cbrkit-0.12.2 → cbrkit-0.12.3}/cbrkit/sim/graph/_model.py

@@ -1,6 +1,6 @@
 from collections.abc import Hashable
 from dataclasses import dataclass
-from typing import Generic, Protocol, TypeVar
+from typing import Generic, Protocol, TypeVar, runtime_checkable
 
 NodeKey = TypeVar("NodeKey")
 NodeData = TypeVar("NodeData")
@@ -9,12 +9,14 @@ EdgeData = TypeVar("EdgeData")
 GraphData = TypeVar("GraphData")
 
 
+@runtime_checkable
 class EdgeProtocol(Hashable, Protocol[EdgeData, NodeKey]):
     source: NodeKey
     target: NodeKey
     data: EdgeData
 
 
+@runtime_checkable
 class NodeProtocol(Hashable, Protocol[NodeData]):
     data: NodeData
 

{cbrkit-0.12.2 → cbrkit-0.12.3}/cbrkit/typing.py

@@ -1,11 +1,9 @@
 from collections.abc import Mapping, Sequence
 from pathlib import Path
-from typing import (
-    Protocol,
-    TypeVar,
-)
+from typing import Protocol, TypeVar, runtime_checkable
 
 
+@runtime_checkable
 class FloatProtocol(Protocol):
     value: float
 

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

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