Merge pull request #161 from rostilos/1.5.5-rc

newrelic preparation for inference-orchestrator.

Author: rostilos

deployment/build/development-build.sh

@@ -29,7 +29,7 @@ echo "--- 1. Ensuring frontend submodule is synchronized ---"
 echo "--- 2. Injecting Environment Configurations ---"
 
 echo "Copying inference-orchestrator .env..."
-cp "$CONFIG_PATH/inference-orchestrator/.env" "python-ecosystem/inference-orchestrator/.env"
+cp "$CONFIG_PATH/inference-orchestrator/.env" "python-ecosystem/inference-orchestrator/src/.env"
 
 echo "Copying rag-pipeline .env..."
 cp "$CONFIG_PATH/rag-pipeline/.env" "python-ecosystem/rag-pipeline/.env"
@@ -43,11 +43,11 @@ echo "--- 3. Building Java Artifacts (mvn clean package) ---"
 (cd "$JAVA_DIR" && mvn clean package -DskipTests)
 
 echo "--- 4. MCP Servers jar update ---"
-cp "$MCP_SERVERS_JAR_PATH" python-ecosystem/inference-orchestrator/codecrow-vcs-mcp-1.0.jar
+cp "$MCP_SERVERS_JAR_PATH" python-ecosystem/inference-orchestrator/src/codecrow-vcs-mcp-1.0.jar
 
 echo "--- 4.1. Platform MCP jar update ---"
 if [ -f "$PLATFORM_MCP_JAR_PATH" ]; then
-    cp "$PLATFORM_MCP_JAR_PATH" python-ecosystem/inference-orchestrator/codecrow-platform-mcp-1.0.jar
+    cp "$PLATFORM_MCP_JAR_PATH" python-ecosystem/inference-orchestrator/src/codecrow-platform-mcp-1.0.jar
     echo "Platform MCP JAR copied successfully."
 else
     echo "Warning: Platform MCP JAR not found at $PLATFORM_MCP_JAR_PATH"

deployment/build/production-build.sh

@@ -29,7 +29,7 @@ echo "Frontend at: $(cd "$FRONTEND_DIR" && git log --oneline -1)"
 echo "--- 2. Injecting Environment Configurations ---"
 
 echo "Copying inference-orchestrator .env..."
-cp "$CONFIG_PATH/inference-orchestrator/.env" "python-ecosystem/inference-orchestrator/.env"
+cp "$CONFIG_PATH/inference-orchestrator/.env" "python-ecosystem/inference-orchestrator/src/.env"
 
 echo "Copying rag-pipeline .env..."
 cp "$CONFIG_PATH/rag-pipeline/.env" "python-ecosystem/rag-pipeline/.env"
@@ -43,11 +43,11 @@ echo "--- 3. Building Java Artifacts (mvn clean package) ---"
 (cd "$JAVA_DIR" && mvn clean package)
 
 echo "--- 4. MCP Servers jar update ---"
-cp "$MCP_SERVERS_JAR_PATH" python-ecosystem/inference-orchestrator/codecrow-vcs-mcp-1.0.jar
+cp "$MCP_SERVERS_JAR_PATH" python-ecosystem/inference-orchestrator/src/codecrow-vcs-mcp-1.0.jar
 
 echo "--- 4.1. Platform MCP jar update ---"
 if [ -f "$PLATFORM_MCP_JAR_PATH" ]; then
-    cp "$PLATFORM_MCP_JAR_PATH" python-ecosystem/inference-orchestrator/codecrow-platform-mcp-1.0.jar
+    cp "$PLATFORM_MCP_JAR_PATH" python-ecosystem/inference-orchestrator/src/codecrow-platform-mcp-1.0.jar
     echo "Platform MCP JAR copied successfully."
 else
     echo "Warning: Platform MCP JAR not found at $PLATFORM_MCP_JAR_PATH"

deployment/ci/ci-build.sh

@@ -34,8 +34,8 @@ echo "=========================================="
 echo "--- 1. Writing .env files from CI secrets ---"
 
 if [ -n "${ENV_INFERENCE_ORCHESTRATOR:-}" ]; then
-  echo "$ENV_INFERENCE_ORCHESTRATOR" > python-ecosystem/inference-orchestrator/.env
-  echo "  ✓ inference-orchestrator/.env written"
+  echo "$ENV_INFERENCE_ORCHESTRATOR" > python-ecosystem/inference-orchestrator/src/.env
+  echo "  ✓ inference-orchestrator/src/.env written"
 fi
 
 if [ -n "${ENV_RAG_PIPELINE:-}" ]; then
@@ -55,11 +55,11 @@ echo "  ✓ Java build & tests complete"
 
 # ── 3. Copy MCP JARs ──────────────────────────────────────────────────────
 echo "--- 3. Copying MCP server JARs ---"
