Merge branch 'dev' into fix/zmq-simtime-framing-382

Author: pradeeban

concore.hpp

@@ -279,6 +279,7 @@ class Concore{
      */
     vector<double> parser(string f){
         vector<double> temp;
+        if(f.empty()) return temp;
         string value = "";
 
         //Changing last bracket to comma to use comma as a delimiter
@@ -370,6 +371,10 @@ class Concore{
         s += ins;
 
         vector<double> inval = parser(ins);
+        if(inval.empty())
+            inval = parser(initstr);
+        if(inval.empty())
+            return inval;
         simtime = simtime > inval[0] ? simtime : inval[0];
 
         //returning a string with data excluding simtime
@@ -432,6 +437,10 @@ class Concore{
         s += ins;
 
         vector<double> inval = parser(ins);
+        if(inval.empty())
+            inval = parser(initstr);
+        if(inval.empty())
+            return inval;
         simtime = simtime > inval[0] ? simtime : inval[0];
 
         //returning a string with data excluding simtime
@@ -494,6 +503,7 @@ class Concore{
                     outfile<<val[i]<<',';
                 outfile<<val[val.size()-1]<<']';
                 outfile.close();
+                simtime += delta;
                 }
             else{
                 throw 505;
@@ -549,6 +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;
                 }
             else{
                 throw 505;

concore.v

@@ -296,6 +296,7 @@ module concore;
       end
      $fdisplay(fout,"]");
      $fclose(fout);
+     simtime = simtime + delta;
     end
   endtask
 

concore_write.m

@@ -5,6 +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;
      catch exc
          disp(['skipping ' concore.outpath num2str(port) '/' name]);
      end

concoredocker.java

@@ -62,7 +62,7 @@ public static void main(String[] args) {
             } else if (!sparams.isEmpty()) {
                 // Fallback: convert key=value,key=value format to dict
                 System.out.println("converting sparams: " + sparams);
-                sparams = "{'" + sparams.replaceAll(",", ",'").replaceAll("=", "':").replaceAll(" ", "") + "}";
+                sparams = "{'" + sparams.replaceAll(";", ",'").replaceAll("=", "':").replaceAll(" ", "") + "}";
                 System.out.println("converted sparams: " + sparams);
                 try {
                     Object parsed = literalEval(sparams);

concoredocker.py

@@ -283,6 +283,7 @@ def write(port_identifier, name, val, delta=0):
         try:
             zmq_val = convert_numpy_to_python(val)
             if isinstance(zmq_val, list):
+                # Prepend simtime to match file-based write behavior
                 payload = [simtime + delta] + zmq_val
                 zmq_p.send_json_with_retry(payload)
                 simtime += delta
@@ -292,7 +293,8 @@ def write(port_identifier, name, val, delta=0):
             logging.error(f"ZMQ write error on port {port_identifier} (name: {name}): {e}")
         except Exception as e:
             logging.error(f"Unexpected error during ZMQ write on port {port_identifier} (name: {name}): {e}")
-    
+        return
+
     try:
         file_port_num = int(port_identifier)
         file_path = os.path.join(outpath, str(file_port_num), name)

demo/cwrap.py

@@ -58,7 +58,6 @@
     except:
         init_simtime_ym = "[0.0, 0.0, 0.0]"
 
-print(apikey)
 print(yuyu)
 print(name1+'='+init_simtime_u)
 print(name2+'='+init_simtime_ym)
@@ -83,7 +82,7 @@
         u = concore.read(1,name1,init_simtime_u)
     f = {'file1': open(concore.inpath+'1/'+name1, 'rb')}
     print("CW: before post u="+str(u))
-    print('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2)
+    print('http://www.controlcore.org/pm/'+yuyu+'<APIKEY_HIDDEN>'+'&fetch='+name2)
     r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
     if r.status_code!=200:
         print("bad POST request "+str(r.status_code))

demo/pwrap.py

@@ -61,7 +61,6 @@
     except:
         init_simtime_ym = "[0.0, 0.0, 0.0]"
 
-print(apikey)
 print(yuyu)
 print(name1+'='+init_simtime_u)
 print(name2+'='+init_simtime_ym)

mkconcore.py

@@ -137,6 +137,11 @@ def _resolve_concore_path():
         return os.getcwd()
     return SCRIPT_DIR
 
+if len(sys.argv) < 4:
+    print("usage: py mkconcore.py file.graphml sourcedir outdir [type]")
+    print(" type must be posix (macos or ubuntu), windows, or docker")
+    sys.exit(1)
+
 GRAPHML_FILE = sys.argv[1]
 TRIMMED_LOGS = True
 CONCOREPATH = _resolve_concore_path()
@@ -202,11 +207,7 @@ def _resolve_concore_path():
     logging.error(f"{sourcedir} does not exist")
     quit()
 
-if len(sys.argv) < 4:
-    logging.error("usage: py mkconcore.py file.graphml sourcedir outdir [type]")
-    logging.error(" type must be posix (macos or ubuntu), windows, or docker")
-    quit()
-elif len(sys.argv) == 4:
+if len(sys.argv) == 4:
     prefixedgenode = outdir+"_" #nodes and edges prefixed with outdir_ only in case no type specified 3/24/21
     concoretype = "docker"
 else:
@@ -706,7 +707,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
-            dockername,langext = sourcecode.split(".")
+            dockername,langext = sourcecode.rsplit(".", 1)
             dockerfile_path = os.path.join(outdir, "src", f"Dockerfile.{dockername}")
             if not os.path.exists(dockerfile_path): # 3/30/21
                 try:
@@ -750,7 +751,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
-            dockername,langext = sourcecode.split(".")
+            dockername,langext = sourcecode.rsplit(".", 1)
             fbuild.write("mkdir docker-"+dockername+"\n")
             fbuild.write("cd docker-"+dockername+"\n")
             fbuild.write("cp ../src/Dockerfile."+dockername+" Dockerfile\n")
@@ -788,7 +789,7 @@ def cleanup_script_files():
                 # Use safe_container
                 frun.write(DOCKEREXE+' run --name='+safe_container+volswr[i]+volsro[i]+" "+DOCKEREPO+"/docker-"+shlex.quote(sourcecode)+"&\n")
             else:    
-                dockername,langext = sourcecode.split(".")
+                dockername,langext = sourcecode.rsplit(".", 1)
                 logging.debug(f"Generating Docker run command for {dockername}: {DOCKEREXE} run --name={containername+volswr[i]+volsro[i]} docker-{dockername}")
                 # Use safe_container
                 frun.write(DOCKEREXE+' run --name='+safe_container+volswr[i]+volsro[i]+" docker-"+shlex.quote(dockername)+"&\n")
@@ -800,8 +801,8 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            #dockername,langext = sourcecode.split(".")
-            dockername = sourcecode.split(".")[0] # 3/28/21
+            #dockername,langext = sourcecode.rsplit(".", 1)
+            dockername = sourcecode.rsplit(".", 1)[0] # 3/28/21
             safe_container = shlex.quote(containername)
             fstop.write(DOCKEREXE+' stop '+safe_container+"\n")
             fstop.write(DOCKEREXE+' rm '+safe_container+"\n")
@@ -813,7 +814,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 #scape volume path using shlex.quote for Docker commands (defense-in-depth)
@@ -833,7 +834,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 fmaxtime.write(' -v ')
@@ -850,7 +851,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 fmaxtime.write('sudo docker cp concore.maxtime concore:/')
@@ -876,7 +877,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 fparams.write(' -v ')
@@ -893,7 +894,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 fparams.write('sudo docker cp concore.params concore:/')
@@ -918,7 +919,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 funlock.write(' -v ')
@@ -935,7 +936,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0:
-            dockername = sourcecode.split(".")[0] #3/28/21
+            dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
             writeedges = volswr[i]
             while writeedges.find(":") != -1: 
                 funlock.write('sudo docker cp ~/concore.apikey concore:/')
@@ -955,7 +956,7 @@ def cleanup_script_files():
     for node in nodes_dict:
         containername,sourcecode = nodes_dict[node].split(':')
         if len(sourcecode)!=0 and sourcecode.find(".")!=-1: #3/28/21
-            dockername,langext = sourcecode.split(".")
+            dockername,langext = sourcecode.rsplit(".", 1)
             # safe_container added to debug line (POSIX)
             safe_container = shlex.quote(containername) 
             safe_image = shlex.quote("docker-" + dockername) # escape docker image name
@@ -984,7 +985,7 @@ def cleanup_script_files():
         if sourcecode.find(".")==-1:
             logging.error("cannot pull container "+sourcecode+" with control core type "+concoretype) #3/28/21
             quit()
-        dockername,langext = sourcecode.split(".")
+        dockername,langext = sourcecode.rsplit(".", 1)
         fbuild.write('mkdir '+containername+"\n")
         source_subdir = os.path.dirname(sourcecode).replace("\\", "/")
         if source_subdir:
@@ -1041,7 +1042,7 @@ def cleanup_script_files():
     containername,sourcecode = edges_dict[edges][0].split(':')
     outcount[nodes_num[edges_dict[edges][0]]] += 1
     if len(sourcecode)!=0:
-        dockername,langext = sourcecode.split(".")
+        dockername,langext = sourcecode.rsplit(".", 1)
         fbuild.write('cd '+containername+"\n")
         if concoretype=="windows":
             fbuild.write("mklink /J out"+str(outcount[nodes_num[edges_dict[edges][0]]])+" ..\\"+str(edges)+"\n")
@@ -1054,7 +1055,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername,langext = sourcecode.split(".")
+        dockername,langext = sourcecode.rsplit(".", 1)
         fbuild.write('cd '+containername+"\n")
         for pair in indir[i]:
             volname,dirname = pair.split(':/')
@@ -1075,7 +1076,7 @@ def cleanup_script_files():
 for node in nodes_dict:
   containername,sourcecode = nodes_dict[node].split(':')
   if len(sourcecode)!=0:
-      dockername,langext = sourcecode.split(".")
+      dockername,langext = sourcecode.rsplit(".", 1)
       if not (langext in ["py","m","sh","cpp","v"]): # 6/22/21
           logging.error(f"Extension .{langext} is unsupported")
           quit()
@@ -1191,7 +1192,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] # 3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] # 3/28/21
         if concoretype=="windows":
             q_container = f'"{containername}"'
             fstop.write('cmd /C '+q_container+"\\concorekill\n")
@@ -1209,7 +1210,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] #3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
         writeedges = volswr[i]
         while writeedges.find(":") != -1: 
             path_part = writeedges.split(":")[0].split("-v")[1].strip()
@@ -1229,7 +1230,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] #3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
         writeedges = volswr[i]
         while writeedges.find(":") != -1: 
             path_part = writeedges.split(":")[0].split("-v")[1].strip()
@@ -1247,7 +1248,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] #3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
         writeedges = volswr[i]
         while writeedges.find(":") != -1: 
             path_part = writeedges.split(":")[0].split("-v")[1].strip()
@@ -1265,7 +1266,7 @@ def cleanup_script_files():
 for node in nodes_dict:
     containername,sourcecode = nodes_dict[node].split(':')
     if len(sourcecode)!=0:
-        dockername = sourcecode.split(".")[0] #3/28/21
+        dockername = sourcecode.rsplit(".", 1)[0] #3/28/21
         writeedges = volswr[i]
         while writeedges.find(":") != -1: 
             path_part = writeedges.split(":")[0].split("-v")[1].strip()

pyproject.toml

@@ -7,14 +7,18 @@ name = "concore"
 version = "1.0.0"
 description = "Concore workflow management CLI"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = {text = "MIT"}
 dependencies = [
     "click>=8.0.0",
     "rich>=10.0.0",
     "beautifulsoup4>=4.9.0",
     "lxml>=4.6.0",
     "psutil>=5.8.0",
+    "numpy>=1.19.0",
+    "pyzmq>=22.0.0",
+    "scipy>=1.5.0",
+    "matplotlib>=3.3.0",
 ]
 
 [project.optional-dependencies]

ratc/cwrap.py

@@ -58,7 +58,6 @@
     except:
         init_simtime_ym = "[0.0, 0.0, 0.0]"
 
-print(apikey)
 print(yuyu)
 print(name1+'='+init_simtime_u)
 print(name2+'='+init_simtime_ym)
@@ -83,7 +82,7 @@
         u = concore.read(1,name1,init_simtime_u)
     f = {'file1': open(concore.inpath+'1/'+name1, 'rb')}
     print("CW: before post u="+str(u))
-    print('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2)
+    print('http://www.controlcore.org/pm/'+yuyu+'<APIKEY_HIDDEN>'+'&fetch='+name2)
     r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
     if r.status_code!=200:
         print("bad POST request "+str(r.status_code))