wip

Author: chrishagglund-ship-it

.github/workflows/pull_request.yml

@@ -1,6 +1,13 @@
 name: Continuous Integration
 
-on: [pull_request, workflow_dispatch]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -46,9 +53,6 @@ jobs:
         id: unit_tests
         continue-on-error: true
         env:
-          CONDUCTOR_AUTH_KEY: ${{ secrets.CONDUCTOR_AUTH_KEY }}
-          CONDUCTOR_AUTH_SECRET: ${{ secrets.CONDUCTOR_AUTH_SECRET }}
-          CONDUCTOR_SERVER_URL: ${{ secrets.CONDUCTOR_SERVER_URL }}
           COVERAGE_FILE: ${{ env.COVERAGE_DIR }}/.coverage.unit
         run: |
           coverage run -m pytest tests/unit -v
@@ -57,9 +61,6 @@ jobs:
         id: bc_tests
         continue-on-error: true
         env:
-          CONDUCTOR_AUTH_KEY: ${{ secrets.CONDUCTOR_AUTH_KEY }}
-          CONDUCTOR_AUTH_SECRET: ${{ secrets.CONDUCTOR_AUTH_SECRET }}
-          CONDUCTOR_SERVER_URL: ${{ secrets.CONDUCTOR_SERVER_URL }}
           COVERAGE_FILE: ${{ env.COVERAGE_DIR }}/.coverage.bc
         run: |
           coverage run -m pytest tests/backwardcompatibility -v
@@ -68,9 +69,6 @@ jobs:
         id: serdeser_tests
         continue-on-error: true
         env:
-          CONDUCTOR_AUTH_KEY: ${{ secrets.CONDUCTOR_AUTH_KEY }}
-          CONDUCTOR_AUTH_SECRET: ${{ secrets.CONDUCTOR_AUTH_SECRET }}
-          CONDUCTOR_SERVER_URL: ${{ secrets.CONDUCTOR_SERVER_URL }}
           COVERAGE_FILE: ${{ env.COVERAGE_DIR }}/.coverage.serdeser
         run: |
           coverage run -m pytest tests/serdesertest -v
@@ -103,4 +101,30 @@ jobs:
 
       - name: Check test results
         if: steps.unit_tests.outcome == 'failure' || steps.bc_tests.outcome == 'failure' || steps.serdeser_tests.outcome == 'failure' || steps.agent_base_import.outcome == 'failure'
