move source dir

vtuber-plan · Nov 8, 2024 · a3a55bb · a3a55bb
1 parent db028a3
commit a3a55bb
Show file tree

Hide file tree

Showing 36 changed files with 15 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -163,4 +163,9 @@ cython_debug/
 /model_dir/
 /dataset_dir/
 /repos/
-/logs/
+/logs/
+
+*.key
+*.csr
+*.pem
+*.crt
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "olah"
-version = "0.3.3"
+version = "0.3.4"
 description = "Self-hosted lightweight huggingface mirror."
 readme = "README.md"
 requires-python = ">=3.8"
@@ -29,10 +29,11 @@ dev = ["black==24.10.0", "pylint==3.3.1", "pytest==8.3.3"]
 olah-cli = "olah.server:cli"
 
 [tool.setuptools.packages.find]
+where = ["src"]
 exclude = ["assets*", "benchmark*", "docs", "dist*", "playground*", "scripts*", "tests*"]
 
 [tool.setuptools.package-data]
-static = ["*.html"]
+olah = ["static/*.html"]
 
 [tool.wheel]
 exclude = ["assets*", "benchmark*", "docs", "dist*", "playground*", "scripts*", "tests*"]
diff --git a/olah/__init__.py → src/olah/__init__.py b/olah/__init__.py → src/olah/__init__.py
diff --git a/olah/auth/__init__.py → src/olah/auth/__init__.py b/olah/auth/__init__.py → src/olah/auth/__init__.py
diff --git a/olah/cache/__init__.py → src/olah/cache/__init__.py b/olah/cache/__init__.py → src/olah/cache/__init__.py
diff --git a/olah/cache/bitset.py → src/olah/cache/bitset.py b/olah/cache/bitset.py → src/olah/cache/bitset.py
diff --git a/olah/cache/olah_cache.py → src/olah/cache/olah_cache.py b/olah/cache/olah_cache.py → src/olah/cache/olah_cache.py
diff --git a/olah/cache/stat.py → src/olah/cache/stat.py b/olah/cache/stat.py → src/olah/cache/stat.py
diff --git a/olah/configs.py → src/olah/configs.py b/olah/configs.py → src/olah/configs.py
diff --git a/olah/constants.py → src/olah/constants.py b/olah/constants.py → src/olah/constants.py
@@ -5,11 +5,15 @@
 # license that can be found in the LICENSE file or at
 # https://opensource.org/licenses/MIT.
 
+import os
+
+
 WORKER_API_TIMEOUT = 15
 CHUNK_SIZE = 4096
 LFS_FILE_BLOCK = 64 * 1024 * 1024
 
 DEFAULT_LOGGER_DIR = "./logs"
+OLAH_CODE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 ORIGINAL_LOC = "oriloc"
 

diff --git a/olah/database/__init__.py → src/olah/database/__init__.py b/olah/database/__init__.py → src/olah/database/__init__.py
diff --git a/olah/database/models.py → src/olah/database/models.py b/olah/database/models.py → src/olah/database/models.py
diff --git a/olah/errors.py → src/olah/errors.py b/olah/errors.py → src/olah/errors.py
diff --git a/olah/mirror/__init__.py → src/olah/mirror/__init__.py b/olah/mirror/__init__.py → src/olah/mirror/__init__.py
diff --git a/olah/mirror/meta.py → src/olah/mirror/meta.py b/olah/mirror/meta.py → src/olah/mirror/meta.py
diff --git a/olah/mirror/repos.py → src/olah/mirror/repos.py b/olah/mirror/repos.py → src/olah/mirror/repos.py
diff --git a/olah/proxy/__init__.py → src/olah/proxy/__init__.py b/olah/proxy/__init__.py → src/olah/proxy/__init__.py
diff --git a/olah/proxy/commits.py → src/olah/proxy/commits.py b/olah/proxy/commits.py → src/olah/proxy/commits.py
diff --git a/olah/proxy/files.py → src/olah/proxy/files.py b/olah/proxy/files.py → src/olah/proxy/files.py
diff --git a/olah/proxy/lfs.py → src/olah/proxy/lfs.py b/olah/proxy/lfs.py → src/olah/proxy/lfs.py
diff --git a/olah/proxy/meta.py → src/olah/proxy/meta.py b/olah/proxy/meta.py → src/olah/proxy/meta.py
diff --git a/olah/proxy/pathsinfo.py → src/olah/proxy/pathsinfo.py b/olah/proxy/pathsinfo.py → src/olah/proxy/pathsinfo.py
diff --git a/olah/proxy/tree.py → src/olah/proxy/tree.py b/olah/proxy/tree.py → src/olah/proxy/tree.py
diff --git a/olah/server.py → src/olah/server.py b/olah/server.py → src/olah/server.py
@@ -65,7 +65,7 @@
     get_newest_commit_hf,
     parse_org_repo,
 )
-from olah.constants import REPO_TYPES_MAPPING
+from olah.constants import OLAH_CODE_DIR, REPO_TYPES_MAPPING
 from olah.utils.logging import build_logger
 
 logger = None
@@ -164,7 +164,7 @@ async def lifespan(app: FastAPI):
 # ======================
 code_file_path = os.path.abspath(__file__)
 app = FastAPI(lifespan=lifespan, debug=False)
-templates = Jinja2Templates(directory=os.path.join(os.path.dirname(code_file_path), "..", "static"))
+templates = Jinja2Templates(directory=os.path.join(OLAH_CODE_DIR, "static"))
 
 
 class AppSettings(BaseSettings):

diff --git a/static/index.html → src/olah/static/index.html b/static/index.html → src/olah/static/index.html
diff --git a/static/repos.html → src/olah/static/repos.html b/static/repos.html → src/olah/static/repos.html
diff --git a/olah/utils/__init__.py → src/olah/utils/__init__.py b/olah/utils/__init__.py → src/olah/utils/__init__.py
diff --git a/olah/utils/cache_utils.py → src/olah/utils/cache_utils.py b/olah/utils/cache_utils.py → src/olah/utils/cache_utils.py
diff --git a/olah/utils/disk_utils.py → src/olah/utils/disk_utils.py b/olah/utils/disk_utils.py → src/olah/utils/disk_utils.py
diff --git a/olah/utils/file_utils.py → src/olah/utils/file_utils.py b/olah/utils/file_utils.py → src/olah/utils/file_utils.py
diff --git a/olah/utils/logging.py → src/olah/utils/logging.py b/olah/utils/logging.py → src/olah/utils/logging.py
diff --git a/olah/utils/olah_utils.py → src/olah/utils/olah_utils.py b/olah/utils/olah_utils.py → src/olah/utils/olah_utils.py
diff --git a/olah/utils/repo_utils.py → src/olah/utils/repo_utils.py b/olah/utils/repo_utils.py → src/olah/utils/repo_utils.py
diff --git a/olah/utils/rule_utils.py → src/olah/utils/rule_utils.py b/olah/utils/rule_utils.py → src/olah/utils/rule_utils.py
diff --git a/olah/utils/url_utils.py → src/olah/utils/url_utils.py b/olah/utils/url_utils.py → src/olah/utils/url_utils.py
diff --git a/olah/utils/zip_utils.py → src/olah/utils/zip_utils.py b/olah/utils/zip_utils.py → src/olah/utils/zip_utils.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,4 +163,9 @@ cython_debug/ @@
     /model_dir/
     /dataset_dir/
     /repos/
-    /logs/
+    /logs/
+    *.key
+    *.csr
+    *.pem
+    *.crt