Merge remote-tracking branch 'origin/main'

Conflicts:
	.gitignore
	README.md

.gitignore

@@ -1,3 +1,4 @@
+# ---> Maven
 target/
 pom.xml.tag
 pom.xml.releaseBackup
@@ -9,6 +10,49 @@ buildNumber.properties
 .mvn/timing.properties
 # https://github.com/takari/maven-wrapper#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
+
+# Eclipse m2e generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+# ---> NetBeans
+**/nbproject/private/
+**/nbproject/Makefile-*.mk
+**/nbproject/Package-*.bash
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
 .settings
 .classpath
 .project

README.md

@@ -1,2 +1,4 @@
 # scheduler4e
+
+This is the repository of 4E scheduler moved from Alphien github.
 FourElements scheduler from release 2.1.2 plus source and target setup for java8

project/bldb/src/main/java/com/fe/client/SchedulerMgmt.java

@@ -84,6 +84,7 @@ import com.fourelementscapital.scheduler.error.ClientError;
 import com.fourelementscapital.scheduler.group.DirectRServeExecuteRUnix;
 import com.fourelementscapital.scheduler.group.REngineScriptTask;
 import com.fourelementscapital.scheduler.group.RServeUnixTask;
+import com.fourelementscapital.scheduler.group.PythonScriptTask;
 import com.fourelementscapital.scheduler.p2p.P2PService;
 import com.fourelementscapital.scheduler.p2p.listener.IncomingMessage;
 import com.fourelementscapital.scheduler.p2p.listener.P2PTransportMessage;
