Updated project to use uv

Author: david-yz-liu

.github/workflows/test.yml

@@ -15,23 +15,17 @@ jobs:
         python-version: ["3.13"]
 
     steps:
-      - uses: actions/[email protected]
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/[email protected]
+      - name: Check out repository
+        uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Cache pip
-        uses: actions/[email protected]
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-          pip install -e .[dev]
+          enable-cache: true
+
+      - name: Sync dependencies
+        run: uv sync --locked --all-extras --dev
+
       - name: Run tests
-        run: |
-            pytest -vv
+        run: uv run pytest -vv

.python-version

@@ -0,0 +1 @@
+3.13

CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## [unreleased]
+
+- Modified project structure and configuration to use uv

pyproject.toml

@@ -1,17 +1,17 @@
-[build-system]
-requires = ["hatchling >= 1.26"]
-build-backend = "hatchling.build"
-
-
 [project]
 name = "markus_ai_server"
 version = "0.0.2"
 authors = [
+  { name="Rolland He" },
+  { name="Will Kukkamalla" },
+  { name="Donny Wong" },
+]
+maintainers = [
   { name="David Liu", email="[email protected]" },
 ]
-description = "A small server to control access to Ollama"
+description = "A small server to control access to local models for MarkUs autograding"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
@@ -26,7 +26,8 @@ dependencies = [
     "requests",
 ]
 
-[project.optional-dependencies]
+
+[dependency-groups]
 dev = [
     "pre-commit",
     "pytest",
@@ -36,6 +37,10 @@ dev = [
 Homepage = "https://github.com/MarkUsProject/markus-ai-server"
 Issues = "https://github.com/MarkUsProject/markus-ai-server/issues"
 
+[build-system]
+requires = ["uv_build >= 0.9.17, <0.10.0"]
+build-backend = "uv_build"
+
 [tool.black]
 line-length = 120
 skip-string-normalization = true

markus_ai_server/__init__.py src/markus_ai_server/__init__.pymarkus_ai_server/__init__.py renamed to src/markus_ai_server/__init__.py

@@ -78,9 +78,7 @@ def chat_with_llama_server_http(
         if 'stream' not in payload:
             payload['stream'] = False
 
-        start_log_data = {
-            'model': model
-        }
+        start_log_data = {'model': model}
         logger.info(f'chat_with_llama_server_http starting: {start_log_data}')
         response = requests.post(
             f'{LLAMA_SERVER_URL}/v1/chat/completions',
@@ -89,10 +87,7 @@ def chat_with_llama_server_http(
             timeout=timeout,
         )
 
-        done_log_data = {
-            'model': model,
-            'response_status_code': response.status_code
-        }
+        done_log_data = {'model': model, 'response_status_code': response.status_code}
         logger.info(f'chat_with_llama_server_http done: {start_log_data}')
         if response.status_code == 200:
             data = response.json()
@@ -132,9 +127,7 @@ def chat_with_ollama(
     """Handle chat using ollama."""
     messages = _build_messages(content, system_prompt, image_files)
 
-    start_log_data = {
-        'model': model
-    }
+    start_log_data = {'model': model}
     logger.info(f'chat_with_ollama starting: {start_log_data}')
     response = ollama.chat(
         model=model,
@@ -148,7 +141,7 @@ def chat_with_ollama(
         'eval_duration': response.eval_duration,
         'prompt_eval_duration': response.prompt_eval_duration,
         'eval_count': response.eval_count,
-        'prompt_eval_count': response.prompt_eval_count
+        'prompt_eval_count': response.prompt_eval_count,
     }
 
     logger.info(f'chat_with_ollama done: {done_log_data}')
@@ -187,9 +180,7 @@ def chat_with_llamacpp(
         pass  # TODO: pass image files
 
     try:
-        start_log_data = {
-            'model': model
-        }
+        start_log_data = {'model': model}
         logger.info(f'chat_with_llamacpp starting: {start_log_data}')
         result = subprocess.run(cmd, capture_output=True, text=False, timeout=timeout, check=True)
         logger.info(f'chat_with_llamacpp done: {start_log_data}')