Skip to content

Commit 536c4e6

Browse files
mattfmattf
committed
Merge main into reasoning-cleanup branch and resolve all conflicts
Take main version of auto-generated docs, provider implementations, and API definitions. Keep our new test additions and recording files. Remove the orphaned reasoning.py utility file and bedrock.py deleted by main. Reconcile test recording files.
2 parents ea42554 + bcce90b commit 536c4e6

4,438 files changed

Lines changed: 1919768 additions & 388051 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.

‎.coveragerc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[run]
22
omit =
33
*/tests/*
4-
*/llama_stack/providers/*
5-
*/llama_stack/templates/*
4+
*/ogx/providers/*
5+
*/ogx/templates/*
66
.venv/*
7-
*/llama_stack/cli/scripts/*
8-
*/llama_stack_ui/*
9-
*/llama_stack/distribution/ui/*
10-
*/llama_stack/strong_typing/*
11-
*/llama_stack/env.py
7+
*/ogx/cli/scripts/*
8+
*/ogx_ui/*
9+
*/ogx/distribution/ui/*
10+
*/ogx/strong_typing/*
11+
*/ogx/env.py
1212
*/__init__.py

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22

33
# These owners will be the default owners for everything in
44
# the repo. Unless a later match takes precedence,
5-
* @ashwinb @raghotham @ehhuang @leseb @bbrowning @mattf @franciscojavierarceo @cdoern
5+
* @ashwinb @raghotham @ehhuang @leseb @bbrowning @mattf @franciscojavierarceo @cdoern @skamenan7
6+
7+
# OpenAPI SDK generation and publishing
8+
/client-sdks/openapi/ @ashwinb @leseb @bbrowning
9+
/.github/workflows/openapi-generator-validation.yml @ashwinb @leseb @bbrowning

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
attributes:
77
value: >
88
#### Before submitting a bug, please make sure the issue hasn't been already addressed by searching through [the
9-
existing and past issues](https://github.com/meta-llama/llama-stack/issues).
9+
existing and past issues](https://github.com/ogx-ai/ogx/issues).
1010
1111
- type: textarea
1212
id: system-info
@@ -41,7 +41,7 @@ body:
4141
placeholder: |
4242
A clear and concise description of what the bug is.
4343
44-
```llama stack
44+
```ogx
4545
# Command that you used for running the examples
4646
```
4747
Description of the results

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ blank_issues_enabled: false
22

33
contact_links:
44
- name: Have you read the docs?
5-
url: https://llamastack.github.io/providers/external/index.html
5+
url: https://ogx-ai.github.io/docs
66
about: Much help can be found in the docs
7-
- name: Start a discussion
8-
url: https://github.com/llamastack/llama-stack/discussions/new/
9-
about: Start a discussion on a topic
10-
- name: Chat on Discord
11-
url: https://discord.gg/llama-stack
12-
about: Maybe chatting with the community can help
7+
- name: Join the Discord community
8+
url: https://discord.gg/bUYRqEvK6
9+
about: Ask questions and chat with the community

‎.github/ISSUE_TEMPLATE/feature-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 🚀 Feature request
2-
description: Request a new llama-stack feature
2+
description: Request a new ogx feature
33
labels: ["enhancement"]
44
body:
55
- type: textarea

‎.github/TRIAGERS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# This file documents Triage members in the Llama Stack community
1+
# This file documents Triage members in the OGX community

‎.github/actions/install-llama-stack-client/action.yml‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎.github/actions/install-ogx-client/action.yml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
name: Install ogx-client
2+
description: Install ogx-client based on branch context and client-version input
3+
4+
inputs:
5+
client-version:
6+
description: 'Client version to install on non-release branches (latest or published). Ignored on release branches.'
7+
required: false
8+
default: ""
9+
sdk_install_url:
10+
description: 'URL to install Python SDK from (for testing preview builds). If provided, overrides client-version.'
11+
required: false
12+
default: ""
13+
branch:
14+
description: 'Explicit branch override (used by scheduled CI to pass the matrix branch)'
15+
required: false
16+
default: ""
17+
18+
outputs:
19+
install-after-sync:
20+
description: 'Whether to install client after uv sync'
21+
value: ${{ steps.configure.outputs.install-after-sync }}
22+
install-source:
23+
description: 'Where to install client from after sync'
24+
value: ${{ steps.configure.outputs.install-source }}
25+
26+
runs:
27+
using: "composite"
28+
steps:
29+
- name: Configure client installation
30+
id: configure
31+
shell: bash
32+
run: |
33+
# If sdk_install_url is provided, use it directly
34+
if [ -n "${{ inputs.sdk_install_url }}" ]; then
35+
echo "Using provided sdk_install_url: ${{ inputs.sdk_install_url }}"
36+
echo "generate=false" >> $GITHUB_OUTPUT
37+
echo "install-after-sync=true" >> $GITHUB_OUTPUT
38+
echo "install-source=${{ inputs.sdk_install_url }}" >> $GITHUB_OUTPUT
39+
exit 0
40+
fi
41+
42+
# Determine the branch we're working with
43+
# Use explicit branch input if provided (for scheduled CI), otherwise detect from GitHub context
44+
if [ -n "${{ inputs.branch }}" ]; then
45+
BRANCH="${{ inputs.branch }}"
46+
else
47+
BRANCH="${{ github.base_ref || github.ref }}"
48+
BRANCH="${BRANCH#refs/heads/}"
49+
fi
50+
# Trim leading/trailing whitespace (git branch -r output includes padding)
51+
BRANCH="$(echo "$BRANCH" | xargs)"
52+
53+
echo "Working with branch: $BRANCH"
54+
55+
# The ogx-client Python SDK is generated in-repo from client-sdks/openapi.
56+
# On release branches and when client-version=latest, generate the SDK from
57+
# the current checkout so tests run against the client built from this source.
58+
# When client-version=published, use the version resolved by uv sync from PyPI.
59+
if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x$ ]]; then
60+
echo "Detected release branch: $BRANCH — generating client from checkout"
61+
echo "generate=true" >> $GITHUB_OUTPUT
62+
echo "install-after-sync=true" >> $GITHUB_OUTPUT
63+
echo "install-source=${{ github.workspace }}/client-sdks/openapi/sdks/python" >> $GITHUB_OUTPUT
64+
elif [ "${{ inputs.client-version }}" = "latest" ]; then
65+
echo "Generating client from checkout (client-version=latest)"
66+
echo "generate=true" >> $GITHUB_OUTPUT
67+
echo "install-after-sync=true" >> $GITHUB_OUTPUT
68+
echo "install-source=${{ github.workspace }}/client-sdks/openapi/sdks/python" >> $GITHUB_OUTPUT
69+
elif [ "${{ inputs.client-version }}" = "published" ]; then
70+
# Use published version from PyPI (installed by sync)
71+
echo "generate=false" >> $GITHUB_OUTPUT
72+
echo "install-after-sync=false" >> $GITHUB_OUTPUT
73+
elif [ -n "${{ inputs.client-version }}" ]; then
74+
echo "::error::Invalid client-version: ${{ inputs.client-version }}"
75+
exit 1
76+
else
77+
echo "generate=false" >> $GITHUB_OUTPUT
78+
fi
79+
80+
- name: Set up Java (SDK generation)
81+
if: steps.configure.outputs.generate == 'true'
82+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
83+
with:
84+
distribution: 'temurin'
85+
java-version: '11'
86+
87+
- name: Set up Node.js (SDK generation)
88+
if: steps.configure.outputs.generate == 'true'
89+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
90+
with:
91+
node-version: '20'
92+
93+
- name: Install openapi-generator-cli (SDK generation)
94+
if: steps.configure.outputs.generate == 'true'
95+
shell: bash
96+
run: npm install -g @openapitools/openapi-generator-cli
97+
98+
- name: Generate ogx-client SDK
99+
if: steps.configure.outputs.generate == 'true'
100+
shell: bash
101+
working-directory: client-sdks/openapi
102+
run: |
103+
echo "Generating ogx-client SDK (OPEN=0) from checkout..."
104+
make sdk OPEN=0
105+
106+
PY_FILE_COUNT=$(find sdks/python -name "*.py" | wc -l)
107+
echo "Generated Python files: $PY_FILE_COUNT"
108+
if [ "$PY_FILE_COUNT" -le 10 ]; then
109+
echo "::error::Too few Python files generated (expected > 10, got $PY_FILE_COUNT)"
110+
exit 1
111+
fi

‎.github/actions/launch-gpu-runner/action.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: 'Launch GPU EC2 Runner'
2+
description: 'Launch GPU-enabled EC2 instance as GitHub Actions self-hosted runner (wrapper for machulav/ec2-github-runner)'
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
mode:
8+
description: 'Mode: start or stop'
9+
required: true
10+
github-token:
11+
description: 'GitHub Personal Access Token with repo scope for runner registration'
12+
required: true
13+
instance-type:
14+
description: 'EC2 instance type (e.g., g6.2xlarge, g5.2xlarge, g6.8xlarge)'
15+
required: false
16+
default: 'g6.2xlarge'
17+
aws-region:
18+
description: 'AWS region'
19+
required: true
20+
availability-zones-config:
21+
description: 'JSON array of AZ configs with imageId, subnetId, securityGroupId for fallback'
22+
required: false
23+
default: ''
24+
# For stop mode
25+
label:
26+
description: 'Runner label (for stop mode)'
27+
required: false
28+
ec2-instance-id:
29+
description: 'EC2 instance ID (for stop mode)'
30+
required: false
31+
# Optional
32+
ec2-instance-tags:
33+
description: 'JSON array of tags to apply to EC2 instance'
34+
required: false
35+
default: '[]'
36+
runner-home-dir:
37+
description: 'Home directory for the runner'
38+
required: false
39+
default: ''
40+
iam-role-name:
41+
description: 'IAM role name to attach to the instance (optional, for enhanced security)'
42+
required: false
43+
default: ''
44+
45+
outputs:
46+
label:
47+
description: 'Unique label for the launched runner'
48+
value: ${{ steps.ec2-runner.outputs.label }}
49+
ec2-instance-id:
50+
description: 'EC2 instance ID'
51+
value: ${{ steps.ec2-runner.outputs.ec2-instance-id }}
52+
53+
runs:
54+
using: 'composite'
55+
steps:
56+
- name: Start EC2 runner
57+
if: inputs.mode == 'start'
58+
id: ec2-runner
59+
uses: machulav/ec2-github-runner@343a1b2ae682e681c3cec9a235d882da17ff04ef # v2.6.1
60+
env:
61+
AWS_DEFAULT_REGION: ${{ inputs.aws-region }}
62+
AWS_REGION: ${{ inputs.aws-region }}
63+
with:
64+
mode: start
65+
github-token: ${{ inputs.github-token }}
66+
ec2-instance-type: ${{ inputs.instance-type }}
67+
aws-resource-tags: ${{ inputs.ec2-instance-tags }}
68+
runner-home-dir: ${{ inputs.runner-home-dir }}
69+
iam-role-name: ${{ inputs.iam-role-name }}
70+
availability-zones-config: ${{ inputs.availability-zones-config }}
71+
72+
- name: Stop EC2 runner
73+
if: inputs.mode == 'stop'
74+
uses: machulav/ec2-github-runner@343a1b2ae682e681c3cec9a235d882da17ff04ef # v2.6.1
75+
env:
76+
AWS_DEFAULT_REGION: ${{ inputs.aws-region }}
77+
AWS_REGION: ${{ inputs.aws-region }}
78+
with:
79+
mode: stop
80+
github-token: ${{ inputs.github-token }}
81+
label: ${{ inputs.label }}
82+
ec2-instance-id: ${{ inputs.ec2-instance-id }}

0 commit comments

Comments
 (0)