@@ -2716,6 +2717,11 @@ public class SchedulerMgmt extends AbstractTeamOrgMgmt {
 			rserve_p.add(RServeUnixTask.ENGINE_NAME);
 			rserve_p.add(RServeUnixTask.ENGINE_EXECUTER_UNIX_NAME);			//
 			rtn.put("rserve_unix_peers", sdb.getPeersList4Engine(rserve_p));
+
+			ArrayList python_p = new ArrayList();
+			python_p.add( PythonScriptTask.ENGINE_NAME ); 
+			rtn.put("python_peers", sdb.getPeersList4Engine(python_p));
+
 			rtn.put("peernotes", sdb.getPeersData());
 			
 			int last10sec=10000;

project/bldb/src/main/java/com/fe/svn/SVNSyncFile.java

@@ -340,12 +340,12 @@ private Logger log = LogManager.getLogger(SVNSync4RFunction.class.getName());
 	
 	public Long firstRevision(String function_name) throws Exception {
 		TreeSet<Long> rev=revisions(function_name);
-		return rev.size()>0?rev.first():0;
+		return rev.size()>0?rev.first():0L;
 	}
 	
 	public Long lastRevision(String function_name) throws Exception {
 		TreeSet<Long> rev=revisions(function_name);
-		return rev.size()>0?rev.last():0;
+		return rev.size()>0?rev.last():0L;
 	}
 	
 	public String getWhatChanged(String function_name, Long c_rev) throws Exception {

scheduler_libraries/lib-scheduler-engines/src/main/java/com/fourelementscapital/scheduler/engines/PythonScript.java

@@ -0,0 +1,117 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourelementscapital.scheduler.engines;
+
+import org.quartz.JobExecutionException;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+import com.fourelementscapital.scheduler.exception.SchedulerException;
+
+/**
+ *
+ * @author bernarto
+ */
+public abstract class PythonScript extends ScheduledTask {
+
+
+    public PythonScript(String name, String uid) {
+        super(name, uid);
+    }
+
+
+
+    @Override
+    public void execute(StackFrame sframe) throws JobExecutionException,
+                                                  SchedulerException,
+                                                  Exception {
+        if (sframe == null || sframe.getData() == null ||
+                              sframe.getData().get("rscript") == null ||
+                              sframe.getData().get("id") == null) {
+            return;
+        }
+        String script = (String)sframe.getData().get("rscript");
+
+        Number nid = (Number)sframe.getData().get("id");
+        File py = File.createTempFile( nid.intValue() + "-" +
+                                       sframe.getTrigger_time(), ".py");
+        try ( FileWriter writer = new FileWriter(py) ) {
+            writer.write( script );
+        }
+
+        StringBuilder sb = new StringBuilder(1024);
+        Process process = runPythonScript( py.getName() );
+        int exitcode = 0;
+        try ( InputStreamReader isr =
+                            new InputStreamReader(process.getInputStream()) ) {
+            try ( BufferedReader reader = new BufferedReader(isr) ) {
+
+                String line = reader.readLine();
+                while (line != null) {
+                    sb.append(line).append("\n");
+                    line = reader.readLine();
+                }
+            }
+        }
+        finally {
+            sframe.setConsole_message( sb.toString() );
+            exitcode = process.waitFor();
+            sframe.setTasklog(null);
+            py.delete();
+        }
+        if (exitcode != 0) {
+            throw new SyntaxError("Syntax errors in python script");
+        }
+    }
+
+
+
+    private Process runPythonScript(String scriptfile) throws IOException {
+        synchronized (this) {
+            getBuilder().command("python", scriptfile);
+            return getBuilder().start();
+        }
+    }
+
+
+
+    private ProcessBuilder getBuilder() {
+        ProcessBuilder local = null;
+        if ((local = _builder) == null) {
+            synchronized (this) {
+                if ((local = _builder) == null) {
+
+                    _builder = new ProcessBuilder();
+                    _builder.redirectErrorStream( true );
+//                        _builder.environment().put("PYTHONPATH", "");
+//                        _builder.environment().put("PYTHONHOME", "");
+                    String tmpdir = System.getProperty("java.io.tmpdir");
+                    if (tmpdir != null && tmpdir.length() > 0) {
+                        _builder.directory( new File(tmpdir) );
+                    }
+                }
+            }
+        }
+        return _builder;
+    }
+    private volatile ProcessBuilder _builder;
+
+
+
+    public class SyntaxError extends SchedulerException {
+
+        public SyntaxError(String msg) {
+            super(msg);
+        }
+
+        public int getErrorcode() {
+            return ERROR_SERVER_GENERAL_SCRIPT_ERROR;
+        }
+    }
+}

scheduler_libraries/lib-scheduler-engines/src/main/java/com/fourelementscapital/scheduler/group/PythonScriptTask.java

@@ -0,0 +1,77 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourelementscapital.scheduler.group;
+
+import com.fourelementscapital.db.vo.FlexiField;
+import com.fourelementscapital.scheduler.engines.PythonScript;
+import com.fourelementscapital.scheduler.engines.ScheduledTaskField;
+import java.util.Vector;
+/**
+ *
+ * @author bernarto
+ */
+public class PythonScriptTask extends PythonScript {
+    public static final String ENGINE_NAME = "pscript4pythonengine";
+ 
+    public PythonScriptTask(String name, String uid) {
+        super (name, uid);
+        try {
+            addFormFields( getMyFields() );
+	}
+        catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
+
+
+
+    protected Vector<ScheduledTaskField> getMyFields(){
+            Vector<ScheduledTaskField> fields = new Vector<>();
+
+            //list
+            ScheduledTaskField f3 = new ScheduledTaskField();
+            f3.setShortname( "rscript_param" );
+            f3.setFieldlabel("");
+            f3.setFieldtype( FlexiField.TYPE_RSCRIPTEDITOR_PARAM );
+            f3.setPlacementform( "codeinject" );
+            fields.add( f3 );
+
+            ScheduledTaskField f4 = new ScheduledTaskField();
+            f4.setShortname( "rscript" );
+            f4.setFieldlabel( "Python Script" );
+            f4.setFieldtype( FlexiField.TYPE_RSCRIPTEDITOR );
+            fields.add(f4);
+
+            fields.addAll( getAdditionalRScriptField() );
+            return fields;
+
+    }
+
+
+
+    public Vector<ScheduledTaskField> getAdditionalRScriptField(){
+            Vector<ScheduledTaskField> fields = new Vector<>();
+
+            ScheduledTaskField f5=new ScheduledTaskField();
+            f5.setShortname( "trigger_commodity" );
+            f5.setFieldlabel( "Trigger Commodity" );
+            f5.setFieldtype( FlexiField.TYPE_TEXTBOX );
+            f5.setFineprint( "Building block which fixing time defines the "
+                + "trigger time for Zero-day lag indicators e.g: CL,C,JNso");
+            f5.setPlacementform( "buildingblock" );
+            fields.add( f5 );
+
+            ScheduledTaskField f6 = new ScheduledTaskField();
+            f6.setShortname( "trigger_frequency" );
+            f6.setFieldlabel( "Trigger Frequency" );
+            f6.setFieldtype( FlexiField.TYPE_TEXTBOX );
+            f6.setFineprint( "Specific Intervals: 1/3 (starting at 1 and every 3 minutes)" );
+            f6.setPlacementform( "buildingblock" );
+            fields.add( f6 );
+
+            return fields;
+    }
+}

scheduler_libraries/lib-scheduler-queue/src/main/java/com/fourelementscapital/scheduler/ScheduledTaskFactory.java

@@ -20,6 +20,7 @@ import com.fourelementscapital.db.SchedulerDB;
 import com.fourelementscapital.scheduler.engines.ScheduledTask;
 import com.fourelementscapital.scheduler.group.BBDownloadScheduledTask;
 import com.fourelementscapital.scheduler.group.DirectRServeExecuteRUnix;
+import com.fourelementscapital.scheduler.group.PythonScriptTask;
 import com.fourelementscapital.scheduler.group.REngineScriptTask;
 import com.fourelementscapital.scheduler.group.RScriptScheduledTask;
 import com.fourelementscapital.scheduler.group.RServeScheduledTask;
@@ -38,7 +39,8 @@ public class ScheduledTaskFactory {
 		init();
 	}
 
-	public synchronized void refreshTaskLoaded(){
+	//public synchronized void refreshTaskLoaded(){
+	public void refreshTaskLoaded(){
 		synchronized(scheduledTasks){
 			if(allTasks.size()>0 || scheduledTasks.size()>0){
 				allTasks.clear();
@@ -58,37 +60,38 @@ public class ScheduledTaskFactory {
 				
 				Vector venabled=SchedulerEngine.getEnabledTaskTypes();
 	  
-				 SchedulerDB sdb=SchedulerDB.getSchedulerDB();		
-				    try{
-				    	sdb.connectDB();
-				    	Vector allgroups=sdb.getAllGroups();
-				    	for(Iterator i=allgroups.iterator();i.hasNext();){
-				    		
-				    		Map data=(Map)i.next();
-				    		String taskuid=(String)data.get("taskuid");
-				    		String name=(String)data.get("name");
-				    		String enginetype=(String)data.get("enginetype");			    		
-				    		ScheduledTask st=null;			    		
-				    		if(enginetype.equalsIgnoreCase("rscript")){st=new RScriptScheduledTask(name,taskuid); }
-				    		if(enginetype.equalsIgnoreCase("rscript4rserve")){st=new RServeScheduledTask(name,taskuid); }
-				    		if(enginetype.equalsIgnoreCase("bb_download")){st=new BBDownloadScheduledTask(name,taskuid); }
-				    		if(enginetype.equalsIgnoreCase(RServeUnixTask.ENGINE_NAME)){st=new RServeUnixTask(name,taskuid); }
-				    		if(enginetype.equalsIgnoreCase("direct_script")){st=new REngineScriptTask(name,taskuid); }		
-				    		if(enginetype.equalsIgnoreCase("direct_script_unix")){st=new DirectRServeExecuteRUnix(name,taskuid);}
-				    		//if(enginetype.equalsIgnoreCase("rscript4rconsole")){st=new RConsoleScript(name,taskuid);}
-				    		
-				    		if(st!=null){
-				    			allTasks.add(st);
-				    		}
-				    	}
-					
-				    }catch(Exception e){
-				    	
-				    }finally{
-				    	try{
-				    		sdb.closeDB();
-				    	}catch(Exception e){}
-				    }
+				SchedulerDB sdb=SchedulerDB.getSchedulerDB();		
+			    try{
+			    	sdb.connectDB();
+			    	Vector allgroups=sdb.getAllGroups();
+			    	for(Iterator i=allgroups.iterator();i.hasNext();){
+			    		
+			    		Map data=(Map)i.next();
+			    		String taskuid=(String)data.get("taskuid");
+			    		String name=(String)data.get("name");
+			    		String enginetype=(String)data.get("enginetype");			    		
+			    		ScheduledTask st=null;			    		
+			    		if(enginetype.equalsIgnoreCase("rscript")){st=new RScriptScheduledTask(name,taskuid); }
+			    		if(enginetype.equalsIgnoreCase("rscript4rserve")){st=new RServeScheduledTask(name,taskuid); }
+			    		if(enginetype.equalsIgnoreCase("bb_download")){st=new BBDownloadScheduledTask(name,taskuid); }
+			    		if(enginetype.equalsIgnoreCase(RServeUnixTask.ENGINE_NAME)){st=new RServeUnixTask(name,taskuid); } //rscript4rserveunix
+			    		if(enginetype.equalsIgnoreCase("direct_script")){st=new REngineScriptTask(name,taskuid); }		
+			    		if(enginetype.equalsIgnoreCase("direct_script_unix")){st=new DirectRServeExecuteRUnix(name,taskuid);}
+			    		if(enginetype.equalsIgnoreCase(PythonScriptTask.ENGINE_NAME)){st=new PythonScriptTask(name,taskuid);}
+                                        //if(enginetype.equalsIgnoreCase("rscript4rconsole")){st=new RConsoleScript(name,taskuid);}
+			    		
+			    		if(st!=null){
+			    			allTasks.add(st);
+			    		}
+			    	}
+				
+			    }catch(Exception e){
+			    	e.printStackTrace();
+			    }finally{
+			    	try{
+			    		sdb.closeDB();
+			    	}catch(Exception e){}
+			    }
 	 			 
 	
 				

scheduler_libraries/lib-scheduler-queue/src/main/java/com/fourelementscapital/scheduler/peer/QueueFactory.java

@@ -15,6 +15,9 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.Vector;
 
+import java.util.Set;
+
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -25,6 +28,7 @@ import com.fourelementscapital.scheduler.engines.ScheduledTask;
 import com.fourelementscapital.scheduler.engines.StackFrame;
 import com.fourelementscapital.scheduler.p2p.P2PService;
 import com.fourelementscapital.scheduler.p2p.peer.PeerSpecificConfigurations;
+import com.fourelementscapital.scheduler.exception.ExceptionPeerRejected;
 
 public class QueueFactory {
 	
@@ -43,16 +47,18 @@ public class QueueFactory {
 	 
 	public QueueFactory(){
 		if(queueHandlers.size()==0){		
-			initQueue();			
+			initQueue();
 		}
 	}
 
 	
 	public QueueAbstract getQueue(String taskuid){
+		QueueAbstract queueAbs = (QueueAbstract)queueHandlers.get(taskuid);
 		return (QueueAbstract)queueHandlers.get(taskuid);
 	}
 	
 	public TreeMap getQueue(){
+		
 		return queueHandlers;
 	}
 
@@ -144,17 +150,16 @@ public class QueueFactory {
 	}
 	
 	private void initQueue(){
-	
 		SchedulerDB sdb=SchedulerDB.getSchedulerDB();
 		try{		
 			sdb.connectDB();			
 			sdb.removeAllPeerThreadStatus(P2PService.getComputerName());
+			
 		}catch(Exception e){ }finally{
 			try{sdb.closeDB();}catch(Exception e1){}
 		}
-		
 		//over-rides
-		QueueAbstract rserv=new QueueAbstract("rserv"){
+		QueueAbstract rserv=new QueueAbstract("rserv"){		/////////////////////////////////////////////////////////////////////////
 			public Vector getTaskUids(){
 				Vector v=new Vector();
 				
@@ -203,7 +208,6 @@ public class QueueFactory {
 		};
 		add2Qhandler(rserv);
 		
-		
 		//over-rides
 		QueueAbstract rservunix=new QueueAbstract("rservunix"){
 			public Vector getTaskUids(){
@@ -245,8 +249,45 @@ public class QueueFactory {
 			}
 		};
 		add2Qhandler(rservunix);
-		
+
+
 		//over-rides
+		QueueAbstract cpythonlinux = new QueueAbstract("cpythonlinux") {
+
+                    @Override
+                    public Vector getTaskUids() {
+                        Vector result = new Vector();
+
+                        SchedulerDB sdb = SchedulerDB.getSchedulerDB();
+                        try {
+                            sdb.connectDB();
+                            Vector< Map<String, String> > grp = sdb.getGroups( "pscript4pythonengine" );
+                            for (Map<String, String> data : grp) {
+                                result.add( data.get( "taskuid" ) );
+                            }
+                        }
+                        catch (Exception e) {
+                        }
+                        finally {
+                            try {
+                                sdb.closeDB();
+                            }
+                            catch (Exception e1) {
+                            }
+                        }
+                        return result;
+                    }
+
+                    @Override
+                    public int getConcurrentThreads() {
+                        int result = 15; // For now
+                        return result;
+                    }
+		};
+		add2Qhandler(cpythonlinux);
+
+
+                //over-rides
 		QueueAbstract rscript=new QueueAbstract("rscript"){
 			public Vector getTaskUids(){
 				Vector v=new Vector();
@@ -278,9 +319,8 @@ public class QueueFactory {
 				return 1;
 			}			
 		};
-		
 		add2Qhandler(rscript);		
-				
+		
 		QueueAbstract othercripts=new QueueAbstract("othercripts"){
 			public Vector getTaskUids(){
 				Vector v=new Vector();
@@ -297,12 +337,13 @@ public class QueueFactory {
 				return 1;
 			}
 		};
-		add2Qhandler(othercripts);
 		
+		add2Qhandler(othercripts);
 	}
 	
 	
 	private void add2Qhandler(QueueAbstract qa){
+		
 		for(Iterator i=qa.getTaskUids().iterator();i.hasNext();){
 			queueHandlers.put(i.next(), qa);
 		}