Re-organized repo

.github/workflows/docker.yml

@@ -4,16 +4,16 @@ on:
   push:
     branches: [ main ]
     paths:
-      - 'CommonDependencies/installation/**'
-      - 'Controller/**'
-      - 'PrometheusClient/**'
+      - 'asap-common/installation/**'
+      - 'asap-planner/**'
+      - 'asap-tools/prometheus-client/**'
       - '.github/workflows/docker.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'CommonDependencies/installation/**'
-      - 'Controller/**'
-      - 'PrometheusClient/**'
+      - 'asap-common/installation/**'
+      - 'asap-planner/**'
+      - 'asap-tools/prometheus-client/**'
       - '.github/workflows/docker.yml'
   workflow_dispatch:
 
@@ -28,7 +28,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build base image
-        working-directory: CommonDependencies/installation
+        working-directory: asap-common/installation
         run: |
           docker build \
             -t sketchdb-base:latest \
@@ -41,15 +41,15 @@ jobs:
           docker run --rm sketchdb-base:latest pip list
 
       - name: Build Controller Docker image
-        working-directory: Controller
+        working-directory: asap-planner
         run: |
           docker build \
             -t sketchdb-controller:latest \
             -f Dockerfile \
             .
 
       - name: Build PrometheusClient Docker image
-        working-directory: PrometheusClient
+        working-directory: asap-tools/prometheus-client
         run: |
           docker build \
             -t sketchdb-prometheus-client:latest \

.github/workflows/python.yml

@@ -4,24 +4,24 @@ on:
   push:
     branches: [ main ]
     paths:
-      - 'ArroyoSketch/**'
-      - 'PrometheusClient/**'
-      - 'Controller/**'
-      - 'Utilities/**'
-      - 'PrometheusExporters/**'
-      - 'ExecutionUtilities/**'
-      - 'CommonDependencies/dependencies/py/**'
+      - 'asap-sketch-ingest/**'
+      - 'asap-tools/prometheus-client/**'
+      - 'asap-planner/**'
+      - 'asap-tools/**'
+      - 'asap-tools/prometheus-exporters/**'
+      - 'asap-tools/execution-utilities/**'
+      - 'asap-common/dependencies/py/**'
       - '.github/workflows/python.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'ArroyoSketch/**'
-      - 'PrometheusClient/**'
-      - 'Controller/**'
-      - 'Utilities/**'
-      - 'PrometheusExporters/**'
-      - 'ExecutionUtilities/**'
-      - 'CommonDependencies/dependencies/py/**'
+      - 'asap-sketch-ingest/**'
+      - 'asap-tools/prometheus-client/**'
+      - 'asap-planner/**'
+      - 'asap-tools/**'
+      - 'asap-tools/prometheus-exporters/**'
+      - 'asap-tools/execution-utilities/**'
+      - 'asap-common/dependencies/py/**'
       - '.github/workflows/python.yml'
   workflow_dispatch:
 
@@ -46,23 +46,23 @@ jobs:
         with:
           filters: |
             arroyo_sketch:
-              - 'ArroyoSketch/**'
-              - 'CommonDependencies/dependencies/py/**'
+              - 'asap-sketch-ingest/**'
+              - 'asap-common/dependencies/py/**'
             prometheus_client:
-              - 'PrometheusClient/**'
-              - 'CommonDependencies/dependencies/py/**'
+              - 'asap-tools/prometheus-client/**'
+              - 'asap-common/dependencies/py/**'
             controller:
-              - 'Controller/**'
-              - 'CommonDependencies/dependencies/py/**'
+              - 'asap-planner/**'
+              - 'asap-common/dependencies/py/**'
             utilities:
-              - 'Utilities/**'
-              - 'CommonDependencies/dependencies/py/**'
+              - 'asap-tools/**'
+              - 'asap-common/dependencies/py/**'
             prometheus_exporters:
-              - 'PrometheusExporters/**'
-              - 'CommonDependencies/dependencies/py/**'
+              - 'asap-tools/prometheus-exporters/**'
+              - 'asap-common/dependencies/py/**'
             execution_utilities:
-              - 'ExecutionUtilities/**'
-              - 'CommonDependencies/dependencies/py/**'
+              - 'asap-tools/execution-utilities/**'
+              - 'asap-common/dependencies/py/**'
 
   test-arroyo-sketch:
     needs: detect-changes
@@ -81,12 +81,12 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install black==24.8.0 flake8==6.1.0
-        if [ -f ArroyoSketch/requirements.txt ]; then pip install -r ArroyoSketch/requirements.txt; fi
+        if [ -f asap-sketch-ingest/requirements.txt ]; then pip install -r asap-sketch-ingest/requirements.txt; fi
     - name: Check formatting with Black
-      working-directory: ArroyoSketch
+      working-directory: asap-sketch-ingest
       run: black --check --diff .
     - name: Lint with flake8
-      working-directory: ArroyoSketch
+      working-directory: asap-sketch-ingest
       run: |
         # Stop the build if there are Python syntax errors or undefined names
         flake8 . --config=../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
@@ -110,19 +110,19 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install black==24.8.0 flake8==6.1.0 mypy types-requests types-PyYAML typing-extensions numpy prometheus-client urllib3
-        if [ -f PrometheusClient/requirements.txt ]; then pip install -r PrometheusClient/requirements.txt; fi
+        if [ -f asap-tools/prometheus-client/requirements.txt ]; then pip install -r asap-tools/prometheus-client/requirements.txt; fi
     - name: Check formatting with Black
-      working-directory: PrometheusClient
+      working-directory: asap-tools/prometheus-client
       run: black --check --diff .
     - name: Lint with flake8
-      working-directory: PrometheusClient
+      working-directory: asap-tools/prometheus-client
       run: |
         # Stop the build if there are Python syntax errors or undefined names
-        flake8 . --config=../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 . --config=../../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
         # Exit-zero treats all errors as warnings
-        flake8 . --config=../.flake8 --count --exit-zero --max-complexity=10 --statistics
+        flake8 . --config=../../.flake8 --count --exit-zero --max-complexity=10 --statistics
     - name: Type check with mypy
-      working-directory: PrometheusClient
+      working-directory: asap-tools/prometheus-client
       run: mypy .
 
   test-controller:
@@ -142,12 +142,12 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install black==24.8.0 flake8==6.1.0
-        if [ -f Controller/requirements.txt ]; then pip install -r Controller/requirements.txt; fi
+        if [ -f asap-planner/requirements.txt ]; then pip install -r asap-planner/requirements.txt; fi
     - name: Check formatting with Black
-      working-directory: Controller
+      working-directory: asap-planner
       run: black --check --diff .
     - name: Lint with flake8
-      working-directory: Controller
+      working-directory: asap-planner
       run: |
         # Stop the build if there are Python syntax errors or undefined names
         flake8 . --config=../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
@@ -171,12 +171,12 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install black==24.8.0 flake8==6.1.0
-        if [ -f Utilities/requirements.txt ]; then pip install -r Utilities/requirements.txt; fi
+        if [ -f asap-tools/requirements.txt ]; then pip install -r asap-tools/requirements.txt; fi
     - name: Check formatting with Black
-      working-directory: Utilities
+      working-directory: asap-tools
       run: black --check --diff .
     - name: Lint with flake8
-      working-directory: Utilities
+      working-directory: asap-tools
       run: |
         # Stop the build if there are Python syntax errors or undefined names
         flake8 . --config=../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
@@ -200,22 +200,22 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install black==24.8.0 flake8==6.1.0 mypy isort
-        if [ -f PrometheusExporters/requirements.txt ]; then pip install -r PrometheusExporters/requirements.txt; fi
+        if [ -f asap-tools/prometheus-exporters/requirements.txt ]; then pip install -r asap-tools/prometheus-exporters/requirements.txt; fi
     - name: Check formatting with Black
-      working-directory: PrometheusExporters
+      working-directory: asap-tools/prometheus-exporters
       run: black --check --diff .
     - name: Check import sorting with isort
-      working-directory: PrometheusExporters
+      working-directory: asap-tools/prometheus-exporters
       run: isort --check-only --diff --settings-file .isort.cfg .
     - name: Lint with flake8
-      working-directory: PrometheusExporters
+      working-directory: asap-tools/prometheus-exporters
       run: |
         # Stop the build if there are Python syntax errors or undefined names
-        flake8 . --config=../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 . --config=../../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
         # Exit-zero treats all errors as warnings
-        flake8 . --config=../.flake8 --count --exit-zero --max-complexity=10 --statistics
+        flake8 . --config=../../.flake8 --count --exit-zero --max-complexity=10 --statistics
     - name: Type check with mypy
-      working-directory: PrometheusExporters
+      working-directory: asap-tools/prometheus-exporters
       run: mypy . --config-file=.mypy.ini
 
   test-execution-utilities:
@@ -235,14 +235,14 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install black==24.8.0 flake8==6.1.0
-        if [ -f ExecutionUtilities/requirements.txt ]; then pip install -r ExecutionUtilities/requirements.txt; fi
+        if [ -f asap-tools/execution-utilities/requirements.txt ]; then pip install -r asap-tools/execution-utilities/requirements.txt; fi
     - name: Check formatting with Black
-      working-directory: ExecutionUtilities
+      working-directory: asap-tools/execution-utilities
       run: black --check --diff .
     - name: Lint with flake8
-      working-directory: ExecutionUtilities
+      working-directory: asap-tools/execution-utilities
       run: |
         # Stop the build if there are Python syntax errors or undefined names
-        flake8 . --config=../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 . --config=../../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
         # Exit-zero treats all errors as warnings
-        flake8 . --config=../.flake8 --count --exit-zero --max-complexity=10 --statistics
+        flake8 . --config=../../.flake8 --count --exit-zero --max-complexity=10 --statistics

.github/workflows/rust.yml

@@ -4,18 +4,18 @@ on:
   push:
     branches: [ main ]
     paths:
-      - 'QueryEngineRust/**'
-      - 'CommonDependencies/dependencies/rs/**'
-      - 'CommonDependencies/tests/**'
-      - 'sketch-core/**'
+      - 'asap-query-engine/**'
+      - 'asap-common/dependencies/rs/**'
+      - 'asap-common/tests/**'
+      - 'asap-common/sketch-core/**'
       - '.github/workflows/rust.yml'
   pull_request:
     branches: [ main ]
     paths:
-      - 'QueryEngineRust/**'
-      - 'CommonDependencies/dependencies/rs/**'
-      - 'CommonDependencies/tests/**'
-      - 'sketch-core/**'
+      - 'asap-query-engine/**'
+      - 'asap-common/dependencies/rs/**'
+      - 'asap-common/tests/**'
+      - 'asap-common/sketch-core/**'
       - '.github/workflows/rust.yml'
   workflow_dispatch:
 
@@ -49,30 +49,30 @@ jobs:
         path: |
           ~/.cargo/registry
           ~/.cargo/git
-          QueryEngineRust/target
+          asap-query-engine/target
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
     - name: Check formatting
       run: cargo fmt -- --check
-      working-directory: QueryEngineRust
+      working-directory: asap-query-engine
 
     - name: Check formatting (sketch_db_common)
       run: cargo fmt -- --check
-      working-directory: CommonDependencies/dependencies/rs/sketch_db_common
+      working-directory: asap-common/dependencies/rs/sketch_db_common
 
     - name: Run clippy
       run: cargo clippy --all-targets --all-features -- -D warnings
-      working-directory: QueryEngineRust
+      working-directory: asap-query-engine
       env:
         RUSTC_WRAPPER: sccache
 
     - name: Check formatting (sketch-core)
       run: cargo fmt -- --check
-      working-directory: sketch-core
+      working-directory: asap-common/sketch-core
 
     - name: Run clippy (sketch-core)
       run: cargo clippy --all-targets --all-features -- -D warnings
-      working-directory: sketch-core
+      working-directory: asap-common/sketch-core
       env:
         RUSTC_WRAPPER: sccache
 
@@ -101,33 +101,33 @@ jobs:
         path: |
           ~/.cargo/registry
           ~/.cargo/git
-          QueryEngineRust/target
+          asap-query-engine/target
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
     - name: Run QueryEngineRust tests
       run: cargo test
-      working-directory: QueryEngineRust
+      working-directory: asap-query-engine
       env:
         RUSTC_WRAPPER: sccache
 
     - name: Run sql_utilities tests
       run: cargo test
-      working-directory: CommonDependencies/dependencies/rs/sql_utilities
+      working-directory: asap-common/dependencies/rs/sql_utilities
       env:
         RUSTC_WRAPPER: sccache
 
     - name: Run promql_utilities tests
       run: cargo test
-      working-directory: CommonDependencies/dependencies/rs/promql_utilities
+      working-directory: asap-common/dependencies/rs/promql_utilities
       env:
         RUSTC_WRAPPER: sccache
 
     - name: Run sketch-core tests
       run: cargo test
-      working-directory: sketch-core
+      working-directory: asap-common/sketch-core
     - name: Run sketch_db_common tests
       run: cargo test
-      working-directory: CommonDependencies/dependencies/rs/sketch_db_common
+      working-directory: asap-common/dependencies/rs/sketch_db_common
       env:
         RUSTC_WRAPPER: sccache
 
@@ -144,7 +144,7 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Build Docker image
-      run: docker build -f QueryEngineRust/Dockerfile -t sketchdb-queryengine-rust:latest .
+      run: docker build -f asap-query-engine/Dockerfile -t sketchdb-queryengine-rust:latest .
     #   run: |
     #     echo "${{ secrets.PRIVATE_REPO_TOKEN }}" > /tmp/git_token
     #     docker build --secret id=git_token,src=/tmp/git_token -f QueryEngineRust/Dockerfile -t sketchdb-queryengine-rust:latest .