Merge dev to main

.dockerignore

@@ -0,0 +1,67 @@
+# Git
+.git
+.gitignore
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+.Python
+env/
+venv/
+ENV/
+.venv/
+Pipfile.lock
+
+# Python Build / Distribution
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# C/C++ Build Artifacts
+target/
+*.o
+*.out
+*.so
+*.dylib
+*.dll
+CMakeCache.txt
+CMakeFiles/
+
+# Testing and Coverage
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# IDE and OS files
+.vscode/
+.idea/
+*.swp
+*.swo
+.DS_Store
+Thumbs.db
+
+Dockerfile*
+docker-compose.yml
+.dockerignore

.github/workflows/PR-review.yaml

@@ -0,0 +1,55 @@
+name: AI Code Reviewer
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
+jobs:
+  gemini-code-review:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.issue.pull_request &&
+      contains(github.event.comment.body, '/gemini-review')
+    steps:
+      - name: PR Info
+        env:
+        #Assign untrusted inputs to environment variables first
+          COMMENT_BODY: ${{ github.event.comment.body }}
+          ISSUE_NUM: ${{ github.event.issue.number }}
+          REPO: ${{ github.repository }}
+        #Use shell variables ("$VAR") instead of template tags
+        run: |
+          echo "Comment: $COMMENT_BODY"
+          echo "Issue Number: $ISSUE_NUM"
+          echo "Repository: $REPO"
+
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: refs/pull/${{ github.event.issue.number }}/head
+
+      - name: Get PR Details
+        id: pr
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          ISSUE_NUM: ${{ github.event.issue.number }}
+          #Use env vars for the API call to prevent injection
+          #Use quotes around variables to prevent word splitting
+        run: |
+          PR_JSON=$(gh api "repos/$REPO/pulls/$ISSUE_NUM")
+          echo "head_sha=$(echo "$PR_JSON" | jq -r .head.sha)" >> $GITHUB_OUTPUT
+          echo "base_sha=$(echo "$PR_JSON" | jq -r .base.sha)" >> $GITHUB_OUTPUT
+
+      - uses: truongnh1992/gemini-ai-code-reviewer@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+          GEMINI_MODEL: gemini-2.5-flash
+          EXCLUDE: "*.md,*.txt,package-lock.json"

.github/workflows/ci.yml

@@ -0,0 +1,97 @@
+name: CI
+
+on:
+  push:
+    branches: [main, dev]
+  pull_request:
+    branches: [main, dev]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+
+      - name: Install ruff
+        run: pip install ruff
+
+      - name: Check formatting
+        run: ruff format --check .
+
+      - name: Lint
+        run: ruff check . --output-format=github
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements-ci.txt
+
+      - name: Run tests
+        run: |
+          pytest --tb=short -q \
+            --cov=concore_cli --cov=concore_base \
+            --cov-report=term-missing \
+            --ignore=measurements/ \
+            --ignore=0mq/ \
+            --ignore=ratc/ \
+            --ignore=linktest/
+
+  java-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Download jeromq
+        run: |
+          curl -fsSL -o jeromq.jar https://repo1.maven.org/maven2/org/zeromq/jeromq/0.6.0/jeromq-0.6.0.jar
+
+      - name: Compile Java tests
+        run: |
+          javac -cp jeromq.jar concoredocker.java TestLiteralEval.java TestConcoredockerApi.java
+
+      - name: Run Java tests
+        run: |
+          java -cp .:jeromq.jar TestLiteralEval
+          java -cp .:jeromq.jar TestConcoredockerApi
+
+  docker-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check if Dockerfile.py changed
+        uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            dockerfile:
+              - 'Dockerfile.py'
+              - 'requirements.txt'
+
+      - name: Validate Dockerfile build
+        if: steps.filter.outputs.dockerfile == 'true'
+        run: docker build -f Dockerfile.py -t concore-py-test .

.github/workflows/greetings.yml

@@ -0,0 +1,41 @@
+name: Greetings
+
+on:
+  pull_request_target:
+    types: [opened]
+  issues:
+    types: [opened]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - uses: actions/first-interaction@v3
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+
+        issue_message: |
+          👋 Welcome to the CONTROL-CORE Project, @${{ github.actor }}! Thank you for opening your first issue in concore.
+          We appreciate your contribution to the organization and will review it as soon as possible.
+
+          Before we get started, please check out these resources:
+          - 📚 [Project Documentation](https://control-core.readthedocs.io/)
+          - 📘 [Contribution Guidelines](https://github.com/ControlCore-Project/concore/blob/main/CONTRIBUTING.md)
+          - 📜 [Code of Conduct](https://github.com/ControlCore-Project/concore/blob/main/CODE_OF_CONDUCT.md)
+
+        pr_message: |
+          🎉 Welcome aboard, @${{ github.actor }}! Thank you for your first pull request in concore.
+
+          Please ensure that you are contributing to the **dev** branch.
+
+          Your contribution means a lot to us. We'll review it shortly.
+
+          Please ensure you have reviewed our:
+          - 📚 [Project Documentation](https://control-core.readthedocs.io/)
+          - 📘 [Contribution Guidelines](https://github.com/ControlCore-Project/concore/blob/main/CONTRIBUTING.md)
+          - 📜 [Code of Conduct](https://github.com/ControlCore-Project/concore/blob/main/CODE_OF_CONDUCT.md)
+
+          If you have any questions, feel free to ask. Happy coding!

.gitignore

@@ -1 +1,38 @@
-**/.DS_Store
+# Python bytecode/cache
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+*.py[cod]
+*.class
+*.so
+.Python
+
+# Virtual environments
+venv/
+env/
+ENV/
+.env/
+.venv/
+
+# IDE
+.vscode/
+.idea/
+
+# Build/packaging
+*.egg-info/
+dist/
+build/
+
+# Testing
+.pytest_cache/
+htmlcov/
+.coverage
+
+# Concore specific
+concorekill.bat
+
+.claude
+.codex
+.cursor
+_bmad

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.12
+    hooks:
+      - id: ruff
+        args: [--output-format=full]
+      - id: ruff-format

0mq/comm_node.py

@@ -1,25 +1,21 @@
 import concore
-import concore2
 
 concore.delay = 0.07
-concore2.delay = 0.07
-concore2.inpath = concore.inpath
-concore2.outpath = concore.outpath
-concore2.simtime = 0
+concore.simtime = 0
 concore.default_maxtime(100)
 init_simtime_u = "[0.0, 0.0, 0.0]"
 init_simtime_ym = "[0.0, 0.0, 0.0]"
 
 u = concore.initval(init_simtime_u)
-ym = concore2.initval(init_simtime_ym)
-while(concore2.simtime<concore.maxtime):
+ym = concore.initval(init_simtime_ym)
+while(concore.simtime<concore.maxtime):
     while concore.unchanged():
         u = concore.read(concore.iport['U'],"u",init_simtime_u)
     concore.write(concore.oport['U1'],"u",u)
     print(u)
-    old2 = concore2.simtime
-    while concore2.unchanged() or concore2.simtime <= old2:
-        ym = concore2.read(concore.iport['Y1'],"ym",init_simtime_ym)
-    concore2.write(concore.oport['Y'],"ym",ym)
-    print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore2.simtime))
+    old2 = float(concore.simtime)
+    while concore.unchanged() or concore.simtime <= old2:
+        ym = concore.read(concore.iport['Y1'],"ym",init_simtime_ym)
+    concore.write(concore.oport['Y'],"ym",ym)
+    print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
 print("retry="+str(concore.retrycount))