biblemate 0.2.56__py3-none-any.whl → 0.2.57__py3-none-any.whl

biblemate/__init__.py

@@ -252,9 +252,12 @@ AGENTMAKE_CONFIG = {
 }
 OLLAMA_NOT_FOUND = "`Ollama` is not found! BibleMate AI uses `Ollama` to generate embeddings for semantic searches. You may install it from https://ollama.com/ so that you can perform semantic searches of the Bible with BibleMate AI."
 BIBLEMATE_VERSION = readTextFile(os.path.join(os.path.dirname(os.path.realpath(__file__)), "version.txt"))
-BIBLEMATEDATA = os.path.join(AGENTMAKE_USER_DIR, "biblemate", "data")
-if not os.path.isdir(BIBLEMATEDATA):
-    Path(BIBLEMATEDATA).mkdir(parents=True, exist_ok=True)
+#BIBLEMATEDATA = os.path.join(AGENTMAKE_USER_DIR, "biblemate", "data")
+#if not os.path.isdir(BIBLEMATEDATA):
+#    Path(BIBLEMATEDATA).mkdir(parents=True, exist_ok=True)
+BIBLEMATEVECTORSTORE = os.path.join(os.path.expanduser("~"), "biblemate", "data", "vectors")
+if not os.path.isdir(BIBLEMATEVECTORSTORE):
+    Path(BIBLEMATEVECTORSTORE).mkdir(parents=True, exist_ok=True)
 BIBLEMATETEMP = os.path.join(os.path.dirname(os.path.realpath(__file__)), "temp")
 if not os.path.isdir(BIBLEMATETEMP):
     Path(BIBLEMATETEMP).mkdir(parents=True, exist_ok=True)

biblemate/api/add_vector.py

@@ -1,11 +1,11 @@
 import apsw, re, os, json
 from agentmake.utils.rag import get_embeddings
 from prompt_toolkit.shortcuts import ProgressBar
-from biblemate import config, BIBLEMATEDATA
+from biblemate import config, BIBLEMATEVECTORSTORE
 
 
 def add_vector_data(db_file="dictionary.db", table="Dictionary", h2=False):
-    db_file = os.path.join(BIBLEMATEDATA, db_file)
+    db_file = os.path.join(BIBLEMATEVECTORSTORE, db_file)
     if os.path.isfile(db_file):
         with apsw.Connection(db_file) as connection:
             cursor = connection.cursor()
@@ -31,7 +31,7 @@ def add_vector_data(db_file="dictionary.db", table="Dictionary", h2=False):
 
 def add_vector_names(create_table=True):
     from uniquebible.util.HBN import HBN
-    db_file = os.path.join(BIBLEMATEDATA, "exlb.db")
+    db_file = os.path.join(BIBLEMATEVECTORSTORE, "exlb.db")
     table = "exlbn"
     if os.path.isfile(db_file):
         with apsw.Connection(db_file) as connection:
