From 03750a0f5dabf0f0e230d10ba41ea301456cb707 Mon Sep 17 00:00:00 2001
From: Mark Waddle <markwaddle@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:13:52 -0700
Subject: [PATCH] `make install` now installs extras (#136)

---
 assistants/prospector-assistant/uv.lock              |  8 ++------
 libraries/python/assistant-extensions/pyproject.toml | 10 ++--------
 libraries/python/assistant-extensions/uv.lock        |  8 ++------
 tools/makefiles/python.mk                            |  4 +++-
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/assistants/prospector-assistant/uv.lock b/assistants/prospector-assistant/uv.lock
index aa9d1de1..ec0a2e36 100644
--- a/assistants/prospector-assistant/uv.lock
+++ b/assistants/prospector-assistant/uv.lock
@@ -190,26 +190,22 @@ name = "assistant-extensions"
 version = "0.1.0"
 source = { editable = "../../libraries/python/assistant-extensions" }
 dependencies = [
-    { name = "assistant-drive" },
-    { name = "docx2txt" },
     { name = "openai" },
-    { name = "pdfplumber" },
     { name = "semantic-workbench-assistant" },
 ]
 
 [package.optional-dependencies]
 attachments = [
+    { name = "assistant-drive" },
     { name = "docx2txt" },
     { name = "pdfplumber" },
 ]
 
 [package.metadata]
 requires-dist = [
-    { name = "assistant-drive", editable = "../../libraries/python/assistant-drive" },
-    { name = "docx2txt", specifier = ">=0.8" },
+    { name = "assistant-drive", marker = "extra == 'attachments'", editable = "../../libraries/python/assistant-drive" },
     { name = "docx2txt", marker = "extra == 'attachments'", specifier = ">=0.8" },
     { name = "openai", specifier = ">=1.51.2" },
-    { name = "pdfplumber", specifier = ">=0.11.4" },
     { name = "pdfplumber", marker = "extra == 'attachments'", specifier = ">=0.11.2" },
     { name = "semantic-workbench-assistant", editable = "../../libraries/python/semantic-workbench-assistant" },
 ]
diff --git a/libraries/python/assistant-extensions/pyproject.toml b/libraries/python/assistant-extensions/pyproject.toml
index bc2a8303..f9b5d567 100644
--- a/libraries/python/assistant-extensions/pyproject.toml
+++ b/libraries/python/assistant-extensions/pyproject.toml
@@ -9,16 +9,10 @@ description = "Add your description here"
 authors = [{ name = "Semantic Workbench Team" }]
 readme = "README.md"
 requires-python = ">=3.11"
-dependencies = [
-    "assistant-drive>=0.1.0",
-    "docx2txt>=0.8",
-    "openai>=1.51.2",
-    "pdfplumber>=0.11.4",
-    "semantic-workbench-assistant>=0.1.0",
-]
+dependencies = ["openai>=1.51.2", "semantic-workbench-assistant>=0.1.0"]
 
 [project.optional-dependencies]
-attachments = ["docx2txt>=0.8", "pdfplumber>=0.11.2"]
+attachments = ["docx2txt>=0.8", "pdfplumber>=0.11.2", "assistant-drive>=0.1.0"]
 
 [tool.uv]
 package = true
diff --git a/libraries/python/assistant-extensions/uv.lock b/libraries/python/assistant-extensions/uv.lock
index 4bf689e4..b4e1861b 100644
--- a/libraries/python/assistant-extensions/uv.lock
+++ b/libraries/python/assistant-extensions/uv.lock
@@ -70,26 +70,22 @@ name = "assistant-extensions"
 version = "0.1.0"
 source = { editable = "." }
 dependencies = [
-    { name = "assistant-drive" },
-    { name = "docx2txt" },
     { name = "openai" },
-    { name = "pdfplumber" },
     { name = "semantic-workbench-assistant" },
 ]
 
 [package.optional-dependencies]
 attachments = [
+    { name = "assistant-drive" },
     { name = "docx2txt" },
     { name = "pdfplumber" },
 ]
 
 [package.metadata]
 requires-dist = [
-    { name = "assistant-drive", editable = "../assistant-drive" },
-    { name = "docx2txt", specifier = ">=0.8" },
+    { name = "assistant-drive", marker = "extra == 'attachments'", editable = "../assistant-drive" },
     { name = "docx2txt", marker = "extra == 'attachments'", specifier = ">=0.8" },
     { name = "openai", specifier = ">=1.51.2" },
-    { name = "pdfplumber", specifier = ">=0.11.4" },
     { name = "pdfplumber", marker = "extra == 'attachments'", specifier = ">=0.11.2" },
     { name = "semantic-workbench-assistant", editable = "../semantic-workbench-assistant" },
 ]
diff --git a/tools/makefiles/python.mk b/tools/makefiles/python.mk
index a57fa3c7..e85f8fed 100644
--- a/tools/makefiles/python.mk
+++ b/tools/makefiles/python.mk
@@ -10,6 +10,8 @@ else
 venv_dir = .venv
 endif
 
+UV_SYNC_ARGS ?= --all-extras
+
 ## Rules
 
 .PHONY: install
@@ -35,5 +37,5 @@ format:
 ifneq ($(findstring pytest,$(if $(shell command -v uv $(null_stderr)),$(shell uv tree --depth 1),)),)
 .PHONY: test
 test:
-	uv run pytest $(PYTEST_ARGS)
+	uv run $(uv_project_args) pytest $(PYTEST_ARGS)
 endif