update pre-push

Author: alexluck-sift

.githooks/pre-push

@@ -8,7 +8,10 @@ GITHOOKS_DIR="$REPO_ROOT/.githooks"
 python_changed_files=($(git diff --name-only --diff-filter=ACM | grep '^python/lib/sift_client/' || true))
 
 if [[ -n "$python_changed_files" ]]; then
-    echo "Python files changed, running Python stub checks..."
+    echo "Python files changed, running Python formatting and linting..."
+    bash "$GITHOOKS_DIR/pre-push-python/fmt-lint.sh"
+    
+    echo "Running Python stub checks..."
     bash "$GITHOOKS_DIR/pre-push-python/stubs.sh"
 fi
 

.githooks/pre-push-python/fmt-lint.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Store the root directory of the repository
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+PYTHON_DIR="$REPO_ROOT/python"
+
+echo "Running Python formatting and linting with --fix..."
+
+# Change to Python directory
+cd "$PYTHON_DIR"
+
+# Run ruff format (formatter)
+echo "Running ruff format..."
+bash ./scripts/dev fmt
+
+# Run ruff check with --fix (linter)
+echo "Running ruff check --fix..."
+bash ./scripts/dev lint-fix
+
+# Check if any files were modified by formatting/linting
+cd "$REPO_ROOT"
+changed_files=$(git status --porcelain python/lib/sift_client/ | grep -E '\.py$' || true)
+
+if [ -n "$changed_files" ]; then
+    echo ""
+    echo "ERROR: Formatting/linting made changes to the following files:"
+    echo "$changed_files"
+    echo ""
+    echo "Please commit these changes before pushing."
+    exit 1
+fi
+
+echo "Python formatting and linting completed successfully."

.githooks/pre-push-python/stubs-check.sh

@@ -325,9 +325,10 @@ async def test_update_run_name(self, runs_api_async, new_run):
         async def test_update_run_tags_and_metadata(self, runs_api_async, new_run):
             """Test updating a run's tags and metadata."""
             try:
-                # Update tags
+                # Update tags and metadata
                 update = RunUpdate(
                     tags=["updated", "new-tag", "sift-client-pytest"],
+                    metadata={"test_key": "test_value", "number": 42.5, "flag": True},
                 )
                 updated_run = await runs_api_async.update(new_run, update)
 
@@ -337,6 +338,9 @@ async def test_update_run_tags_and_metadata(self, runs_api_async, new_run):
                     "new-tag",
                     "sift-client-pytest",
                 }
+                assert updated_run.metadata["test_key"] == "test_value"
+                assert updated_run.metadata["number"] == 42.5
+                assert updated_run.metadata["flag"] is True
             finally:
                 await runs_api_async.archive(new_run.id_)
 

python/lib/sift_client/_tests/resources/test_runs.py

@@ -47,8 +47,7 @@ def test_expression_helper(self):
 
         # Verify expression is set in nested path
         assert (
-            proto.calculated_channel_configuration.query_configuration.sel.expression
-            == "$1 + $2"
+            proto.calculated_channel_configuration.query_configuration.sel.expression == "$1 + $2"
         )
         assert "query_configuration" in mask.paths
 
@@ -66,9 +65,7 @@ def test_expression_channel_references_helper(self):
         proto, mask = update.to_proto_with_mask()
 
         # Verify channel references are converted
-        refs = (
-            proto.calculated_channel_configuration.query_configuration.sel.expression_channel_references
-        )
+        refs = proto.calculated_channel_configuration.query_configuration.sel.expression_channel_references
         assert len(refs) == 2
         assert refs[0].channel_reference == "$1"
         assert refs[0].channel_identifier == "channel1"
@@ -110,10 +107,7 @@ def test_all_assets_helper(self):
         proto, mask = update.to_proto_with_mask()
 
         # Verify all_assets is set in nested path
-        assert (
-            proto.calculated_channel_configuration.asset_configuration.all_assets
-            is True
-        )
+        assert proto.calculated_channel_configuration.asset_configuration.all_assets is True
         # Verify update_field is in mask (same as tag_ids and asset_ids)
         assert "asset_configuration" in mask.paths
 
@@ -153,9 +147,7 @@ def test_expression_validator_rejects_references_without_expression(self):
         ):
             CalculatedChannelUpdate(
                 expression_channel_references=[
-                    ChannelReference(
-                        channel_reference="$1", channel_identifier="channel1"
-                    ),
+                    ChannelReference(channel_reference="$1", channel_identifier="channel1"),
                 ],
             )
 
@@ -210,9 +202,7 @@ def mock_calculated_channel(mock_client):
 class TestCalculatedChannel:
     """Unit tests for CalculatedChannel model - tests properties and methods."""
 
-    def test_archive_calls_client_and_updates_self(
-        self, mock_calculated_channel, mock_client
-    ):
+    def test_archive_calls_client_and_updates_self(self, mock_calculated_channel, mock_client):
         """Test that archive() calls client.calculated_channels.archive and calls _update."""
         archived_calc_channel = MagicMock()
         archived_calc_channel.is_archived = True
@@ -234,9 +224,7 @@ def test_archive_calls_client_and_updates_self(
             # Verify it returns self
             assert result is mock_calculated_channel
 
-    def test_unarchive_calls_client_and_updates_self(
-        self, mock_calculated_channel, mock_client
-    ):
+    def test_unarchive_calls_client_and_updates_self(self, mock_calculated_channel, mock_client):
         """Test that unarchive() calls client.calculated_channels.unarchive and calls _update."""
         unarchived_calc_channel = MagicMock()
         unarchived_calc_channel.is_archived = False
@@ -258,9 +246,7 @@ def test_unarchive_calls_client_and_updates_self(
             # Verify it returns self
             assert result is mock_calculated_channel
 
-    def test_update_calls_client_and_updates_self(
-        self, mock_calculated_channel, mock_client
-    ):
+    def test_update_calls_client_and_updates_self(self, mock_calculated_channel, mock_client):
         """Test that update() calls client.calculated_channels.update and calls _update."""
         updated_calc_channel = MagicMock()
         updated_calc_channel.description = "Updated description"