biblemate 0.2.55__tar.gz → 0.2.57__tar.gz

{biblemate-0.2.55 → biblemate-0.2.57}/PKG-INFO

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

{biblemate-0.2.55 → biblemate-0.2.57}/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-0.2.55 → biblemate-0.2.57}/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-0.2.55 → biblemate-0.2.57}/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-0.2.55 → biblemate-0.2.57}/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
@@ -43,6 +43,9 @@ mcp = FastMCP(name="BibleMate AI", auth=verifier)
 def getResponse(messages:list) -> str:
     return messages[-1].get("content") if messages and "content" in messages[-1] else "Error!"
 
+def chapter2verses(request:str) -> str:
+    return re.sub("[Cc][Hh][Aa][Pp][Tt][Ee][Rr] ([0-9]+?)([^0-9])", r"\1:1-180\2", request)
+
 # Note: Declare global variables used in MCP resources, tools or prompts, so that they work when MCP is run in http transport mode
 
 @mcp.resource("resource://info")
@@ -131,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]:
@@ -152,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]:
@@ -200,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]:
@@ -225,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]:
@@ -1075,49 +1078,57 @@ def search_revelation_only(request:str) -> str:
 @mcp.tool
 def compare_bible_translations(request:str) -> str:
     """compare Bible translations; bible verse reference(s) must be given"""
-    global run_bm_api
+    global run_bm_api, chapter2verses
+    request = chapter2verses(request)
     return run_bm_api(f"verses:::KJV,LEB,NET,OHGB,OHGBi:::{request}")
 
 @mcp.tool
 def retrieve_bible_cross_references(request:str) -> str:
     """retrieve cross-references of Bible verses; bible verse reference(s) must be given"""
-    global run_bm_api
+    global run_bm_api, chapter2verses
+    request = chapter2verses(request)
     return run_bm_api(f"xrefs:::{request}")
 
 @mcp.tool
 def retrieve_hebrew_or_greek_bible_verses(request:str) -> str:
     """retrieve Hebrew or Greek Bible verses; bible verse reference(s) must be given, e.g. John 3:16-17; single or multiple references accepted, e.g. Deut 6:4; Gen 1:26-27"""
-    global run_bm_api
+    global run_bm_api, chapter2verses
+    request = chapter2verses(request)
     return run_bm_api(f"verses:::OHGB:::{request}")
 
 @mcp.tool
 def retrieve_interlinear_hebrew_or_greek_bible_verses(request:str) -> str:
     """retrieve interlinear Hebrew-English or Greek-English Bible verses; bible verse reference(s) must be given, e.g. John 3:16-17; single or multiple references accepted, e.g. Deut 6:4; Gen 1:26-27"""
-    global run_bm_api
+    global run_bm_api, chapter2verses
+    request = chapter2verses(request)
     return run_bm_api(f"verses:::OHGBi:::{request}")
 
 @mcp.tool
 def retrieve_bible_verses(request:str) -> str:
     """retrieve Bible verses; bible verse reference(s) must be given, e.g. John 3:16-17; single or multiple references accepted, e.g. Deut 6:4; Gen 1:26-27"""
-    global run_bm_api
+    global run_bm_api, chapter2verses
+    request = chapter2verses(request)
     return run_bm_api(f"verses:::{config.default_bible}:::{request}")
 
 @mcp.tool
 def retrieve_verse_morphology(request:str) -> str:
     """retrieve parsing and morphology of individual bible verses; bible verse reference(s) must be given, e.g. John 3:16-17; single or multiple references accepted, e.g. Deut 6:4; Gen 1:26-27"""
-    global run_bm_api
+    global run_bm_api, chapter2verses
+    request = chapter2verses(request)
     return run_bm_api(f"morphology:::{request}")
 
 @mcp.tool
 def retrieve_bible_chapter(request:str) -> str:
     """retrieve a whole Bible chapter; bible chapter reference must be given, e.g. John 3"""
-    global run_bm_api
+    global run_bm_api, chapter2verses
+    request = chapter2verses(request)
     return run_bm_api(f"chapter:::{request}")
 
 @mcp.tool
 def read_bible_commentary(request:str) -> str:
     """read bible commentary on individual bible verses; bible verse reference(s) must be given, like , like John 3:16 or John 3:16-18"""
-    global run_bm_api
+    global run_bm_api, chapter2verses
+    request = chapter2verses(request)
     return run_bm_api(f"commentary:::{request}")
 
 @mcp.tool
@@ -1398,7 +1409,7 @@ def simple_bible_study(request:str) -> PromptMessage:
     """Perform a simple bible study task"""
     global PromptMessage, TextContent
     prompt_text = f"""You are a bible study agent. You check the user request, under the `User Request` section, and resolve it with the following steps in order:
-1. Call tool 'retrieve_english_bible_verses' for Bible text, 
+1. Call tool 'retrieve_english_bible_verses' or `retrieve_bible_chapter` for Bible text, 
 2. Call tool 'retrieve_bible_cross_references' for Bible cross-references, 
 3. Call tool 'study_old_testament_themes' for studying old testament themes or 'study_new_testament_themes' for studying new testament themes, and 
 4. Call tool 'write_bible_theology' to explain its theology.

{biblemate-0.2.55 → biblemate-0.2.57}/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-0.2.57/biblemate/version.txt

@@ -0,0 +1 @@
+0.2.57

{biblemate-0.2.55 → biblemate-0.2.57}/biblemate.egg-info/PKG-INFO

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

{biblemate-0.2.55 → biblemate-0.2.57}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 from setuptools.command.install import install
 import os, shutil, platform, sys
 
-version = "0.2.55"
+version = "0.2.57"
 with open(os.path.join("biblemate", "version.txt"), "w", encoding="utf-8") as fileObj:
     fileObj.write(version)
 

biblemate-0.2.55/biblemate/version.txt

@@ -1 +0,0 @@
-0.2.55