@@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS {table} (
             #cursor.execute(f"VACUUM;")
 
 def fix_vector_collections(db_file="collection.db", table="PARALLEL"):
-    db_file = os.path.join(BIBLEMATEDATA, db_file)
+    db_file = os.path.join(BIBLEMATEVECTORSTORE, db_file)
     if os.path.isfile(db_file):
         with apsw.Connection(db_file) as connection:
             cursor = connection.cursor()
@@ -69,7 +69,7 @@ def fix_vector_collections(db_file="collection.db", table="PARALLEL"):
             #cursor.execute(f"VACUUM;")
 
 def add_vector_collections(db_file="collection.db", table="PROMISES", h2=False):
-    db_file = os.path.join(BIBLEMATEDATA, db_file)
+    db_file = os.path.join(BIBLEMATEVECTORSTORE, db_file)
     if os.path.isfile(db_file):
         with apsw.Connection(db_file) as connection:
             cursor = connection.cursor()
@@ -97,7 +97,7 @@ def add_vector_collections(db_file="collection.db", table="PROMISES", h2=False):
             #cursor.execute(f"VACUUM;")
 
 def add_vector_encyclopedias():
-    db_file = os.path.join(BIBLEMATEDATA, "encyclopedia.db")
+    db_file = os.path.join(BIBLEMATEVECTORSTORE, "encyclopedia.db")
     if os.path.isfile(db_file):
         with apsw.Connection(db_file) as connection:
             cursor = connection.cursor()

biblemate/api/bible.py

@@ -4,7 +4,7 @@ import json, os, re
 from agentmake import OllamaAI, OLLAMA_FOUND, OLLAMA_NOT_FOUND_MESSAGE, AGENTMAKE_USER_DIR, agentmake, getDictionaryOutput
 from agentmake.utils.rag import get_embeddings, cosine_similarity_matrix
 from prompt_toolkit.shortcuts import ProgressBar
-from biblemate import config, BIBLEMATEDATA
+from biblemate import config, BIBLEMATEVECTORSTORE
 from biblemate.api.api import run_bm_api
 from agentmake.plugins.uba.lib.BibleBooks import BibleBooks
 from agentmake.backends.ollama import OllamaAI
@@ -43,7 +43,7 @@ def search_bible(request:str, book:int=0, module=config.default_bible, search_re
     exact_matches_content = run_bm_api(f"literal:::{abbr[str(book)][0]},{module}:::{search_string}" if book else f"literal:::{module}:::{search_string}")
     
     # semantic matches
-    bible_file = os.path.join(BIBLEMATEDATA, "bible.db")
+    bible_file = os.path.join(BIBLEMATEVECTORSTORE, "bible.db")
     if not OLLAMA_FOUND:
         semantic_matches = []
         semantic_matches_content = f"[{OLLAMA_NOT_FOUND_MESSAGE}]"
@@ -86,7 +86,7 @@ class BibleVectorDatabase:
 
     def __init__(self, uba_bible_path: str=None):
         if not uba_bible_path:
-            uba_bible_path = os.path.join(BIBLEMATEDATA, "bible.db")
+            uba_bible_path = os.path.join(BIBLEMATEVECTORSTORE, "bible.db")
         # check if file exists
         if os.path.isfile(uba_bible_path):
             # Download embedding model

biblemate/bible_study_mcp.py

@@ -5,7 +5,7 @@ from fastmcp import FastMCP
 from fastmcp.prompts.prompt import PromptMessage, TextContent
 from agentmake import agentmake, DEVELOPER_MODE
 from agentmake.plugins.uba.lib.BibleParser import BibleVerseParser
-from biblemate import BIBLEMATE_VERSION, BIBLEMATEDATA, AGENTMAKE_CONFIG, config
+from biblemate import BIBLEMATE_VERSION, BIBLEMATEVECTORSTORE, AGENTMAKE_CONFIG, config
 from biblemate.api.bible import search_bible
 from biblemate.api.api import run_bm_api
 from biblemate.api.search import UBASearches
@@ -134,7 +134,7 @@ def dictionaries() -> dict:
     resources = json.loads(run_bm_api(".resources"))
     return dict(zip(resources["dictionaryListAbb"], resources["dictionaryList"]))
 
-dictionary_db = os.path.join(BIBLEMATEDATA, "dictionary.db")
+dictionary_db = os.path.join(BIBLEMATEVECTORSTORE, "dictionary.db")
 if os.path.isfile(dictionary_db):
     @mcp.resource("dictionary://{query}")
     def dictionary(query:str) -> Union[str, list]:
@@ -155,7 +155,7 @@ def encyclopedias() -> dict:
     resources = json.loads(run_bm_api(".resources"))
     return dict(zip(resources["encyclopediaListAbb"], resources["encyclopediaList"]))
 
-encyclopedia_db = os.path.join(BIBLEMATEDATA, "encyclopedia.db")
+encyclopedia_db = os.path.join(BIBLEMATEVECTORSTORE, "encyclopedia.db")
 if os.path.isfile(encyclopedia_db):
     @mcp.resource("encyclopedia://{module}/{query}")
     def encyclopedia(module: str, query:str) -> Union[str, list]:
@@ -203,7 +203,7 @@ def topics() -> dict:
     resources = json.loads(run_bm_api(".resources"))
     return dict(zip(resources["topicListAbb"], resources["topicList"]))
 
-collection_db = os.path.join(BIBLEMATEDATA, "collection.db")
+collection_db = os.path.join(BIBLEMATEVECTORSTORE, "collection.db")
 if os.path.isfile(collection_db):
     @mcp.resource("parallel://{module}/{query}")
     def parallel(module:str, query:str) -> Union[str, list]:
@@ -228,7 +228,7 @@ if os.path.isfile(collection_db):
             bible=module,
         )
 
-topic_db = os.path.join(BIBLEMATEDATA, "exlb.db")
+topic_db = os.path.join(BIBLEMATEVECTORSTORE, "exlb.db")
 if os.path.isfile(topic_db):
     @mcp.resource("topic://{query}")
     def topic(query:str) -> Union[str, list]:

biblemate/main.py

@@ -2,7 +2,7 @@ from biblemate.core.systems import *
 from biblemate.api.dialogs import *
 from biblemate.ui.text_area import getTextArea
 from biblemate.ui.info import get_banner
-from biblemate import config, CONFIG_FILE_BACKUP, DIALOGS, BIBLEMATE_VERSION, AGENTMAKE_CONFIG, BIBLEMATE_USER_DIR, BIBLEMATEDATA, fix_string, write_user_config, list_dir_content
+from biblemate import config, CONFIG_FILE_BACKUP, DIALOGS, BIBLEMATE_VERSION, AGENTMAKE_CONFIG, BIBLEMATE_USER_DIR, BIBLEMATEVECTORSTORE, fix_string, write_user_config, list_dir_content
 from biblemate.api.api import DEFAULT_MODULES, run_bm_api
 from pathlib import Path
 import urllib.parse
@@ -270,14 +270,14 @@ async def download_data(console, default=""):
         default=default,
     )
     if file_id:
