Merge branch 'main' into nightly-combined

Author: cooktheryan

.github/workflows/cut-release-candidate.yaml

@@ -1,4 +1,4 @@
-name: Cut a Release Candidate
+name: Release[1/2] Cut a Release Candidate
 
 on:
   workflow_dispatch:
@@ -11,6 +11,11 @@ on:
         description: 'Commit ID for "cut" (default: origin/main)'
         required: false
         type: string
+      llama_stack_only:
+        description: 'Only cut a llama-stack release candidate (default: false)'
+        required: false
+        type: boolean
+        default: false
 #  schedule:
 #    - cron: "0 0 * * *"  # Run every day at midnight
 
@@ -27,12 +32,13 @@ jobs:
       with:
         version: ${{ inputs.version }}
         commit_id: ${{ inputs.commit_id }}
+        llama_stack_only: ${{ inputs.llama_stack_only }}
         fireworks_api_key: ${{ secrets.FIREWORKS_API_KEY }}
         together_api_key: ${{ secrets.TOGETHER_API_KEY }}
         tavily_search_api_key: ${{ secrets.TAVILY_SEARCH_API_KEY }}
-        # TODO: this will expire in 90 days; we should figure out a 
+        # TODO: this will expire in 90 days; we should figure out a
         # GitHub App setup that can be used instead
-        github_token: ${{ secrets.LLAMA_REPOS_PAT }}        
+        github_token: ${{ secrets.LLAMA_REPOS_PAT }}
 
   upload-packages-and-tag:
     needs:
@@ -48,9 +54,10 @@ jobs:
     - uses: ./actions/upload-packages-and-tag
       with:
         version: ${{ inputs.version }}
-        # TODO: this will expire in 90 days; we should figure out a 
+        llama_stack_only: ${{ inputs.llama_stack_only }}
+        # TODO: this will expire in 90 days; we should figure out a
         # GitHub App setup that can be used instead
-        github_token: ${{ secrets.LLAMA_REPOS_PAT }}        
+        github_token: ${{ secrets.LLAMA_REPOS_PAT }}
 
   test-published-package:
     needs:

.github/workflows/release-final-package.yaml

@@ -1,4 +1,4 @@
-name: Release final package to PyPI
+name: Release[2/2] Release final package to PyPI
 
 on:
   workflow_dispatch:  # Keep manual trigger
@@ -11,6 +11,11 @@ on:
         description: 'RC version which should be used as the base for this release (e.g. 0.1.1rc2)'
         required: true
         type: string
+      llama_stack_only:
+        description: 'Only release llama-stack (default: false)'
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   publish-to-pypi:
@@ -26,9 +31,10 @@ jobs:
       with:
         release_version: ${{ inputs.release_version }}
         rc_version: ${{ inputs.rc_version }}
-        # TODO: this will expire in 90 days; we should figure out a 
+        llama_stack_only: ${{ inputs.llama_stack_only }}
+        # TODO: this will expire in 90 days; we should figure out a
         # GitHub App setup that can be used instead
-        github_token: ${{ secrets.LLAMA_REPOS_PAT }}        
+        github_token: ${{ secrets.LLAMA_REPOS_PAT }}
 
   test-published-package:
     needs:

.github/workflows/test-maybe-cut.yaml

@@ -10,8 +10,8 @@ on:
         description: 'Version (e.g. 0.1.1rc2); if optional, will not cut a branch'
         required: false
         type: string
-#  schedule:
-#    - cron: "0 0 * * *"  # Run every day at midnight
+  schedule:
+    - cron: "0 0 * * *"  # Run every day at midnight
 
 jobs:
   test-and-maybe-cut:
@@ -22,25 +22,36 @@ jobs:
       contents: read
     steps:
     - uses: actions/checkout@v4
+    - name: Set commit ID and version for scheduled runs
+      id: inputs
+      run: |
+        if [[ "${{ github.event_name }}" == "schedule" ]]; then
+          echo "commit_id=origin/main" >> $GITHUB_OUTPUT
+          echo "version=" >> $GITHUB_OUTPUT
+        else
+          echo "commit_id=${{ inputs.commit_id }}" >> $GITHUB_OUTPUT
+          echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
+        fi
+      shell: bash
     - name: Set version if not provided
       id: version
       run: |
