Skip to content

Commit f75ff8e

Browse files
committed
manifest_runner -> manifest_server
1 parent 6d54a61 commit f75ff8e

File tree

37 files changed

+173
-167
lines changed

37 files changed

+173
-167
lines changed

.github/workflows/docker-build-check.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
tags: airbyte/source-declarative-manifest:pr-${{ github.event.pull_request.number }}
4646
outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=SDM Docker image for PR ${{ github.event.pull_request.number }}
4747

48-
manifest-runner-docker-build-check:
49-
name: Manifest Runner Docker Image Build
48+
manifest-server-docker-build-check:
49+
name: Manifest Server Docker Image Build
5050
runs-on: ubuntu-24.04
5151
steps:
5252
- name: Checkout code
@@ -60,13 +60,13 @@ jobs:
6060
- name: Set up Docker Buildx
6161
uses: docker/setup-buildx-action@v3
6262

63-
- name: Build Manifest Runner Docker image for multiple platforms
64-
id: manifest-runner-build
63+
- name: Build Manifest Server Docker image for multiple platforms
64+
id: manifest-server-build
6565
uses: docker/build-push-action@v5
6666
with:
6767
context: .
68-
file: airbyte_cdk/manifest_runner/Dockerfile
68+
file: airbyte_cdk/manifest_server/Dockerfile
6969
platforms: linux/amd64,linux/arm64
7070
push: false
71-
tags: airbyte/manifest-runner:pr-${{ github.event.pull_request.number }}
72-
outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Manifest Runner Docker image for PR ${{ github.event.pull_request.number }}
71+
tags: airbyte/manifest-server:pr-${{ github.event.pull_request.number }}
72+
outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Manifest Server Docker image for PR ${{ github.event.pull_request.number }}

