Fix site package installation location (#1779)

* Remove dependency on pyproject.toml in site package

* Add package_data

* Move to include, mapped by poetry

* Bump

* Poetry enforces stricter package rules

* Fix compose.full

* Restore workflow

* config location

* Test location

* Include files AND packages in wheel

py/cli/utils/docker_utils.py

@@ -313,10 +313,10 @@ def get_compose_files():
         "..",
     )
     compose_files = {
-        "base": os.path.join(package_dir, "compose.yaml"),
-        "full": os.path.join(package_dir, "compose.full.yaml"),
+        "base": os.path.join(package_dir, "r2r", "compose.yaml"),
+        "full": os.path.join(package_dir, "r2r", "compose.full.yaml"),
         "full_scale": os.path.join(
-            package_dir, "compose.full_with_replicas.yaml"
+            package_dir, "r2r", "compose.full_with_replicas.yaml"
         ),
     }
 

py/core/main/config.py

@@ -26,7 +26,7 @@ class R2RConfig:
     current_file_path = os.path.dirname(__file__)
     config_dir_root = os.path.join(current_file_path, "..", "configs")
     default_config_path = os.path.join(
-        current_file_path, "..", "..", "r2r.toml"
+        current_file_path, "..", "..", "r2r", "r2r.toml"
     )
 
     CONFIG_OPTIONS: dict[str, Optional[str]] = {}

py/pyproject.toml

@@ -5,28 +5,25 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry]
 name = "r2r"
 readme = "README.md"
-version = "3.3.23"
+version = "3.3.24"
 
 description = "SciPhi R2R"
 authors = ["Owen Colegrove <[email protected]>"]
 license = "MIT"
-include = [
-    "r2r.toml",
-    "compose.yaml",
-    "compose.full.yaml",
-    "compose.full_with_replicas.yaml",
-    "pyproject.toml",
-    "migrations/**/*",
-    "r2r/**/*.yaml",
-    "r2r/**/*.toml"
-]
+
 packages = [
-    { include = "r2r" },
+    { include = "r2r", from = "." },
     { include = "sdk", from = "." },
     { include = "shared", from = "." },
     { include = "core", from = "." },
     { include = "cli", from = "." },
 ]
+include = [
+    { path = "migrations/**/*", format = ["sdist", "wheel"] },
+    { path = "pyproject.toml", format = ["sdist", "wheel"] },
+    { path = "r2r/**/*.yaml", format = ["sdist", "wheel"] },
+    { path = "r2r/**/*.toml", format = ["sdist", "wheel"] }
+]
 
 [tool.poetry.dependencies]
 # Python Versions

py/tests/unit/test_config.py

@@ -11,7 +11,7 @@
 @pytest.fixture
 def base_config():
     """Load the base r2r.toml config"""
-    config_path = Path(__file__).parent.parent.parent / "r2r.toml"
+    config_path = Path(__file__).parent.parent.parent / "r2r/r2r.toml"
     with open(config_path) as f:
         return toml.load(f)
 
@@ -140,7 +140,7 @@ def get_config_files():
 def test_config_required_keys(config_file):
     """Test that all required keys are present in all config files"""
     if config_file == "r2r.toml":
-        file_path = Path(__file__).parent.parent.parent / "r2r.toml"
+        file_path = Path(__file__).parent.parent.parent / "r2r/r2r.toml"
     else:
         file_path = (
             Path(__file__).parent.parent.parent