moved from rye to uv && vllm upgraded

ilkersigirci · Sep 10, 2024 · d47b5ba · d47b5ba
1 parent 27b7dbc
commit d47b5ba
Show file tree

Hide file tree

Showing 23 changed files with 3,287 additions and 807 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ SHELL=/bin/bash
 
 LIBRARY_BASE_PATH=/workspace/runpod-playground
 PYTHON=python
-DEPLOYED_MODEL_NAME=alpindale/WizardLM-2-8x22B
+DEPLOYED_MODEL_NAME=alpindale/c4ai-command-r-plus-GPTQ
 MAX_CONTEXT_LEN=32000
 
 .PHONY: help install
@@ -26,16 +26,13 @@ python-info: ## List information about the python environment
 	@which ${PYTHON}
 	@${PYTHON} --version
 
-update-pip:
-	${PYTHON} -m pip install -U pip
-
-install-rye: ## Install rye
-	! command -v rye &> /dev/null && curl -sSf https://rye.astral.sh/get | RYE_NO_AUTO_INSTALL=1 RYE_INSTALL_OPTION="--yes" bash
-	echo 'source "$$HOME/.rye/env"' >> ~/.bashrc
+install-uv:
+	! command -v uv &> /dev/null && curl -LsSf https://astral.sh/uv/install.sh | sh
+	# echo '. "$$HOME/.cargo/env"' >> ~/.bashrc
 
 install: ## Installs the development version of the package
-	$(MAKE) install-rye
-	rye sync --no-lock
+	$(MAKE) install-uv
+	uv sync --frozen
 
 change-model-env: ## Change the model that is specified in the .env file
 	# sed -i 's/DEPLOYED_MODEL_NAME=alpindale\/WizardLM-2-8x22B/DEPLOYED_MODEL_NAME=CohereForAI\/c4ai-command-r-v01/g' .env

diff --git a/tabbyAPI/config.yml → configs/tabbyAPI/config.yml b/tabbyAPI/config.yml → configs/tabbyAPI/config.yml
diff --git a/tabbyAPI/sample_overrides.yml → configs/tabbyAPI/sample_overrides.yml b/tabbyAPI/sample_overrides.yml → configs/tabbyAPI/sample_overrides.yml
diff --git a/tabbyAPI/prompt_templates/0_alpaca.jinja → prompt_templates/0_alpaca.jinja b/tabbyAPI/prompt_templates/0_alpaca.jinja → prompt_templates/0_alpaca.jinja
diff --git a/tabbyAPI/prompt_templates/0_chatml.jinja → prompt_templates/0_chatml.jinja b/tabbyAPI/prompt_templates/0_chatml.jinja → prompt_templates/0_chatml.jinja
diff --git a/...prompt_templates/chatml-alternative.jinja → prompt_templates/chatml-alternative.jinja b/...prompt_templates/chatml-alternative.jinja → prompt_templates/chatml-alternative.jinja
diff --git a/tabbyAPI/prompt_templates/codestral.jinja → prompt_templates/codestral.jinja b/tabbyAPI/prompt_templates/codestral.jinja → prompt_templates/codestral.jinja
diff --git a/...API/prompt_templates/codestral_gguf.jinja → prompt_templates/codestral_gguf.jinja b/...API/prompt_templates/codestral_gguf.jinja → prompt_templates/codestral_gguf.jinja
diff --git a/...I/prompt_templates/mistral-instruct.jinja → prompt_templates/mistral-instruct.jinja b/...I/prompt_templates/mistral-instruct.jinja → prompt_templates/mistral-instruct.jinja
diff --git a/...I/prompt_templates/mixtral-official.jinja → prompt_templates/mixtral-official.jinja b/...I/prompt_templates/mixtral-official.jinja → prompt_templates/mixtral-official.jinja
diff --git a/tabbyAPI/prompt_templates/mixtral.jinja → prompt_templates/mixtral.jinja b/tabbyAPI/prompt_templates/mixtral.jinja → prompt_templates/mixtral.jinja
diff --git a/tabbyAPI/prompt_templates/vicuna.jinja → prompt_templates/vicuna.jinja b/tabbyAPI/prompt_templates/vicuna.jinja → prompt_templates/vicuna.jinja
diff --git a/tabbyAPI/prompt_templates/zephyr.jinja → prompt_templates/zephyr.jinja b/tabbyAPI/prompt_templates/zephyr.jinja → prompt_templates/zephyr.jinja
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,38 +5,29 @@ description = "Runpod Playground"
 authors = [
     { name = "ilkersigirci", email = "[email protected]" }
 ]
+readme = "README.md"
+requires-python = ">= 3.11"
 dependencies = [
-    "python-dotenv>=1.0.1",
-    "runpod>=1.6.2",
-    "huggingface-hub>=0.24.0",
+    "accelerate>=0.34.2",
     "hf-transfer>=0.1.8",
+    "huggingface-hub[cli]",
+    "modelscope>=1.18.0",
+    "runpod>=0.24.6",
+    "vllm>=0.6.0",
 ]
-readme = "README.md"
-requires-python = ">= 3.11"
 
-[tool.rye]
-managed = true
-virtual = true
+[tool.uv]
 dev-dependencies = [
-    "ruff==0.6.2",
-    "ipykernel>=6.29.3",
-    "vllm>=0.5.5",
-    "setuptools>=73.0.1",
-    "modelscope>=1.17.1",
+    "ipykernel>=6.29.5",
+    "ruff>=0.6.4",
+    "setuptools>=74.1.2",
 ]
 
 [tool.ruff]
 target-version = "py311"
 line-length = 88
 respect-gitignore = true
 
-# extend-include = []
-
-extend-exclude = [
-    "docs",
-    "tests",
-]
-
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["E402", "F401"]
 # "*.ipynb" = ["E501"]  # disable line-too-long in notebooks