cbrkit 0.19.0__tar.gz → 0.19.2__tar.gz

{cbrkit-0.19.0 → cbrkit-0.19.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cbrkit
-Version: 0.19.0
+Version: 0.19.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.19.0 → cbrkit-0.19.2}/cbrkit/cli.py

@@ -9,6 +9,8 @@ from enum import Enum
 from pathlib import Path
 from typing import Annotated
 
+from cbrkit.helpers import unpack_sim
+
 try:
     import typer
     from rich import print
@@ -33,7 +35,6 @@ class ParallelStrategy(str, Enum):
     casebase = "casebase"
 
 
-# py -m cbrkit retrieve data/cars-1k.csv data/cars-queries.csv examples.cars_retriever:retriever --output-path data/output.json
 @app.command()
 def retrieve(
     casebase_path: Path,
@@ -41,6 +42,7 @@ def retrieve(
     retriever: str,
     search_path: Annotated[list[Path], typer.Option(default_factory=list)],
     print_ranking: bool = True,
+    print_similarities: bool = False,
     output_path: Path | None = None,
     processes: int = 1,
     parallel: ParallelStrategy = ParallelStrategy.queries,
@@ -62,10 +64,18 @@ def retrieve(
         with output_path.with_suffix(".json").open("w") as fp:
             json.dump(results_dict, fp, indent=2)
 
-    if print_ranking:
+    if print_ranking or print_similarities:
         for query_name, result in results.items():
             print(f"Query: {query_name}")
-            print(result.ranking)
+
+            if print_ranking:
+                print(f"Ranking: {", ".join(map(str, result.ranking))}")
+
+            if print_similarities:
+                print("Similarities:")
+                for case_name, similarity in result.similarities.items():
+                    print(f"  {case_name}: {unpack_sim(similarity)}")
+
             print()
 
 

{cbrkit-0.19.0 → cbrkit-0.19.2}/cbrkit/eval/_common.py

@@ -44,16 +44,20 @@ def _correctness_completeness_single(
     for i in range(len(case_keys)):
         for j in range(i + 1, len(case_keys)):
             idx1, idx2 = case_keys[i], case_keys[j]
-            total_pairs += 1
+            qrel1, qrel2 = qrel[idx1], qrel[idx2]
 
-            if idx1 in run_k and idx2 in run_k:
-                qrel1, qrel2 = qrel[idx1], qrel[idx2]
-                run1, run2 = run_k[idx1], run_k[idx2]
+            if qrel1 != qrel2:
+                total_pairs += 1
 
-                if (qrel1 < qrel2 and run1 < run2) or (qrel1 > qrel2 and run1 > run2):
-                    concordant_pairs += 1
-                elif qrel1 != qrel2:
-                    discordant_pairs += 1
+                if idx1 in run_k and idx2 in run_k:
+                    run1, run2 = run_k[idx1], run_k[idx2]
+
+                    if (qrel1 < qrel2 and run1 < run2) or (
+                        qrel1 > qrel2 and run1 > run2
+                    ):
+                        concordant_pairs += 1
+                    else:
+                        discordant_pairs += 1
 
     correctness = (
         (concordant_pairs - discordant_pairs) / (concordant_pairs + discordant_pairs)

{cbrkit-0.19.0 → cbrkit-0.19.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cbrkit"
-version = "0.19.0"
+version = "0.19.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"