.github/workflows/pypi_publish.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ on:
3131
type: boolean
3232
required: true
3333
default: true
34-
publish_manifest_runner:
35-
description: "Publish Manifest Runner to DockerHub. If true, the workflow will publish the Manifest Runner to DockerHub."
34+
publish_manifest_server:
35+
description: "Publish Manifest Server to DockerHub. If true, the workflow will publish the Manifest Server to DockerHub."
3636
type: boolean
3737
required: true
3838
default: true
@@ -255,19 +255,19 @@ jobs:
255255
tags: |
256256
airbyte/source-declarative-manifest:latest
257257
258-
publish_manifest_runner:
259-
name: Publish Manifest Runner to DockerHub
258+
publish_manifest_server:
259+
name: Publish Manifest Server to DockerHub
260260
if: >
261261
(github.event_name == 'push' &&
262262
startsWith(github.ref, 'refs/tags/v')) ||
263263
(github.event_name == 'workflow_dispatch' &&
264-
github.event.inputs.publish_manifest_runner == 'true'
264+
github.event.inputs.publish_manifest_server == 'true'
265265
)
266266
runs-on: ubuntu-24.04
267267
needs: [build]
268268
environment:
269269
name: DockerHub
270-
url: https://hub.docker.com/r/airbyte/manifest-runner/tags
270+
url: https://hub.docker.com/r/airbyte/manifest-server/tags
271271
env:
272272
VERSION: ${{ needs.build.outputs.VERSION }}
273273
IS_PRERELEASE: ${{ needs.build.outputs.IS_PRERELEASE }}
@@ -299,7 +299,7 @@ jobs:
299299
- name: "Check for existing tag (version: ${{ env.VERSION || 'none' }} )"
300300
if: env.VERSION != ''
301301
run: |
302-
tag="airbyte/manifest-runner:${{ env.VERSION }}"
302+
tag="airbyte/manifest-server:${{ env.VERSION }}"
303303
if [ -z "$tag" ]; then
304304
echo "Error: VERSION is not set. Ensure the tag follows the format 'refs/tags/vX.Y.Z'."
305305
exit 1
@@ -317,35 +317,35 @@ jobs:
317317
uses: docker/build-push-action@v5
318318
with:
319319
context: .
320-
file: airbyte_cdk/manifest_runner/Dockerfile
320+
file: airbyte_cdk/manifest_server/Dockerfile
321321
platforms: linux/amd64,linux/arm64
322322
push: true
323323
tags: |
324-
airbyte/manifest-runner:${{ github.sha }}
324+
airbyte/manifest-server:${{ github.sha }}
325325
326326
- name: "Build and push (version tag: ${{ env.VERSION || 'none'}})"
327327
# Only run if the version is set
328328
if: env.VERSION != ''
329329
uses: docker/build-push-action@v5
330330
with:
331331
context: .
332-
file: airbyte_cdk/manifest_runner/Dockerfile
332+
file: airbyte_cdk/manifest_server/Dockerfile
333333
platforms: linux/amd64,linux/arm64
334334
push: true
335335
tags: |
336-
airbyte/manifest-runner:${{ env.VERSION }}
336+
airbyte/manifest-server:${{ env.VERSION }}
337337
338338
- name: Build and push ('latest' tag)
339339
# Only run if version is set and IS_PRERELEASE is false
340340
if: env.VERSION != '' && env.IS_PRERELEASE == 'false'
341341
uses: docker/build-push-action@v5
342342
with:
343343
context: .
344-
file: airbyte_cdk/manifest_runner/Dockerfile
344+
file: airbyte_cdk/manifest_server/Dockerfile
345345
platforms: linux/amd64,linux/arm64
346346
push: true
347347
tags: |
348-
airbyte/manifest-runner:latest
348+
airbyte/manifest-server:latest
349349
350350
update-connector-builder:
351351
# Create a PR against the Builder, to update the CDK version that it uses.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
2-
"""The `airbyte-cdk.cli.manifest_runner` module provides a standalone CLI for the Airbyte CDK Manifest Runner.
2+
"""The `airbyte-cdk.cli.manifest_server` module provides a standalone CLI for the Airbyte CDK Manifest Server.
33
44
This CLI enables running a FastAPI server for managing and executing Airbyte declarative manifests.
55
"""

airbyte_cdk/cli/manifest_runner/_common.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
2-
"""Common utilities for manifest runner CLI commands."""
2+
"""Common utilities for manifest server CLI commands."""
33

44
import sys
55

@@ -15,14 +15,14 @@
1515
FASTAPI_AVAILABLE = False
1616

1717

18-
def check_manifest_runner_dependencies() -> None:
19-
"""Check if manifest-runner dependencies are installed."""
18+
def check_manifest_server_dependencies() -> None:
19+
"""Check if manifest-server dependencies are installed."""
2020
if not FASTAPI_AVAILABLE:
2121
click.echo(
2222
"❌ Manifest runner dependencies not found. Please install with:\n\n"
23-
" pip install airbyte-cdk[manifest-runner]\n"
23+
" pip install airbyte-cdk[manifest-server]\n"
2424
" # or\n"
25-
" poetry install --extras manifest-runner\n",
25+
" poetry install --extras manifest-server\n",
2626
err=True,
2727
)
2828
sys.exit(1)

airbyte_cdk/cli/manifest_runner/_info.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
2-
"""Info command for the manifest runner CLI."""
2+
"""Info command for the manifest server CLI."""
33

44
from typing import Any, Optional
55

@@ -20,11 +20,11 @@
2020

2121
@click.command()
2222
def info() -> None:
23-
"""Show manifest runner information and status."""
23+
"""Show manifest server information and status."""
2424
if FASTAPI_AVAILABLE and fastapi is not None and uvicorn is not None:
2525
click.echo("✅ Manifest runner dependencies are installed")
2626
click.echo(f" FastAPI version: {fastapi.__version__}")
2727
click.echo(f" Uvicorn version: {uvicorn.__version__}")
2828
else:
2929
click.echo("❌ Manifest runner dependencies not installed")
30-
click.echo(" Install with: pip install airbyte-cdk[manifest-runner]")
30+
click.echo(" Install with: pip install airbyte-cdk[manifest-server]")

airbyte_cdk/cli/manifest_runner/_openapi.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
2-
"""Generate OpenAPI command for the manifest runner CLI."""
2+
"""Generate OpenAPI command for the manifest server CLI."""
33

44
from pathlib import Path
55

66
import rich_click as click
77
from yaml import dump
88

9-
from ._common import check_manifest_runner_dependencies
9+
from ._common import check_manifest_server_dependencies
1010

1111

1212
@click.command("generate-openapi")
1313
@click.option(
1414
"--output",
1515
"-o",
16-
default="airbyte_cdk/manifest_runner/openapi.yaml",
16+
default="airbyte_cdk/manifest_server/openapi.yaml",
1717
help="Output path for the OpenAPI YAML file",
1818
show_default=True,
1919
)
2020
def generate_openapi(output: str) -> None:
21-
"""Generate OpenAPI YAML specification for the manifest runner."""
22-
check_manifest_runner_dependencies()
21+
"""Generate OpenAPI YAML specification for the manifest server."""
22+
check_manifest_server_dependencies()
2323

2424
# Import the FastAPI app
25-
from airbyte_cdk.manifest_runner.app import app
25+
from airbyte_cdk.manifest_server.app import app
2626

2727
# Get OpenAPI schema
2828
openapi_schema = app.openapi()
@@ -34,7 +34,7 @@ def generate_openapi(output: str) -> None:
3434
# Write YAML file with header comment
3535
with open(output_path, "w") as f:
3636
f.write("# This file is auto-generated. Do not edit manually.\n")
37-
f.write("# To regenerate, run: manifest-runner generate-openapi\n")
37+
f.write("# To regenerate, run: manifest-server generate-openapi\n")
3838
f.write("\n")
3939
dump(openapi_schema, f, default_flow_style=False, sort_keys=False)
4040

airbyte_cdk/cli/manifest_runner/_run.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
2-
"""Standalone CLI for the Airbyte CDK Manifest Runner.
2+
"""Standalone CLI for the Airbyte CDK Manifest Server.
33
4-
This CLI provides commands for running and managing the manifest runner server.
4+
This CLI provides commands for running and managing the manifest server server.
55
66
**Installation:**
77
8-
To use the manifest-runner functionality, install the CDK with the manifest-runner extra:
8+
To use the manifest-server functionality, install the CDK with the manifest-server extra:
99
1010
```bash
11-
pip install airbyte-cdk[manifest-runner]
11+
pip install airbyte-cdk[manifest-server]
1212
# or
13-
poetry install --extras manifest-runner
13+
poetry install --extras manifest-server
1414
```
1515
1616
**Usage:**
1717
1818
```bash
19-
manifest-runner start --port 8000
20-
manifest-runner info
21-
manifest-runner --help
19+
manifest-server start --port 8000
20+
manifest-server info
21+
manifest-server --help
2222
```
2323
"""
2424

