flexcompute
diff --git a/‎.github/workflows/sync-main-to-develop.yml‎
Lines changed: 169 additions & 0 deletions b/‎.github/workflows/sync-main-to-develop.yml‎
Lines changed: 169 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 8 additions & 9 deletions b/‎README.md‎
Lines changed: 8 additions & 9 deletions
diff --git a/‎flow360/__init__.py‎
Lines changed: 13 additions & 1 deletion b/‎flow360/__init__.py‎
Lines changed: 13 additions & 1 deletion
diff --git a/‎flow360/cloud/flow360_requests.py‎
Lines changed: 1 addition & 0 deletions b/‎flow360/cloud/flow360_requests.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎flow360/cloud/http_util.py‎
Lines changed: 6 additions & 1 deletion b/‎flow360/cloud/http_util.py‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎flow360/cloud/utils.py‎
Lines changed: 1 addition & 2 deletions b/‎flow360/cloud/utils.py‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎flow360/component/constants.py‎
Lines changed: 1 addition & 2 deletions b/‎flow360/component/constants.py‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎flow360/component/interfaces.py‎
Lines changed: 1 addition & 2 deletions b/‎flow360/component/interfaces.py‎
Lines changed: 1 addition & 2 deletions
@@ -0,0 +1,169 @@
+name: Auto Merge main -> develop (UTC 04/12/20)
+
+on:
+  schedule:
+    - cron: "0 4 * * *"    # 04:00 UTC
+    - cron: "0 12 * * *"   # 12:00 UTC
+    - cron: "0 20 * * *"   # 20:00 UTC
+  workflow_dispatch: {}
+
+permissions:
+  contents: write
+  pull-requests: write
+
+# Optional: flip to "1" to turn on wire-level Git logs when debugging
+env:
+  GIT_TRACE: "0"
+  GIT_CURL_VERBOSE: "0"
+
+concurrency:
+  group: sync-main-to-develop
+  cancel-in-progress: false
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Print basic context
+        run: |
+          echo "Actor:  $GITHUB_ACTOR"
+          echo "Repo :  $GITHUB_REPOSITORY"
+          echo "SHA  :  $GITHUB_SHA"
+          echo "When :  $(date -u '+%Y-%m-%d %H:%M:%S UTC')"
+          {
+            echo "## Scheduled sync run"
+            echo "- Actor: \`$GITHUB_ACTOR\`"
+            echo "- When (UTC): $(date -u '+%Y-%m-%d %H:%M:%S')"
+            echo "- Runner: $(uname -a)"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Checkout develop
+        uses: actions/checkout@v4
+        with:
+          ref: develop
+          fetch-depth: 0
+          # If you use a bot PAT to bypass branch protection, switch to:
+          # token: ${{ secrets.BOT_PAT }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Show remotes and branches
+        run: |
+          git remote -v
+          echo
+          git fetch --prune origin
+          echo "Remote branches:"
+          git branch -r
+          echo
+          echo "HEAD            : $(git rev-parse --short HEAD)"
+          echo "origin/develop  : $(git rev-parse --short origin/develop)"
+          echo "origin/main     : $(git rev-parse --short origin/main)"
+
+      - name: Ahead/behind summary (before)
+        id: ab
+        run: |
+          set -euo pipefail
+          git checkout develop
+          git reset --hard origin/develop
+          # A = commits in main not in develop; B = commits in develop not in main
+          read A B < <(git rev-list --left-right --count origin/main...origin/develop | awk '{print $1" "$2}')
+          echo "main ahead of develop by: $A, develop ahead of main by: $B"
+          echo "ahead_main=$A"    >> "$GITHUB_OUTPUT"
+          echo "ahead_develop=$B" >> "$GITHUB_OUTPUT"
+          {
+            echo "### Before merge"
+            echo "- main ahead of develop: **$A**"
+            echo "- develop ahead of main: **$B**"
+            echo
+            echo "<details><summary>Last 5 on main</summary>"
+            git log --oneline --decorate=no -n 5 origin/main
+            echo "</details>"
+            echo "<details><summary>Last 5 on develop</summary>"
+            git log --oneline --decorate=no -n 5 origin/develop
+            echo "</details>"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Check if develop already contains main
+        id: up
+        run: |
+          if git merge-base --is-ancestor origin/main HEAD; then
+            echo "up_to_date=true"  >> "$GITHUB_OUTPUT"
+            echo "Develop already contains main. No merge needed."
+          else
+            echo "up_to_date=false" >> "$GITHUB_OUTPUT"
+            echo "Develop does not contain main yet. Will merge."
+          fi
+
+      - name: Merge main into develop
+        if: steps.up.outputs.up_to_date == 'false'
+        id: merge
+        run: |
+          set -e
+          echo "Attempting merge origin/main -> develop..."
+          if git merge -m "chore: scheduled sync main -> develop" origin/main; then
+            echo "conflicted=false" >> "$GITHUB_OUTPUT"
+            echo "Merge done (maybe fast-forward)."
+          else
+            echo "conflicted=true" >> "$GITHUB_OUTPUT"
+            echo "::group::Conflict details"
+            git status --porcelain
+            echo
+            echo "Conflicted files:"
+            git diff --name-only --diff-filter=U || true
+            echo "::endgroup::"
+            git merge --abort || true
+          fi
+          echo "Post-merge HEAD: $(git rev-parse --short HEAD)"
+
+      - name: Diff summary after merge
+        if: steps.up.outputs.up_to_date == 'false' && steps.merge.outputs.conflicted == 'false'
+        run: |
+          echo "Files changed (first 100):"
+          git diff --name-status ORIG_HEAD..HEAD | head -n 100 || true
+          {
+            echo "### After merge"
+            echo "- New HEAD: \`$(git rev-parse --short HEAD)\`"
+            echo "<details><summary>Files changed (first 100)</summary>"
+            git diff --name-status ORIG_HEAD..HEAD | head -n 100 || true
+            echo "</details>"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Push to develop (direct)
+        if: steps.up.outputs.up_to_date == 'false' && steps.merge.outputs.conflicted == 'false'
+        id: push
+        shell: bash
+        run: |
+          set +e
+          echo "Pushing to origin/develop..."
+          git push origin HEAD:develop
+          status=$?
+          echo "exit_code=$status" >> "$GITHUB_OUTPUT"
+          if [ $status -eq 0 ]; then
+            echo "Push OK."
+          else
+            echo "Push failed (exit $status). This may be due to branch protection; will open a PR instead."
+          fi
+
+      - name: Open PR main -> develop (on conflict OR push failure)
+        if: steps.up.outputs.up_to_date == 'false' && (steps.merge.outputs.conflicted == 'true' || steps.push.outputs.exit_code != '0')
+        uses: repo-sync/pull-request@v2
+        with:
+          source_branch: "main"
+          destination_branch: "develop"
+          pr_title: "Scheduled sync: main → develop"
+          pr_body: |
+            Automated sync needs review:
+            - Merge conflicted: ${{ steps.merge.outputs.conflicted == 'true' }}
+            - Direct push exit code: ${{ steps.push.outputs.exit_code || 'n/a' }}
+            Please resolve and merge to bring `develop` up to date with `main`.
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          # If using bot PAT, switch to:
+          # github_token: ${{ secrets.BOT_PAT }}
+
+      - name: Final summary
+        run: |
+          {
+            echo "### Outcome"
+            echo "- Up to date before merge: **${{ steps.up.outputs.up_to_date || 'n/a' }}**"
+            echo "- Merge conflicted: **${{ steps.merge.outputs.conflicted || 'n/a' }}**"
+            echo "- Push exit code: **${{ steps.push.outputs.exit_code || 'n/a' }}**"
+          } >> "$GITHUB_STEP_SUMMARY"
@@ -49,7 +49,7 @@ Environment ``FLOW360_APIKEY`` variable takes precedence before Flow360 configur
 ## setup
 0. clone repo
 1. Install poetry ``pip install poetry``
-2. Activate poetry shell ``poetry env activate``
+2. ``poetry env activate`` gives you the command to activate the virtual environment, copy paste and run the command to enter the virtual environment. Or you can just prepend `poetry run` on all the python related commands.
 3. Install dependencies: ``poetry install``
 
 ## run examples
@@ -58,14 +58,13 @@ Environment ``FLOW360_APIKEY`` variable takes precedence before Flow360 configur
 ``poetry run python examples/case_results.py``
 
 ## check in
-1. ``poetry run pytest -rA``
-2. ``black .`` - performs auto-formatting
-3. ``isort .`` - sorts imports
-4. ``poetry run pylint $(git ls-files "flow360/*.py") --rcfile .pylintrc`` - checks code style
-5. ``poetry run pytest -rA tests/simulation`` - run V2 related tests
-6. ``poetry run pytest -rA --ignore tests/simulation`` - run V1 related tests (cannot be run altogether)
-7. ``pytest -rA tests/simulation --cov-report=html --cov=flow360/component/simulation`` - see test coverage report for V2 client
-8. ``pytest -rA --ignore tests/simulation --cov-report=html --cov=flow360 && open htmlcov/index.html`` - see test coverage report for V1+V2 client
+1. ``black .`` - performs auto-formatting
+2. ``isort .`` - sorts imports
+3. ``poetry run pylint $(git ls-files "flow360/*.py") --rcfile .pylintrc`` - checks code style
+4. ``poetry run pytest -rA tests/simulation`` - run V2 related tests
+5. ``poetry run pytest -rA --ignore tests/simulation`` - run V1 related tests (cannot be run altogether)
+6. ``pytest -rA tests/simulation --cov-report=html --cov=flow360/component/simulation`` - see test coverage report for V2 client
+7. ``pytest -rA --ignore tests/simulation --cov-report=html --cov=flow360 && open htmlcov/index.html`` - see test coverage report for V1+V2 client
 
 ## Documentation Requirements
 
 
@@ -9,6 +9,7 @@
 from flow360.component.project import Project
 from flow360.component.simulation import migration, services
 from flow360.component.simulation import units as u
+from flow360.component.simulation.entity_operation import Transformation
 from flow360.component.simulation.folder import Folder
 from flow360.component.simulation.meshing_param.edge_params import (
     AngleBasedRefinement,
@@ -19,6 +20,7 @@
 )
 from flow360.component.simulation.meshing_param.face_params import (
     BoundaryLayer,
+    GeometryRefinement,
     PassiveSpacing,
     SurfaceRefinement,
 )
@@ -76,6 +78,7 @@
     MassFlowRate,
     Outflow,
     Periodic,
+    PorousJump,
     Pressure,
     Rotational,
     SlaterPorousBleed,
@@ -127,6 +130,8 @@
 )
 from flow360.component.simulation.outputs.outputs import (
     AeroAcousticOutput,
+    ImportedSurfaceIntegralOutput,
+    ImportedSurfaceOutput,
     IsosurfaceOutput,
     Observer,
     ProbeOutput,
@@ -136,6 +141,7 @@
     SurfaceOutput,
     SurfaceProbeOutput,
     SurfaceSliceOutput,
+    TimeAverageImportedSurfaceOutput,
     TimeAverageIsosurfaceOutput,
     TimeAverageProbeOutput,
     TimeAverageSliceOutput,
@@ -147,11 +153,11 @@
 )
 from flow360.component.simulation.primitives import (
     Box,
+    CustomVolume,
     Cylinder,
     MeshZone,
     ReferenceGeometry,
     SnappyBody,
-    Transformation,
 )
 from flow360.component.simulation.simulation_params import SimulationParams
 from flow360.component.simulation.time_stepping.time_stepping import (
@@ -183,8 +189,10 @@
 from flow360.version import __solver_version__, __version__
 
 __all__ = [
+    "GeometryRefinement",
     "Env",
     "Case",
+    "CustomVolume",
     "AngleBasedRefinement",
     "AspectRatioBasedRefinement",
     "ProjectAnisoSpacing",
@@ -224,6 +232,7 @@
     "Outflow",
     "Inflow",
     "Periodic",
+    "PorousJump",
     "SymmetryPlane",
     "Fluid",
     "Solid",
@@ -247,6 +256,9 @@
     "ProbeOutput",
     "SurfaceProbeOutput",
     "AeroAcousticOutput",
+    "ImportedSurfaceOutput",
+    "TimeAverageImportedSurfaceOutput",
+    "ImportedSurfaceIntegralOutput",
     "Observer",
     "HeatEquationSolver",
     "NavierStokesSolver",
 
@@ -160,6 +160,7 @@ class _Resource(Flow360RequestsV2):
 
 class NewReportRequest(Flow360RequestsV2):
     "New report request"
+
     name: str
     resources: List[_Resource]
     config_json: str
 
@@ -4,6 +4,7 @@
 """
 
 import os
+import sys
 from functools import wraps
 
 import requests
@@ -22,7 +23,11 @@
 
 def get_user_agent():
     """Get the user agent the current environment."""
-    return os.environ.get("FLOW360_AGENT", f"Python-Client/{__version__}")
+    return os.environ.get(
+        "FLOW360_AGENT",
+        f"Python-Client/{__version__}/"
+        f"Python-Version/{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
+    )
 
 
 def api_key_auth(request):
 
@@ -1,5 +1,4 @@
-"""utils for cloud operations
-"""
+"""utils for cloud operations"""
 
 from enum import Enum
 
 
@@ -1,5 +1,4 @@
-"""Constants file
-"""
+"""Constants file"""
 
 
 # pylint: disable=invalid-name,too-few-public-methods
 
@@ -1,5 +1,4 @@
-"""webAPI interface definitions
-"""
+"""webAPI interface definitions"""
 
 from typing import Union