refactor: moved ./static into ./gptme/server/static

ErikBjare · Oct 5, 2024 · b47a7bc · b47a7bc
1 parent 7d5392c
commit b47a7bc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/gptme/server/api.py b/gptme/server/api.py
@@ -131,7 +131,9 @@ def api_conversation_generate(logfile: str):
 
 
 gptme_path_ctx = resources.as_file(resources.files("gptme"))
-static_path = gptme_path_ctx.__enter__().parent / "static"
+root_path = gptme_path_ctx.__enter__()
+static_path = root_path / "server" / "static"
+media_path = root_path.parent / "media"
 atexit.register(gptme_path_ctx.__exit__, None, None, None)
 
 
@@ -143,7 +145,7 @@ def root():
 
 @api.route("/favicon.png")
 def favicon():
-    return flask.send_from_directory(static_path.parent / "media", "logo.png")
+    return flask.send_from_directory(media_path, "logo.png")
 
 
 def create_app() -> flask.Flask:

diff --git a/static/index.html → gptme/server/static/index.html b/static/index.html → gptme/server/static/index.html
diff --git a/static/style.css → gptme/server/static/style.css b/static/style.css → gptme/server/static/style.css
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ packages = [
     { include = "gptme" },
 ]
 
-include = ["static/**/*", "media/logo.png"]
+include = ["gptme/server/static/**/*", "media/logo.png"]
 
 [tool.poetry.scripts]
 gptme = "gptme.cli:main"

diff --git a/tests/test_reduce.py b/tests/test_reduce.py
@@ -10,7 +10,7 @@
 # Some large files
 readme = root / "README.md"
 cli = root / "gptme" / "cli.py"
-htmlindex = root / "static" / "index.html"
+htmlindex = root / "gptme" / "server" / "static" / "index.html"
 
 long_msg = Message(
     "system",