-cp "$MCP_JAR" python-ecosystem/inference-orchestrator/codecrow-vcs-mcp-1.0.jar
+cp "$MCP_JAR" python-ecosystem/inference-orchestrator/src/codecrow-vcs-mcp-1.0.jar
 echo "  ✓ VCS MCP JAR copied"
 
 if [ -f "$PLATFORM_MCP_JAR" ]; then
-  cp "$PLATFORM_MCP_JAR" python-ecosystem/inference-orchestrator/codecrow-platform-mcp-1.0.jar
+  cp "$PLATFORM_MCP_JAR" python-ecosystem/inference-orchestrator/src/codecrow-platform-mcp-1.0.jar
   echo "  ✓ Platform MCP JAR copied"
 else
   echo "  ⚠ Platform MCP JAR not found (optional)"
@@ -71,7 +71,7 @@ echo "--- 4. Building Docker images ---"
 IMAGES=(
   "codecrow/web-server|java-ecosystem/services/web-server|Dockerfile.observable"
   "codecrow/pipeline-agent|java-ecosystem/services/pipeline-agent|Dockerfile.observable"
-  "codecrow/inference-orchestrator|python-ecosystem/inference-orchestrator"
+  "codecrow/inference-orchestrator|python-ecosystem/inference-orchestrator/src|Dockerfile.observable"
   "codecrow/rag-pipeline|python-ecosystem/rag-pipeline"
   "codecrow/web-frontend|frontend"
 )

deployment/ci/server-deploy.sh

@@ -46,6 +46,7 @@ for cfg in \
   "$CONFIG_DIR/java-shared/newrelic-web-server.yml" \
   "$CONFIG_DIR/java-shared/newrelic-pipeline-agent.yml" \
   "$CONFIG_DIR/inference-orchestrator/.env" \
+  "$CONFIG_DIR/inference-orchestrator/newrelic.ini" \
   "$CONFIG_DIR/rag-pipeline/.env"; do
   if [ ! -f "$cfg" ]; then
     echo "ERROR: Missing config file: $cfg"

deployment/ci/server-init.sh

@@ -83,6 +83,27 @@ SAMPLE
   fi
 done
 
+# New Relic config for inference-orchestrator (Python agent)
+NR_INI="$DEPLOY_DIR/config/inference-orchestrator/newrelic.ini"
+if [ ! -f "$NR_INI" ]; then
+  cat > "$NR_INI" <<'SAMPLE'
+# ============================================================================
+# New Relic Python agent config for inference-orchestrator
+# See https://docs.newrelic.com/docs/apm/agents/python-agent/configuration/python-agent-configuration/
+# Copy your newrelic.ini here with your license_key and app_name
+# ============================================================================
+[newrelic]
+license_key = REPLACE_WITH_YOUR_LICENSE_KEY
+app_name = CodeCrow Inference Orchestrator
+monitor_mode = true
+log_level = info
+SAMPLE
+  echo "  ✓ Created placeholder: inference-orchestrator/newrelic.ini"
+  echo "    → EDIT THIS FILE with your New Relic license key!"
+else
+  echo "  ○ inference-orchestrator/newrelic.ini already exists (skipped)"
+fi
+
 # Docker Compose .env (DB creds, internal secrets — never committed to git)
 ENV_FILE="$DEPLOY_DIR/.env"
 if [ ! -f "$ENV_FILE" ]; then
@@ -126,7 +147,8 @@ echo "      │   ├── newrelic-pipeline-agent.yml   ← YOUR New Relic con
 echo "      │   └── github-private-key/"
 echo "      │       └── *.pem               ← YOUR GitHub App key"
 echo "      ├── inference-orchestrator/"
-echo "      │   └── .env                    ← YOUR secrets"
+echo "      │   ├── .env                    ← YOUR secrets"
+echo "      │   └── newrelic.ini             ← YOUR New Relic Python agent config"
 echo "      └── rag-pipeline/"
 echo "          └── .env                    ← YOUR secrets"
 echo ""

deployment/docker-compose.prod.yml

@@ -185,6 +185,7 @@ services:
       - codecrow-network
     volumes:
       - ./config/inference-orchestrator/.env:/app/.env
+      - ./config/inference-orchestrator/newrelic.ini:/app/newrelic.ini:ro
     restart: unless-stopped
     extra_hosts:
       - "host.docker.internal:host-gateway"

deployment/docker-compose.yml

@@ -168,7 +168,7 @@ services:
 
   inference-orchestrator:
     build:
-      context: ../python-ecosystem/inference-orchestrator
+      context: ../python-ecosystem/inference-orchestrator/src
     container_name: codecrow-inference-orchestrator
     ports:
       - "127.0.0.1:8000:8000"

frontend

@@ -0,0 +1,18 @@
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+.env
+server.log
+*.jar
+
+logs/**
+**/__pycache__/ 
+newrelic.ini