-        if [ -z "${{ inputs.version }}" ]; then
+        if [ -z "${{ steps.inputs.outputs.version }}" ]; then
           echo "value=0.0.0.dev$(date +%Y%m%d%H%M%S)" >> $GITHUB_OUTPUT
           echo "only_test=true" >> $GITHUB_OUTPUT
         else
-          echo "value=${{ inputs.version }}" >> $GITHUB_OUTPUT
+          echo "value=${{ steps.inputs.outputs.version }}" >> $GITHUB_OUTPUT
           echo "only_test=false" >> $GITHUB_OUTPUT
         fi
       shell: bash
     - uses: ./actions/test-and-cut
       with:
         version: ${{ steps.version.outputs.value }}
-        commit_id: ${{ inputs.commit_id }}
+        commit_id: ${{ steps.inputs.outputs.commit_id }}
         only_test_dont_cut: ${{ steps.version.outputs.only_test }}
         fireworks_api_key: ${{ secrets.FIREWORKS_API_KEY }}
         together_api_key: ${{ secrets.TOGETHER_API_KEY }}
         tavily_search_api_key: ${{ secrets.TAVILY_SEARCH_API_KEY }}
-        # TODO: this will expire in 90 days; we should figure out a 
+        # TODO: this will expire in 90 days; we should figure out a
         # GitHub App setup that can be used instead
-        github_token: ${{ secrets.LLAMA_REPOS_PAT }}        
+        github_token: ${{ secrets.LLAMA_REPOS_PAT }}

.pre-commit-config.yaml

@@ -10,6 +10,8 @@ repos:
     -   id: check-merge-conflict
     -   id: check-added-large-files
         args: ['--maxkb=1000']
+    -   id: trailing-whitespace
+        exclude: '\.py$'  # Exclude Python files as Ruff already handles them
     -   id: end-of-file-fixer
         exclude: '^(.*\.svg)$'
 

CODE_OF_CONDUCT.md

@@ -0,0 +1,80 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+This Code of Conduct also applies outside the project spaces when there is a
+reasonable belief that an individual's behavior may have a negative impact on
+the project or its community.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at <[email protected]>. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -0,0 +1,31 @@
+# Contributing to llama-stack-ops
+We want to make contributing to this project as easy and transparent as
+possible.
+
+## Pull Requests
+We actively welcome your pull requests.
+
+1. Fork the repo and create your branch from `main`.
+2. If you've added code that should be tested, add tests.
+3. If you've changed APIs, update the documentation.
+4. Ensure the test suite passes.
+5. Make sure your code lints.
+6. If you haven't already, complete the Contributor License Agreement ("CLA").
+
+## Contributor License Agreement ("CLA")
+In order to accept your pull request, we need you to submit a CLA. You only need
+to do this once to work on any of Facebook's open source projects.
+
+Complete your CLA here: <https://code.facebook.com/cla>
+
+## Issues
+We use GitHub issues to track public bugs. Please ensure your description is
+clear and has sufficient instructions to be able to reproduce the issue.
+
+Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
+disclosure of security bugs. In those cases, please go through the process
+outlined on that page and do not file a public issue.
+
+## License
+By contributing to llama-stack-ops, you agree that your contributions will be licensed
+under the LICENSE file in the root directory of this source tree.

actions/publish-dockers/main.sh

@@ -14,7 +14,6 @@ fi
 
 set -euo pipefail
 
-# Common setup for both scripts
 if [ "$IS_NIGHTLY" = true ]; then
   cd llama-stack
 fi

actions/release-final-package/action.yaml

@@ -7,6 +7,10 @@ inputs:
   rc_version:
     description: 'Release candidate version which will be used to build the final package'
     required: true
+  llama_stack_only:
+    description: 'Only release llama-stack (default: false)'
+    required: false
+    default: 'false'
   github_token:
     description: 'GitHub token to use for the release'
     required: true
@@ -37,6 +41,7 @@ runs:
       env:
         RELEASE_VERSION: ${{ inputs.release_version }}
         RC_VERSION: ${{ inputs.rc_version }}
+        LLAMA_STACK_ONLY: ${{ inputs.llama_stack_only }}
         GITHUB_TOKEN: ${{ inputs.github_token }}
       run: |
         chmod +x ${{ github.action_path }}/main.sh