WIP: buf build

Author: b-long

.github/workflows/build-golang-macos.yaml

@@ -0,0 +1,55 @@
+---
+name: Ubuntu build - buf edition
+on: [push]
+jobs:
+
+  build:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+
+    strategy:
+      fail-fast: true
+      matrix:
+        go-version: [1.24.x]
+        python3_version: [ "3.11", "3.12", "3.13" ]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+          cache-dependency-path: go.sum
+
+      # - name: Set up Python
+      #   uses: actions/setup-python@v4
+      #   with:
+      #     python-version: ${{ matrix.python3_version }}
+
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: "latest"
+          python-version: ${{ matrix.python3_version }}
+
+      # Download a release like https://github.com/bufbuild/buf/releases/download/v1.53.0/buf-Linux-x86_64
+      - name: Install buf
+        run: |
+          BUF_VERSION="1.53.0"
+          BUF_URL="https://github.com/bufbuild/buf/releases/download/v1.53.0/buf-Linux-x86_64"
+          curl -sSL "$BUF_URL" -o /usr/local/bin/buf
+          chmod +x /usr/local/bin/buf
+
+      - name: Add buf to PATH
+        run: echo "/usr/local/bin" >> $GITHUB_PATH
+
+      - name: Check buf version
+        run: buf --version
+
+      - name: Build using 'uv_buf_build_script.sh'
+        run: |
+          cd buf-build/
+          chmod +x ./uv_buf_build_script.sh
+          ./uv_buf_build_script.sh

.github/workflows/build-golang-ubuntu-buf.yaml

@@ -0,0 +1,77 @@
+import zipfile
+import sys
+import argparse  # For better command-line argument handling
+
+
+def list_modules_in_wheel(wheel_path):
+    """
+    Lists all Python modules (.py files) contained within a wheel file.
+
+    Args:
+      wheel_path (str): The path to the .whl file.
+
+    Returns:
+      list: A list of strings, where each string is the path to a .py file
+            within the wheel archive. Returns None if an error occurs.
+    """
+    modules = []
+    try:
+        # Check if the file exists and is a file
+        # (zipfile might raise different errors depending on the OS for directories)
+        import os
+
+        if not os.path.isfile(wheel_path):
+            print(
+                f"Error: Path '{wheel_path}' does not exist or is not a file.",
+                file=sys.stderr,
+            )
+            return None
+
+        # Open the wheel file (which is essentially a zip archive) in read mode ('r')
+        with zipfile.ZipFile(wheel_path, "r") as zf:
+            # Get a list of all archive members (files and directories)
+            all_files = zf.namelist()
+
+            # Filter the list to include only files ending with '.py'
+            modules = [name for name in all_files if name.endswith(".py")]
+
+        return modules
+
+    except zipfile.BadZipFile:
+        print(
+            f"Error: '{wheel_path}' is not a valid zip file or wheel file.",
+            file=sys.stderr,
+        )
+        return None
+    except FileNotFoundError:
+        # This might be redundant due to the os.path.isfile check, but good practice
+        print(f"Error: File not found at '{wheel_path}'", file=sys.stderr)
+        return None
+    except Exception as e:
+        print(f"An unexpected error occurred: {e}", file=sys.stderr)
+        return None
+
+
+# --- Example Usage (when running the script directly) ---
+if __name__ == "__main__":
+    # Set up command-line argument parsing
+    parser = argparse.ArgumentParser(
+        description="List Python modules (.py files) found inside a wheel (.whl) file."
+    )
+    parser.add_argument("wheel_file", help="The path to the .whl file to inspect.")
+    args = parser.parse_args()
+
+    # Get the list of modules
+    module_list = list_modules_in_wheel(args.wheel_file)
+
+    # Print the results
+    if module_list is not None:  # Check if the function execution was successful
+        if module_list:
+            print(f"Found {len(module_list)} module(s) in '{args.wheel_file}':")
+            for module_path in module_list:
+                print(f"- {module_path}")
+        else:
+            print(f"No .py modules found in '{args.wheel_file}'.")
+        sys.exit(0)  # Exit with success code
+    else:
+        sys.exit(1)  # Exit with error code

.github/workflows/build-golang-ubuntu.yaml