-        run: exit 1
+        run: exit 1
+
+  integration-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      CONDUCTOR_SERVER_URL: ${{ vars.SDKDEV_V5_SERVER_URL }}
+      CONDUCTOR_AUTH_KEY: ${{ vars.SDKDEV_V5_AUTH_KEY }}
+      CONDUCTOR_AUTH_SECRET: ${{ secrets.SDKDEV_V5_AUTH_SECRET }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          cache: 'pip'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -e .
+          pip install pytest
+
+      - name: Run integration tests
+        run: bash scripts/run_integration_tests.sh

src/conductor/client/http/models/service_method.py

@@ -15,7 +15,7 @@ class ServiceMethod:
         'input_type': 'str',
         'output_type': 'str',
         'request_params': 'list[RequestParam]',
-        'example_input': 'dict'
+        'example_input': 'object'
     }
 
     attribute_map = {

src/conductor/client/http/models/upsert_user_request.py

@@ -2,7 +2,7 @@
 import re  # noqa: F401
 import six
 from dataclasses import dataclass, field, InitVar
-from typing import List, Optional
+from typing import Dict, List, Optional
 from enum import Enum
 
 
@@ -30,41 +30,50 @@ class UpsertUserRequest:
     name: InitVar[Optional[str]] = None
     roles: InitVar[Optional[List[str]]] = None
     groups: InitVar[Optional[List[str]]] = None
+    contact_information: InitVar[Optional[Dict[str, str]]] = None
 
     _name: str = field(default=None, init=False)
     _roles: List[str] = field(default=None, init=False)
     _groups: List[str] = field(default=None, init=False)
+    _contact_information: Dict[str, str] = field(default=None, init=False)
 
     swagger_types = {
         'name': 'str',
         'roles': 'list[str]',
-        'groups': 'list[str]'
+        'groups': 'list[str]',
+        'contact_information': 'dict(str, str)'
     }
 
     attribute_map = {
         'name': 'name',
         'roles': 'roles',
-        'groups': 'groups'
+        'groups': 'groups',
+        'contact_information': 'contactInformation'
     }
 
-    def __init__(self, name=None, roles=None, groups=None):  # noqa: E501
+    def __init__(self, name=None, roles=None, groups=None, contact_information=None):  # noqa: E501
         """UpsertUserRequest - a model defined in Swagger"""  # noqa: E501
         self._name = None
         self._roles = None
         self._groups = None
+        self._contact_information = None
         self.discriminator = None
         self.name = name
         if roles is not None:
             self.roles = roles
         if groups is not None:
             self.groups = groups
+        if contact_information is not None:
+            self.contact_information = contact_information
 
-    def __post_init__(self, name, roles, groups):
+    def __post_init__(self, name, roles, groups, contact_information):
         self.name = name
         if roles is not None:
             self.roles = roles
         if groups is not None:
             self.groups = groups
+        if contact_information is not None:
+            self.contact_information = contact_information
 
     @property
     def name(self):
@@ -139,6 +148,29 @@ def groups(self, groups):
 
         self._groups = groups
 
+    @property
+    def contact_information(self):
+        """Gets the contact_information of this UpsertUserRequest.  # noqa: E501
+
+        User's contact information, e.g. {"email": "user@example.com"}  # noqa: E501
+
+        :return: The contact_information of this UpsertUserRequest.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._contact_information
+
+    @contact_information.setter
+    def contact_information(self, contact_information):
+        """Sets the contact_information of this UpsertUserRequest.
+
+        User's contact information, e.g. {"email": "user@example.com"}  # noqa: E501
+
+        :param contact_information: The contact_information of this UpsertUserRequest.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._contact_information = contact_information
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

tests/integration/README.md

@@ -38,8 +38,36 @@ export CONDUCTOR_AUTH_SECRET="your-secret"
 
 ## Running Tests
 
+### Run the CI suite locally (recommended)
+
+Use the helper script to run exactly what CI runs (the `integration-test` job in
+[`.github/workflows/pull_request.yml`](../../.github/workflows/pull_request.yml)).
+It excludes the AI/agentic tests (which need a dedicated AI-enabled server) and
+the slow performance test, so you don't have to remember the `--ignore` flags:
+
+```bash
+export CONDUCTOR_SERVER_URL="http://localhost:8080/api"
+# For Orkes / authenticated servers also set:
+# export CONDUCTOR_AUTH_KEY="your-key"
+# export CONDUCTOR_AUTH_SECRET="your-secret"
+
+./scripts/run_integration_tests.sh
+
+# Also run the performance test (test_update_task_v2_perf.py, ~1000 workflows,
+# several minutes):
+./scripts/run_integration_tests.sh --with-perf
+```
+
+Any extra arguments pass straight through to pytest, which is handy for
+targeting a subset of tests or getting more detail on failures. See additional
+options and examples in the comments at the top of
+[`scripts/run_integration_tests.sh`](../../scripts/run_integration_tests.sh).
+
 ### Run All Integration Tests
 
+This includes the AI/agentic tests, which require an AI-enabled server (see
+[Tests excluded by default](#tests-excluded-by-default) below):
+
 ```bash
 python3 -m pytest tests/integration/ -v -s
 ```
@@ -442,46 +470,42 @@ To add more test scenarios:
 
 ---
 
-## CI/CD Integration
+## Tests excluded by default
 
-### GitHub Actions Example
+`scripts/run_integration_tests.sh` (and CI) skip a few tests by default.
 
-```yaml
-name: Integration Tests
+**AI/agentic tests** need a dedicated AI-enabled server:
 
-on: [push, pull_request]
+- `test_ai_task_types.py` and `test_ai_examples.py` hardcode
+  `http://localhost:7001/api`.
+- `test_agentic_workflows.py` needs an `openai` LLM provider (model
+  `gpt-4o-mini`) configured on the server.
 
-jobs:
-  integration:
-    runs-on: ubuntu-latest
+Run them only against a suitably configured AI-enabled server, e.g.:
 
-    services:
-      conductor:
-        image: conductoross/conductor-standalone:3.15.0
-        ports:
-          - 8080:8080
-          - 5000:5000
+```bash
+python3 -m pytest tests/integration/test_ai_task_types.py -v -s
+```
 
-    steps:
-      - uses: actions/checkout@v2
+**Performance test** (`test_update_task_v2_perf.py`) submits ~1000 workflows and
+takes several minutes. Include it with the `--with-perf` flag:
 
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.9'
+```bash
+./scripts/run_integration_tests.sh --with-perf
+```
 
-      - name: Install dependencies
-        run: pip install -e .
+---
+
+## CI/CD Integration
 
-      - name: Wait for Conductor
-        run: |
-          timeout 60 bash -c 'until curl -f http://localhost:8080/api/health; do sleep 2; done'
+Integration tests run in CI via the `integration-test` job in
+[`.github/workflows/pull_request.yml`](../../.github/workflows/pull_request.yml)
+on pushes to `main`, PRs targeting `main`, and manual dispatch. The job invokes
+`scripts/run_integration_tests.sh` (excluding the AI tests and the performance
+test) and reads the server from the `SDKDEV_V5_*` repository variables/secret.
 
-      - name: Run integration tests
-        env:
-          CONDUCTOR_SERVER_URL: http://localhost:8080/api
-        run: python3 -m pytest tests/integration/ -v -s
-```
+To reproduce the CI run locally, use the script documented in
+[Running Tests](#running-tests) above.
 
 ---
 

tests/integration/client/test_async.py

@@ -1,10 +1,18 @@
 from conductor.client.http.api.metadata_resource_api import MetadataResourceApi
 from conductor.client.http.api_client import ApiClient
+from conductor.client.http.models.task_def import TaskDef
+
+TASK_NAME = 'python_integration_test_task'
 
 
 def test_async_method(api_client: ApiClient):
     metadata_client = MetadataResourceApi(api_client)
+
+    # Ensure the task def exists so the async lookup has something to return,
+    # regardless of test ordering.
+    metadata_client.register_task_def(body=[TaskDef(name=TASK_NAME)])
+
     thread = metadata_client.get_task_def(
-        async_req=True, tasktype='python_integration_test_task')
+        async_req=True, tasktype=TASK_NAME)
     thread.wait()
     assert thread.get() is not None