Skip to content

Commit ada7652

Browse files
Renamed asap-sketch-ingest to asap-summary-ingest (#208)
* Added Cargo.lock * Renamed folder * Updated CI * Updated CI
1 parent a9fc460 commit ada7652

77 files changed

Lines changed: 51 additions & 51 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/docker.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
paths:
1010
- 'asap-common/installation/**'
1111
- 'asap-planner/**'
12-
- 'asap-sketch-ingest/**'
12+
- 'asap-summary-ingest/**'
1313
- 'asap-query-engine/**'
1414
- 'asap-tools/queriers/prometheus-client/**'
1515
- '.github/workflows/docker.yml'
@@ -68,21 +68,21 @@ jobs:
6868
docker push ghcr.io/projectasap/asap-planner:${{ github.ref_name }}
6969
docker push ghcr.io/projectasap/asap-planner:latest
7070
71-
# --- Sketch Ingest (Python, depends on base) ---
72-
- name: Build sketch-ingest image
71+
# --- Summary Ingest (Python, depends on base) ---
72+
- name: Build summary-ingest image
7373
run: |
7474
docker build \
75-
-t asap-sketch-ingest:local \
76-
-f asap-sketch-ingest/Dockerfile \
77-
asap-sketch-ingest
75+
-t asap-summary-ingest:local \
76+
-f asap-summary-ingest/Dockerfile \
77+
asap-summary-ingest
7878
79-
- name: Push sketch-ingest image
79+
- name: Push summary-ingest image
8080
if: startsWith(github.ref, 'refs/tags/')
8181
run: |
82-
docker tag asap-sketch-ingest:local ghcr.io/projectasap/asap-sketch-ingest:${{ github.ref_name }}
83-
docker tag asap-sketch-ingest:local ghcr.io/projectasap/asap-sketch-ingest:latest
84-
docker push ghcr.io/projectasap/asap-sketch-ingest:${{ github.ref_name }}
85-
docker push ghcr.io/projectasap/asap-sketch-ingest:latest
82+
docker tag asap-summary-ingest:local ghcr.io/projectasap/asap-summary-ingest:${{ github.ref_name }}
83+
docker tag asap-summary-ingest:local ghcr.io/projectasap/asap-summary-ingest:latest
84+
docker push ghcr.io/projectasap/asap-summary-ingest:${{ github.ref_name }}
85+
docker push ghcr.io/projectasap/asap-summary-ingest:latest
8686
8787
# --- Prometheus Client (Python, depends on base) ---
8888
- name: Build prometheus-client image

‎.github/workflows/python.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
paths:
7-
- 'asap-sketch-ingest/**'
7+
- 'asap-summary-ingest/**'
88
- 'asap-tools/queriers/prometheus-client/**'
99
- 'asap-planner/**'
1010
- 'asap-tools/**'
@@ -15,7 +15,7 @@ on:
1515
pull_request:
1616
branches: [ main ]
1717
paths:
18-
- 'asap-sketch-ingest/**'
18+
- 'asap-summary-ingest/**'
1919
- 'asap-tools/queriers/prometheus-client/**'
2020
- 'asap-planner/**'
2121
- 'asap-tools/**'
@@ -33,7 +33,7 @@ jobs:
3333
detect-changes:
3434
runs-on: ubuntu-latest
3535
outputs:
36-
arroyo_sketch: ${{ steps.filter.outputs.arroyo_sketch }}
36+
summary_ingest: ${{ steps.filter.outputs.summary_ingest }}
3737
prometheus_client: ${{ steps.filter.outputs.prometheus_client }}
3838
controller: ${{ steps.filter.outputs.controller }}
3939
utilities: ${{ steps.filter.outputs.utilities }}
@@ -45,8 +45,8 @@ jobs:
4545
id: filter
4646
with:
4747
filters: |
48-
arroyo_sketch:
49-
- 'asap-sketch-ingest/**'
48+
summary_ingest:
49+
- 'asap-summary-ingest/**'
5050
- 'asap-common/dependencies/py/**'
5151
prometheus_client:
5252
- 'asap-tools/queriers/prometheus-client/**'
@@ -64,9 +64,9 @@ jobs:
6464
- 'asap-tools/execution-utilities/**'
6565
- 'asap-common/dependencies/py/**'
6666
67-
test-arroyo-sketch:
67+
test-summary-ingest:
6868
needs: detect-changes
69-
if: needs.detect-changes.outputs.arroyo_sketch == 'true'
69+
if: needs.detect-changes.outputs.summary_ingest == 'true'
7070
runs-on: ubuntu-latest
7171
strategy:
7272
matrix:
@@ -81,12 +81,12 @@ jobs:
8181
run: |
8282
python -m pip install --upgrade pip
8383
pip install black==24.8.0 flake8==6.1.0
84-
if [ -f asap-sketch-ingest/requirements.txt ]; then pip install -r asap-sketch-ingest/requirements.txt; fi
84+
if [ -f asap-summary-ingest/requirements.txt ]; then pip install -r asap-summary-ingest/requirements.txt; fi
8585
- name: Check formatting with Black
86-
working-directory: asap-sketch-ingest
86+
working-directory: asap-summary-ingest
8787
run: black --check --diff .
8888
- name: Lint with flake8
89-
working-directory: asap-sketch-ingest
89+
working-directory: asap-summary-ingest
9090
run: |
9191
# Stop the build if there are Python syntax errors or undefined names
9292
flake8 . --config=../.flake8 --count --select=E9,F63,F7,F82 --show-source --statistics

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
hooks:
1818
- id: hadolint-docker
1919
files: ^.*Dockerfile.*$
20-
args: ['--ignore', 'DL3008']
20+
args: ['--ignore', 'DL3007', '--ignore', 'DL3008', '--ignore', 'DL3013']
2121

2222
# Shell script linting
2323
- repo: https://github.com/shellcheck-py/shellcheck-py

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎asap-quickstart/README.md‎

Lines changed: 1 addition & 1 deletion

‎asap-quickstart/config/controller-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SketchDB Configuration for Pattern-based Demo
1+
# ASAP Configuration for Pattern-based Demo
22
# Uses deterministic time-based patterns for visual comparison
33

44
query_groups:

‎asap-quickstart/docker-compose.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ services:
137137
timeout: 5s
138138
retries: 5
139139
depends_on:
140-
asap-sketch-ingest:
140+
asap-summary-ingest:
141141
condition: service_completed_successfully
142142
restart: no
143143

@@ -187,10 +187,10 @@ services:
187187
- asap-planner-output:/asap-planner-output
188188
restart: "no"
189189

190-
asap-sketch-ingest:
190+
asap-summary-ingest:
191191
image: ghcr.io/projectasap/asap-arroyosketch:v0.1.0
192-
container_name: asap-sketch-ingest
193-
hostname: asap-sketch-ingest
192+
container_name: asap-summary-ingest
193+
hostname: asap-summary-ingest
194194
networks:
195195
- asap-network
196196
command:
@@ -203,12 +203,12 @@ services:
203203
- "--output_kafka_topic=flink_output"
204204
- "--output_format=json"
205205
- "--pipeline_name=asap-demo"
206-
- "--output_dir=/asap-sketch-ingest-output"
206+
- "--output_dir=/asap-summary-ingest-output"
207207
- "--arroyo_url=http://arroyo:5115/api/v1"
208208
- "--bootstrap_servers=kafka:9092"
209209
volumes:
210210
- asap-planner-output:/asap-planner-output:ro
211-
- ./output/asap-sketch-ingest:/asap-sketch-ingest-output
211+
- ./output/asap-summary-ingest:/asap-summary-ingest-output
212212
depends_on:
213213
asap-planner:
214214
condition: service_completed_successfully
@@ -251,7 +251,7 @@ services:
251251
- "--decompress-json"
252252
- "--forward-unsupported-queries"
253253
depends_on:
254-
asap-sketch-ingest:
254+
asap-summary-ingest:
255255
condition: service_completed_successfully
256256
kafka:
257257
condition: service_healthy

0 commit comments

Comments
 (0)