cleaning

Author: ronanguilloux

Makefile

@@ -1,25 +1,29 @@
-.PHONY: setup install test clean
+.PHONY: setup install test clean run_macos
 
 # Default shell
 SHELL := /bin/bash
 
 # Venv config
 VENV_DIR = .venv
-PYTHON = $(VENV_DIR)/bin/python3
+PYTHON = $(VENV_DIR)/bin/python3.12
 PIP = $(VENV_DIR)/bin/pip
 
 # Targets
 setup: clean
-	python3 -m venv $(VENV_DIR)
+	python3.12 -m venv $(VENV_DIR)
 
 install: setup
-	$(PYTHON) -m pip install --upgrade pip
+	$(PYTHON) -m pip install "pip<25.0"
 	$(PIP) install -r requirements.txt
+	$(PIP) install --no-deps "grc_odycy_joint_sm @ https://huggingface.co/chcaa/grc_odycy_joint_sm/resolve/main/grc_odycy_joint_sm-any-py3-none-any.whl"
 	@echo "Running tests..."
 	@$(MAKE) test
 
 test:
 	PYTHONPATH=. $(VENV_DIR)/bin/pytest
 
+run_macos:
+	cd macos && swift package clean && swift build && swift run
+
 clean:
 	rm -rf $(VENV_DIR)

README.md

@@ -441,6 +441,19 @@ It provides a Search Bar to quickly lookup verses without opening a terminal, an
 
 ## Build & Run
 
+You can run the app in several ways.
+
+### Using Make
+
+The simplest way to build and run the app is using the provided `Makefile` task:
+
+```bash
+make run_macos
+```
+This command changes to the `macos` directory, builds the Swift project, and runs the application.
+
+### Manually
+
 To run the app in debug mode (which also starts the local API server):
 
 ```bash

bin/biblecli

@@ -10,7 +10,7 @@ VENV_DIR="$BIBLE_DIR/.venv"
 # Check if the virtual environment exists
 if [ ! -d "$VENV_DIR" ]; then
     echo "Creating virtual environment..."
-    python3 -m venv "$VENV_DIR"
+    python3.12 -m venv "$VENV_DIR"
 
     echo "Activating virtual environment..."
     source "$VENV_DIR/bin/activate"
@@ -25,4 +25,4 @@ fi
 # Run the main script with all passed arguments
 export PYTHONPATH="$BIBLE_DIR"
 cd "$BIBLE_DIR" || exit 1
-"$VENV_DIR/bin/python3" -m src.cli "$@"
+"$VENV_DIR/bin/python3.12" -m src.cli "$@"

requirements.txt

@@ -1,12 +1,12 @@
 text-fabric[github]~=13.1
-pytest~=8.4
-typer~=0.23.1
-pydantic~=2.12
-fastapi~=0.128.8
-uvicorn~=0.39.0
-requests~=2.32
-numpy~=2.0
-zipp~=3.20
-spacy~=3.7.2
-sentence-transformers~=3.0
-https://huggingface.co/chq-matteo/grc_odycy_joint_sm/resolve/main/grc_odycy_joint_sm-any-py3-none-any.whl
+pytest~=9.0
+typer~=0.24.1
+pydantic~=2.12.5
+fastapi~=0.135.1
+httpx~=0.28.1
+uvicorn~=0.41.0
+requests~=2.32.5
+numpy~=2.4
+zipp~=3.23.0
+spacy~=3.8.0
+sentence-transformers~=5.3.0

src/application/workers/find_worker.py

@@ -6,7 +6,7 @@
 Called by the main CLI via subprocess.
 
 Usage:
-    .venv-spacy/bin/python3.13 src/application/workers/find_worker.py <word> [--limit N]
+    .venv-spacy/bin/python3.12 src/application/workers/find_worker.py <word> [--limit N]
 
 Output: JSON array of results to stdout.
 """

src/cli.py

@@ -95,6 +95,18 @@ def main(
         - Verse range:   "Mt 5:1-10"
         - Whole chapter: "Mk 4"
         - Book aliases:  "Gn" = "Gen" = "Genesis", "Mt" = "Matt", etc.: both French and English abbreviations supported.
+
+    MAKE TASKS
+        The project includes a Makefile for convenience:
+
+        make install
+               Set up the environment and install dependencies.
+
+        make test
+               Run the test suite.
+
+        make run_macos
+               Build and run the native macOS application.
     """
 
     if ctx.invoked_subcommand is not None:

test_find.md

@@ -21,6 +21,9 @@ def run_find(word, limit=5):
     """Run the find worker and return parsed JSON output."""
     worker_path = os.path.join(project_root, "src", "application", "workers", "find_worker.py")
     venv_python = os.path.join(project_root, ".venv-spacy", "bin", "python3")
+    if not os.path.exists(venv_python):
+        import sys
+        venv_python = sys.executable
 
     result = subprocess.run(
         [venv_python, worker_path, word, "--limit", str(limit)],