Merge branch 'dev' into refactor/consolidate-pidmayuresh-378

Author: pradeeban

.gitignore

@@ -1,12 +1,19 @@
-# Python
+# Python bytecode/cache
 __pycache__/
+*.pyc
+*.pyo
+*.pyd
 *.py[cod]
 *.class
 *.so
 .Python
+
+# Virtual environments
 venv/
 env/
 ENV/
+.env/
+.venv/
 
 # IDE
 .vscode/

0mq/funbody.py

@@ -1,5 +1,6 @@
 import concore
 import time
+import sys
 from osparc_control import CommandManifest
 from osparc_control import CommandParameter
 from osparc_control import CommandType
@@ -58,7 +59,7 @@
            request_id=command.request_id, payload=ym)
     else:
         print("undefined action"+str(command.action)) 
-        quit()
+        sys.exit(1)
     #concore.write(concore.oport['Y1'],"ym",ym)
     print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
 paired_transmitter.stop_background_sync()

concore.hpp

@@ -503,7 +503,7 @@ class Concore{
                     outfile<<val[i]<<',';
                 outfile<<val[val.size()-1]<<']';
                 outfile.close();
-                simtime += delta;
+                // simtime must not be mutated here (issue #385).
                 }
             else{
                 throw 505;
@@ -559,7 +559,7 @@ class Concore{
                 outfile<<val[val.size()-1]<<']';
                 std::string result = outfile.str();
                 std::strncpy(sharedData_create, result.c_str(), 256 - 1);
-                simtime += delta;
+                // simtime must not be mutated here (issue #385).
                 }
             else{
                 throw 505;

concore.py

@@ -382,7 +382,8 @@ def write(port_identifier, name, val, delta=0):
                 # Prepend simtime to match file-based write behavior
                 payload = [simtime + delta] + zmq_val
                 zmq_p.send_json_with_retry(payload)
-                simtime += delta
+                # simtime must not be mutated here.
+                # Mutation breaks cross-language determinism (see issue #385).
             else:
                 zmq_p.send_json_with_retry(zmq_val)
         except zmq.error.ZMQError as e:
@@ -413,7 +414,8 @@ def write(port_identifier, name, val, delta=0):
                 val_converted = convert_numpy_to_python(val)
                 data_to_write = [simtime + delta] + val_converted
                 outfile.write(str(data_to_write))
-                simtime += delta 
+                # simtime must not be mutated here.
+                # Mutation breaks cross-language determinism (see issue #385).
             else: 
                 outfile.write(val)
     except Exception as e:

concore.v

@@ -296,7 +296,7 @@ module concore;
       end
      $fdisplay(fout,"]");
      $fclose(fout);
-     simtime = simtime + delta;
+     // simtime must not be mutated here (issue #385).
     end
   endtask
 

concore_cli/commands/validate.py

@@ -117,7 +117,14 @@ def finalize():
                     warnings.append(f"Node {node_id} has no label")
             except Exception as e:
                 warnings.append(f"Error parsing node: {str(e)}")
-        
+
+        # duplicate labels cause silent corruption in mkconcore.py
+        seen = set()
+        for label in node_labels:
+            if label in seen:
+                errors.append(f"Duplicate node label: '{label}'")
+            seen.add(label)
+
         node_ids = {node.get('id') for node in nodes if node.get('id')}
         for edge in edges:
             source = edge.get('source')

concore_write.m

@@ -5,7 +5,7 @@ function concore_write(port, name, val, delta)
          outstr = cat(2,"[",num2str(concore.simtime+delta),num2str(val,",%e"),"]");
          fprintf(output1,'%s',outstr);
          fclose(output1);
-         concore.simtime = concore.simtime + delta;
+         % simtime must not be mutated here (issue #385).
      catch exc
          disp(['skipping ' concore.outpath num2str(port) '/' name]);
      end

concoredocker.hpp

@@ -138,7 +138,7 @@ class Concore {
 
     std::vector<std::string> read(int port, const std::string& name, const std::string& initstr) {
         std::this_thread::sleep_for(std::chrono::seconds(delay));
-        std::string file_path = inpath + std::to_string(port) + "/" + name;
+        std::string file_path = inpath + "/" + std::to_string(port) + "/" + name;
         std::ifstream infile(file_path);
         std::string ins;
 
@@ -151,6 +151,7 @@ class Concore {
         int attempts = 0, max_retries = 5;
         while (ins.empty() && attempts < max_retries) {
             std::this_thread::sleep_for(std::chrono::seconds(delay));
+            infile.close();
             infile.open(file_path);
             if (infile) std::getline(infile, ins);
             attempts++;
@@ -175,7 +176,7 @@ class Concore {
     }
 
     void write(int port, const std::string& name, const std::vector<std::string>& val, int delta = 0) {
-        std::string file_path = outpath + std::to_string(port) + "/" + name;
+        std::string file_path = outpath + "/" + std::to_string(port) + "/" + name;
         std::ofstream outfile(file_path);
         if (!outfile) {
             std::cerr << "Error writing to " << file_path << "\n";