chore(weave): Refactor hotfixes4 (#2539)

* test

* test

* test version

* test_version

* wow im bad at versions

* test

* test

* test

* test

.gitattributes

@@ -1 +1 @@
-weave/frontend/** linguist-generated=true
+weave_query/weave_query/frontend/** linguist-generated=true

.github/workflows/release.yaml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       is_test:
-        description: "Use Test Pypi"
+        description: 'Use Test Pypi'
         required: true
         type: boolean
         default: true
@@ -24,11 +24,11 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v1
         with:
-          node-version: "18.x"
+          node-version: '18.x'
       - run: |
           pip install build twine
           ./build_dist.py
-          if [[ -n "$(git status weave/frontend/sha1.txt --porcelain)" ]]
+          if [[ -n "$(git status weave_query/weave_query/frontend/sha1.txt --porcelain)" ]]
           then
             echo "::error cannot publish release, commited SHA does not match build SHA"
             exit 1

.github/workflows/upload-assets.yaml

@@ -27,7 +27,7 @@ jobs:
       - id: 'build'
         run: |
           ./weave_query/weave_query/frontend/build.sh
-          if [[ -z "$(git status weave/frontend/sha1.txt --porcelain)" ]]
+          if [[ -z "$(git status weave_query/weave_query/frontend/sha1.txt --porcelain)" ]]
           then
             echo "Frontend assets has not changed, skipping publishing"
             echo "UPLOAD_ASSETS=false" >> "$GITHUB_OUTPUT"

.gitignore

@@ -10,7 +10,7 @@ artifacts
 local-artifacts
 weave_internal.egg-info
 weave.egg-info/
-weave/frontend/assets
+weave_query/weave_query/frontend/assets
 build/
 MNIST
 food-101

MANIFEST.in

@@ -3,9 +3,8 @@ include wb_schema.gql
 graft weave/client_context
 graft weave/deploy
 graft weave/flow
-graft weave/frontend
+graft weave_query/weave_query/frontend
 graft weave/integrations
-graft weave/legacy
 graft weave/trace
 graft weave/trace_server
 graft weave/type_serializers

build_dist.py

@@ -43,7 +43,7 @@
     )
 
 if os.getenv("WEAVE_SKIP_BUILD") == None:
-    subprocess.run(["bash", "weave/frontend/build.sh"], check=True)
+    subprocess.run(["bash", "weave_query/weave_query/frontend/build.sh"], check=True)
 else:
     print("!!! Skipping frontend build !!!")
 

pyproject.toml

@@ -53,10 +53,6 @@ version = { attr = "weave.version.VERSION" }
 dependencies = { file = ["requirements.txt"] }
 
 [tool.setuptools.dynamic.optional-dependencies]
-examples = { file = ["requirements.legacy.ecosystem.txt"] }
-engine = { file = ["requirements.legacy.engine.txt"] }
-ecosystem = { file = ["requirements.legacy.ecosystem.txt"] }
-datadog = { file = ["requirements.legacy.datadog.txt"] }
 modal = { file = ["requirements.modal.txt"] }
 
 [tool.pytest.ini_options]

scripts/build_frontend.sh

@@ -1,2 +1,2 @@
-cd weave/frontend
+cd weave_query/weave_query/frontend
 sh build.sh

setup.py

@@ -7,7 +7,7 @@
 from typing import Union
 from urllib.error import HTTPError
 
-from setuptools import setup  # type: ignore[import]
+from setuptools import find_namespace_packages, setup  # type: ignore[import]
 from setuptools.command.build import build  # type: ignore[import]
 from setuptools.command.editable_wheel import editable_wheel  # type: ignore[import]
 from setuptools.command.sdist import sdist  # type: ignore[import]
@@ -116,4 +116,5 @@ def run(self) -> None:
 
 setup(
     cmdclass={"build": Build, "editable_wheel": EditableWheel, "sdist": Sdist},
+    packages=find_namespace_packages(include=["weave*"]),
 )

weave_query/.vscode/settings.json

@@ -4,7 +4,7 @@
   "python.testing.cwd": "./weave",
   "python.formatting.provider": "black",
   "search.exclude": {
-    "weave/frontend": true
+    "weave_query/weave_query/frontend": true
   },
   "files.insertFinalNewline": true,
   "black-formatter.importStrategy": "fromEnvironment",