Merge pull request #109 from adf-python/develop

develop to main

Author: shima004

.github/workflows/ci.yaml

@@ -12,114 +12,89 @@ on:
 
 jobs:
   setup:
+    name: Setup
     runs-on: ubuntu-latest
+    outputs:
+      cache-hit: ${{ steps.setup_uv.outputs.cache-hit }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
+      - name: Install uv (+ enable cache)
+        id: setup_uv
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: 3.12
+          enable-cache: true
 
-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+      - name: Sync dependencies
+        run: uv sync --locked --dev
 
-      - name: Cache virtual environment
-        uses: actions/cache@v4
-        with:
-          path: .venv
-          key: ${{ runner.os }}-venv-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-venv-
-
-      - name: Install dependencies
-        run: |
-          python -m venv .venv
-          source .venv/bin/activate
-          pip install --upgrade pip
-          pip install poetry
-          poetry install
+      - name: Prune uv cache (optimized for CI)
+        run: uv cache prune --ci
 
   ruff-format:
+    name: ruff-format
     needs: setup
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Restore virtual environment cache
-        uses: actions/cache@v4
+      - name: Install uv + restore cache
+        uses: astral-sh/setup-uv@v6
         with:
-          path: .venv
-          key: ${{ runner.os }}-venv-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-venv-
-
-      - name: Check ruff version
-        run: |
-          source .venv/bin/activate
-          poetry run ruff --version
+          enable-cache: true
 
-      - name: Run ruff format check
-        run: |
-          source .venv/bin/activate
-          poetry run ruff format --check .
+      - name: Check ruff formatting
+        run: uv run ruff format --check .
 
   ruff-lint:
+    name: ruff-lint
     needs: setup
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Restore virtual environment cache
-        uses: actions/cache@v4
+      - name: Install uv + restore cache
+        uses: astral-sh/setup-uv@v6
         with:
-          path: .venv
-          key: ${{ runner.os }}-venv-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-venv-
-
-      - name: Set up Python environment
-        run: source .venv/bin/activate
-
-      - name: Check ruff version
-        run: |
-          source .venv/bin/activate
-          poetry run ruff --version
+          enable-cache: true
 
       - name: Run ruff lint
-        run: |
-          source .venv/bin/activate
-          poetry run ruff check --output-format=github .
+        run: uv run ruff check --output-format=github .
 
   mypy-type-check:
+    name: mypy-type-check
     needs: setup
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Restore virtual environment cache
-        uses: actions/cache@v4
+      - name: Install uv + restore cache
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+
+      - name: Run mypy
+        run: uv run --frozen mypy .
+
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          path: .venv
-          key: ${{ runner.os }}-venv-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-venv-
-
-      - name: Check mypy version
-        run: |
-          source .venv/bin/activate
-          poetry run mypy --version
-
-      - name: Run mypy type check
-        run: |
-          source .venv/bin/activate
-          poetry run mypy .
+          java-version: "17"
+          distribution: "temurin"
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Publish package
+        run: cd java && ./gradlew publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/document.yaml

@@ -0,0 +1,70 @@
+name: document
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - develop
+    paths:
+      - "docs/**"
+  pull_request:
+    branches:
+      - main
+      - develop
+    paths:
+      - "docs/**"
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+
+      - name: Cache virtual environment
+        id: cached-virtualenv
+        uses: actions/cache@v4
+        with:
+          path: .venv
+          key: ${{ runner.os }}-venv-${{ hashFiles('**/uv.lock') }}
+
+      - name: Install dependencies
+        if: steps.cached-virtualenv.outputs.cache-hit != 'true'
+        run: |
+          python -m venv .venv
+          source .venv/bin/activate
+          pip install --upgrade pip
+          pip install uv
+          uv sync
+
+      - name: Build documentation
+        run: |
+          source .venv/bin/activate
+          cd docs
+          python build.py
+
+      - name: Redirect to the en documentation
+        run: |
+          username=$(echo $GITHUB_REPOSITORY | cut -d '/' -f 1)
+          repository=$(echo $GITHUB_REPOSITORY | cut -d '/' -f 2)
+          echo '<meta http-equiv="refresh" content="0; url=https://'$username'.github.io/'$repository'/en" />' > ./docs/pages/index.html
+
+      - name: Deploy documentation
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/pages

.gitignore

@@ -159,7 +159,17 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 
 # ruff
 .ruff_cache/
+
+# vscode
+.vscode/
+
+# MacOS
+.DS_Store
+
+# ADF
+agent.log*
+!java/lib/src/main/java/adf_core_python/core/agent/precompute

.python-version

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

README.md

@@ -1,26 +1,41 @@
 # adf-core-python
 
+## Documentation
+
+[ADF Core Python Documentation](https://adf-python.github.io/adf-core-python/)
+
 ## Development Environment
 
 ### Prerequisites
 
-- Python (3.12 or higher)
-- Poetry (1.8.3 or higher)
+- Python (3.13 or higher)
+- uv (0.8.2 or higher)
 
 ### Installation
 
 ```bash
-poetry install
+uv sync
+```
+
+### Run Agent
+
+```bash
+uv run python ./adf_core_python/launcher.py
+
+# get help
+uv run python ./adf_core_python/launcher.py -h
 ```
 
 ### Build
 
 ```bash
-poetry build
+uv build
 ```
 
 ### Pre Commit
 
 ```bash
-poetry run task precommit
+uv run ruff format .
+uv run ruff check .
+uv run mypy .
 ```

adf_core_python/main.py

@@ -0,0 +1,3 @@
+{
+  "test": "test"
+}

config/development.json

@@ -0,0 +1,44 @@
+kernel:
+  host: localhost
+  port: 27931
+
+gateway:
+  host: localhost
+  port: 27941
+
+team:
+  name: AIT-Rescue
+
+adf:
+  launcher:
+    precompute: false
+  debug:
+    flag: false
+  agent:
+    moduleconfig:
+      filename: config/module.yaml
+    precompute:
+      dir_name: precompute
+
+  develop:
+    flag: true
+    filename: config/development.json
+
+  team:
+    platoon:
+      ambulance:
+        count: 100
+      fire:
+        count: 100
+      police:
+        count: 100
+    office:
+      ambulance:
+        count: 5
+      fire:
+        count: 5
+      police:
+        count: 5
+
+  gateway:
+    flag: false