@@ -0,0 +1,11 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="otdf_python",
+    version="0.2.11",
+    author="b-long",
+    author_email="[email protected]",
+    description="Buf generated SDK for OpenTDF",
+    packages=find_packages("gen"),
+    package_dir={"": "gen"},
+)

.python-version

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Based on the excellent work of the sift-stack team:
+#   https://github.com/sift-stack/sift/blob/main/docs/python.md
 set -x
 set -eou pipefail
 
@@ -17,13 +19,15 @@ loud_print(){
 
 # Based on: https://stackoverflow.com/a/246128
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-BUILD_ROOT="${SCRIPT_DIR}/buf-build"
+BUILD_ROOT="${SCRIPT_DIR}/buf-build-generated"
+TEST_ROOT="${SCRIPT_DIR}/buf-build-test"
 
 # Cleanup previous builds
 rm -rf .venv-wheel/
 rm -rf .venv/
 rm -rf dist/
 rm -rf "${BUILD_ROOT}"
+rm -rf "${TEST_ROOT}"
 
 mkdir -p "${BUILD_ROOT}" || { echo "Unable to create build root directory" ; exit 1; }
 cd "${BUILD_ROOT}" || { echo "Unable to change to build root directory" ; exit 1; }
@@ -43,12 +47,29 @@ if ! command -v go &> /dev/null; then
 fi
 
 
+# Shallow clone the 'https://github.com/opentdf/platform.git' repo
+git clone --depth 1 https://github.com/opentdf/platform.git
+
+cd platform || { echo "Unable to change to platform directory" ; exit 1; }
+buf export --output=$BUILD_ROOT/protos --config buf.yaml
+
+cd $SCRIPT_DIR || { echo "Unable to change to script directory" ; exit 1; }
+cp buf.gen.python.yaml $BUILD_ROOT/buf.gen.yaml
+cp setup.py $BUILD_ROOT/setup.py
+
+cd "${BUILD_ROOT}" || { echo "Unable to change to build root directory" ; exit 1; }
+buf generate protos || { echo "buf generate failed" ; exit 1; }
+
+for dir in $(find gen -type d); do
+  touch $dir/__init__.py
+done
+
 # PY_TYPE="--python-preference=only-system"
 PY_TYPE="--python-preference=only-managed"
 
 loud_print "Creating virtual environment"
 # Install python deps
-uv venv .venv --python 3.12 "$PY_TYPE"
+uv venv .venv "$PY_TYPE"
 
 if ! [ -d "${BUILD_ROOT}/.venv" ]; then
     echo "Unable to locate virtual environment directory"
@@ -58,9 +79,26 @@ fi
 loud_print "Activating virtual environment"
 source "${BUILD_ROOT}/.venv/bin/activate"
 
+uv pip install build protobuf grpcio
+python -m build --sdist || { echo "Failed to build source distribution" ; exit 1; }
+python -m build --wheel || { echo "Failed to build wheel distribution" ; exit 1; }
 
-# Shallow clone the 'https://github.com/opentdf/platform.git' repo
-git clone --depth 1 https://github.com/opentdf/platform.git
+echo "Build completed successfully."
+echo "Directory contents:"
+ls -lart
+echo "Dist directory contents:"
+ls -lart dist/
 
-cd platform || { echo "Unable to change to platform directory" ; exit 1; }
-buf export --output=$BUILD_ROOT/protos --config buf.yaml
+
+loud_print "Testing new wheel"
+
+mkdir -p "${TEST_ROOT}" || { echo "Unable to create test root directory" ; exit 1; }
+cd "${TEST_ROOT}" || { echo "Unable to change to test root directory" ; exit 1; }
+uv venv .venv-wheel
+source "${TEST_ROOT}/.venv-wheel/bin/activate"
+
+echo "Ensuring wheel can be installed"
+uv pip install ${BUILD_ROOT}/dist/*.whl || { echo "Failed to install wheel" ; exit 1; }
+
+loud_print "Listing all wheel modules"
+uvx python ${SCRIPT_DIR}/list_wheel_modules.py ${BUILD_ROOT}/dist/*.whl || { echo "Failed to list wheel modules" ; exit 1; }