Removing ingredients/builtin/dt directory

parkervg · May 13, 2024 · 24f0796 · 24f0796
1 parent b96415b
commit 24f0796
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 256 deletions.
diff --git a/blendsql/__init__.py b/blendsql/__init__.py
@@ -1,6 +1,5 @@
 __version__ = "0.0.141"
 
 
-from .ingredients.builtin import LLMMap, LLMQA, LLMJoin, DT, LLMValidate
+from .ingredients.builtin import LLMMap, LLMQA, LLMJoin, LLMValidate
 from .blend import blend
-from .nl_to_blendsql import nl_to_blendsql
diff --git a/blendsql/db/_postgres.py b/blendsql/db/_postgres.py
@@ -20,7 +20,7 @@ class PostgreSQL(Database):
     def __init__(self, db_path: str):
         if not _has_psycopg2:
             raise ImportError(
-                "Please install psycopg2 with `pip install psycopg2`!"
+                "Please install psycopg2 with `pip install psycopg2-binary`!"
             ) from None
         super().__init__(db_path=db_path, db_prefix="postgresql+psycopg2://")
 

diff --git a/blendsql/ingredients/__init__.py b/blendsql/ingredients/__init__.py
@@ -7,4 +7,4 @@
     IngredientException,
 )
 
-from .builtin import LLMQA, LLMJoin, LLMMap, LLMValidate, DT
+from .builtin import LLMQA, LLMJoin, LLMMap, LLMValidate
diff --git a/blendsql/ingredients/builtin/__init__.py b/blendsql/ingredients/builtin/__init__.py
@@ -1,5 +1,4 @@
-from .dt.main import DT
-from .llm.map.main import LLMMap
-from .llm.qa.main import LLMQA
-from .llm.join.main import LLMJoin
-from .llm.validate.main import LLMValidate
+from .join.main import LLMJoin
+from .qa.main import LLMQA
+from .map.main import LLMMap
+from .validate.main import LLMValidate
diff --git a/blendsql/ingredients/builtin/dt/main.py b/blendsql/ingredients/builtin/dt/main.py
diff --git a/blendsql/ingredients/builtin/dt/utils.py b/blendsql/ingredients/builtin/dt/utils.py
diff --git a/blendsql/ingredients/builtin/dt/__init__.py → ...dsql/ingredients/builtin/join/__init__.py b/blendsql/ingredients/builtin/dt/__init__.py → ...dsql/ingredients/builtin/join/__init__.py
diff --git a/...dsql/ingredients/builtin/llm/join/main.py → blendsql/ingredients/builtin/join/main.py b/...dsql/ingredients/builtin/llm/join/main.py → blendsql/ingredients/builtin/join/main.py
diff --git a/blendsql/ingredients/builtin/llm/join/__init__.py b/blendsql/ingredients/builtin/llm/join/__init__.py
diff --git a/blendsql/ingredients/builtin/llm/utils.py b/blendsql/ingredients/builtin/llm/utils.py
diff --git a/blendsql/ingredients/builtin/llm/validate/__init__.py b/blendsql/ingredients/builtin/llm/validate/__init__.py
diff --git a/...l/ingredients/builtin/llm/map/__init__.py → blendsql/ingredients/builtin/map/__init__.py b/...l/ingredients/builtin/llm/map/__init__.py → blendsql/ingredients/builtin/map/__init__.py
diff --git a/blendsql/ingredients/builtin/llm/map/main.py → blendsql/ingredients/builtin/map/main.py b/blendsql/ingredients/builtin/llm/map/main.py → blendsql/ingredients/builtin/map/main.py
diff --git a/...ql/ingredients/builtin/llm/qa/__init__.py → blendsql/ingredients/builtin/qa/__init__.py b/...ql/ingredients/builtin/llm/qa/__init__.py → blendsql/ingredients/builtin/qa/__init__.py
diff --git a/blendsql/ingredients/builtin/llm/qa/main.py → blendsql/ingredients/builtin/qa/main.py b/blendsql/ingredients/builtin/llm/qa/main.py → blendsql/ingredients/builtin/qa/main.py
diff --git a/blendsql/ingredients/builtin/llm/__init__.py → .../ingredients/builtin/validate/__init__.py b/blendsql/ingredients/builtin/llm/__init__.py → .../ingredients/builtin/validate/__init__.py
diff --git a/.../ingredients/builtin/llm/validate/main.py → ...dsql/ingredients/builtin/validate/main.py b/.../ingredients/builtin/llm/validate/main.py → ...dsql/ingredients/builtin/validate/main.py
diff --git a/research/run-debug.py b/research/run-debug.py
@@ -1,45 +1,28 @@
-from blendsql import blend
+from blendsql import blend, LLMJoin
 from blendsql.db import SQLite
-from blendsql.utils import tabulate, fetch_from_hub
-from dotenv import load_dotenv
-from tests.utils import (
-    starts_with,
-    get_length,
-    select_first_sorted,
-    do_join,
-    return_aapl,
-    get_table_size,
-)
+from blendsql.models import OpenaiLLM
+from blendsql.utils import fetch_from_hub, tabulate
 
-load_dotenv()
 if __name__ == "__main__":
     blendsql = """
-    SELECT Symbol FROM (
-        SELECT DISTINCT Symbol FROM portfolio WHERE Symbol IN (
-            SELECT Symbol FROM portfolio WHERE Quantity > 200
+    SELECT date, rival, score, documents.content AS "Team Description" FROM w
+    JOIN {{
+        LLMJoin(
+            left_on='documents::title',
+            right_on='w::rival'
         )
-    ) AS w WHERE {{starts_with('F', 'w::Symbol')}} = TRUE AND LENGTH(w.Symbol) > 3
+    }} WHERE rival = 'nsw waratahs'
     """
-    # db = PostgreSQL("localhost:5432/mydb")
-    db = SQLite(fetch_from_hub("multi_table.db"))
+    # Make our smoothie - the executed BlendSQL script
     smoothie = blend(
         query=blendsql,
-        db=db,
-        ingredients={
-            starts_with,
-            get_length,
-            select_first_sorted,
-            do_join,
-            return_aapl,
-            get_table_size,
-        },
-        verbose=True,
-        # blender=TransformersLLM("Qwen/Qwen1.5-0.5B"),
-        schema_qualify=False,
+        db=SQLite(
+            fetch_from_hub("1884_New_Zealand_rugby_union_tour_of_New_South_Wales_1.db")
+        ),
+        blender=OpenaiLLM("gpt-3.5-turbo"),
+        ingredients={LLMJoin},
     )
-    print("--------------------------------------------------")
-    print("ANSWER:")
     print(tabulate(smoothie.df))
-    print("--------------------------------------------------")
-    print(smoothie.meta.num_values_passed)
-    print(smoothie.meta.prompts)
+    import json
+
+    print(json.dumps(smoothie.meta.prompts, indent=4))