-        output = os.path.join(BIBLEMATEDATA, file_id+".zip")
+        output = os.path.join(BIBLEMATEVECTORSTORE, file_id+".zip")
         if os.path.isfile(output):
             os.remove(output)
         if os.path.isfile(output[:-4]):
             os.remove(output[:-4])
         gdown.download(id=file_ids[file_id], output=output)
         with zipfile.ZipFile(output, 'r') as zip_ref:
-            zip_ref.extractall(BIBLEMATEDATA)
+            zip_ref.extractall(BIBLEMATEVECTORSTORE)
         if os.path.isfile(output):
             os.remove(output)
         info = "Restart to make the changes effective!"

biblemate/version.txt

@@ -1 +1 @@
-0.2.56
+0.2.57

{biblemate-0.2.56.dist-info → biblemate-0.2.57.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: biblemate
-Version: 0.2.56
+Version: 0.2.57
 Summary: BibleMate AI - Automate Your Bible Study
 Home-page: https://biblemate.ai
 Author: Eliran Wong

{biblemate-0.2.56.dist-info → biblemate-0.2.57.dist-info}/RECORD

@@ -1,15 +1,15 @@
 biblemate/README.md,sha256=ngPTXscxJgA2Q6dArGQEi_q4C74QxugitH3ryM_r70o,1247
-biblemate/__init__.py,sha256=kceUofhQVUX0Ax7VFKWbM8gb-Bvzzx76vx1F6kMynHw,10115
-biblemate/bible_study_mcp.py,sha256=-TsFKysiJi9CRBrPdCmbyRcxobO_urB2smEfZa8xX4A,62157
+biblemate/__init__.py,sha256=f36wWxawWA6ViT10JKrxv7BRkJK5u7p-5Y7TRoWNers,10321
+biblemate/bible_study_mcp.py,sha256=_pa6Txn4nifSL6NbP1pVD6GSegqqwiPZjXHV5PM1Y5s,62192
 biblemate/biblematemcp.py,sha256=8GSAbzZw54L2jwj4wwCXlChBkHROUQETM2TJ2j8Ffeg,1506
 biblemate/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-biblemate/main.py,sha256=V1a6CDoMY4rlcDBFBRySploCoxIa4I4iqazOFq4Jkmc,92800
+biblemate/main.py,sha256=rpmGGaYUNv_HVJfUz0QIdS-S_8lnmehjeW7df1B-YW4,92821
 biblemate/package_name.txt,sha256=WkkuEEkgw7EKpXV8GshpzhZlwRor1wpotTS7vP24b_g,9
 biblemate/requirements.txt,sha256=yMNiISM_lIW1c8Q-ReitShZzTzlvelLVz8rhX5y2H4k,82
-biblemate/version.txt,sha256=eKO9TNWSCvArJWdj_PMFe4MzvVfc0T3balrgTAiH0q4,6
-biblemate/api/add_vector.py,sha256=yb6gRP8focZvAJzhR8gtQToxgVAS3BKeMJZH8HTPCZk,6815
+biblemate/version.txt,sha256=eVb1HRbF4qJhqgxgWtH9X10eq7JvX8-iMCXJcxprnRI,6
+biblemate/api/add_vector.py,sha256=YbwTaM5i-8MCqu8aYiwI5kZmJ1bRnm-5RicwkonaDv8,6857
 biblemate/api/api.py,sha256=gBlmMzcGXWKviEve0IBTRNJbE2l8dqUD-RGdwaev4Bw,4291
-biblemate/api/bible.py,sha256=ErKWAH28NByuXSd1_ekVyuPvuQwpEye6TU8AsR3azP0,7678
+biblemate/api/bible.py,sha256=6FnNrpWPHPzW9WovSAm75DzOouBplCmEOYhaQsq9Wfg,7699
 biblemate/api/dialogs.py,sha256=2QKyj39yn3VQ1NtKPZiidKP4KwI8UKsrQD2T4x4JupI,12373
 biblemate/api/search.py,sha256=NFnxo_75S2NGvducC5FBHMAtjCdlLGpXUa2FLRr7VT4,3390
 biblemate/core/systems.py,sha256=izdjdDESpQRlembE6N37pXc-yFTKUG5G-vUVKa6Ki1w,4231
@@ -20,8 +20,8 @@ biblemate/ui/info.py,sha256=rg2UvsyQTR7DbOWtO246JT2Yn92A_3RM85go4XXPhI8,2545
 biblemate/ui/prompts.py,sha256=IDoKM-JFXM7Vm3VYVRFR5Ybo9xaSbcwCFiEkj3l6-gY,3633
 biblemate/ui/selection_dialog.py,sha256=aIUhFWm56uYnd8-fyebADv7qwwtEeuMBkfjqlcPYRWc,4659
 biblemate/ui/text_area.py,sha256=7Qx1wHbJ792MEq2N29uMSjDf_eTgh_G6hqypGus957w,18507
-biblemate-0.2.56.dist-info/METADATA,sha256=Cbg4wJPEWAAKNS3pSqgnrXMYlscBHr67hy2EEyej7EY,2690
-biblemate-0.2.56.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-biblemate-0.2.56.dist-info/entry_points.txt,sha256=8Y88G_Vy1PgsSXRhq_SUzP8PUl5Qv54hFlpMkmvwrOA,117
-biblemate-0.2.56.dist-info/top_level.txt,sha256=pq9uX0tAS0bizZcZ5GW5zIoDLQBa-b5QDlDGsdHNgiU,10
-biblemate-0.2.56.dist-info/RECORD,,
+biblemate-0.2.57.dist-info/METADATA,sha256=96QibzFewDX4czkIApPByRZzztDp5mR8uUBGpfWf7Zc,2690
+biblemate-0.2.57.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+biblemate-0.2.57.dist-info/entry_points.txt,sha256=8Y88G_Vy1PgsSXRhq_SUzP8PUl5Qv54hFlpMkmvwrOA,117
+biblemate-0.2.57.dist-info/top_level.txt,sha256=pq9uX0tAS0bizZcZ5GW5zIoDLQBa-b5QDlDGsdHNgiU,10
+biblemate-0.2.57.dist-info/RECORD,,