@@ -37,7 +37,7 @@
3737
def cli(
3838
ctx: click.Context,
3939
) -> None:
40-
"""Airbyte Manifest Runner CLI."""
40+
"""Airbyte Manifest Server CLI."""
4141

4242
if ctx.invoked_subcommand is None:
4343
# If no subcommand is provided, show the help message.
@@ -51,7 +51,7 @@ def cli(
5151

5252

5353
def run() -> None:
54-
"""Entry point for the manifest-runner CLI."""
54+
"""Entry point for the manifest-server CLI."""
5555
cli()
5656

5757

airbyte_cdk/cli/manifest_runner/_start.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
2-
"""Start command for the manifest runner CLI."""
2+
"""Start command for the manifest server CLI."""
33

44
import rich_click as click
55

6-
from ._common import check_manifest_runner_dependencies
6+
from ._common import check_manifest_server_dependencies
77

88

99
@click.command()
@@ -25,11 +25,11 @@
2525
help="Enable auto-reload for development",
2626
)
2727
def start(host: str, port: int, reload: bool) -> None:
28-
"""Start the FastAPI manifest runner server."""
29-
check_manifest_runner_dependencies()
28+
"""Start the FastAPI manifest server server."""
29+
check_manifest_server_dependencies()
3030

3131
# Import and use the main server function
32-
from airbyte_cdk.manifest_runner.main import run_server
32+
from airbyte_cdk.manifest_server.main import run_server
3333

3434
run_server(
3535
host=host,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COPY pyproject.toml poetry.lock ./
1818
# Install dependencies directly to system Python
1919
RUN --mount=type=cache,target=$POETRY_CACHE_DIR \
2020
poetry config virtualenvs.create false && \
21-
poetry install --extras manifest-runner --no-root
21+
poetry install --extras manifest-server --no-root
2222

2323
# Copy the project source code (including .git for dynamic versioning)
2424
COPY . /app
@@ -35,4 +35,4 @@ USER airbyte:airbyte
3535

3636
EXPOSE 8080
3737

38-
CMD ["uvicorn", "airbyte_cdk.manifest_runner.app:app", "--host", "0.0.0.0", "--port", "8080"]
38+
CMD ["uvicorn", "airbyte_cdk.manifest_server.app:app", "--host", "0.0.0.0", "--port", "8080"]

0 commit comments

Comments
 (0)