Merge pull request #195 from pwgit-create/develop

pwgit-create · web-flow · commit fb7769590c78 · 2024-08-30T00:41:48.000+02:00
Version 2.1
diff --git a/AppWish/AppWish/dependency-reduced-pom.xml b/AppWish/AppWish/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>pn.dev</groupId>
   <artifactId>code-generator-gui-ollama</artifactId>
   <name>CodeGenerator-GUI</name>
-  <version>2.0.5</version>
+  <version>2.1</version>
   <description>The GUI interface for the pn.dev.code-generator-ollama library</description>
   <inceptionYear>2024</inceptionYear>
   <developers>
diff --git a/AppWish/AppWish/pom.xml b/AppWish/AppWish/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>pn.dev</groupId>
     <artifactId>code-generator-gui-ollama</artifactId>
-    <version>2.0.5</version>
+    <version>2.1</version>
     <name>CodeGenerator-GUI</name>
 
 
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>pn.dev</groupId>
             <artifactId>code-generator-ollama</artifactId>
-            <version>2.0.5</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/constant/AboutConstants.java b/AppWish/AppWish/src/main/java/pn/app_wish/constant/AboutConstants.java
@@ -3,8 +3,8 @@
 
 public record AboutConstants() {
 
-    private static final String APP_WISH_VERSION = "Appwish Enterprise 2.0.5";
-    private static final String ABOUT_APP_WISH = "AppWish (2) is a open source project that creates Java applications from text input with the help of AI models";
+    private static final String APP_WISH_VERSION = "Appwish Enterprise 2.1";
+    private static final String ABOUT_APP_WISH = "AppWish 2 is a open source project that creates Java applications from text input with the help of AI models";
     private static final String DEVELOPED_BY = "Pwgit-Create / Peter Westin";
     private static final String CONTACT = "\nEmail: snow_900@outlook.com";
     private static final String LINK_TO_DISCUSSION = "https://github.com/pwgit-create/APPWISH_OLLAMA/discussions";
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/constant/StaticAppWishConstants.java b/AppWish/AppWish/src/main/java/pn/app_wish/constant/StaticAppWishConstants.java
@@ -3,8 +3,11 @@
 public record StaticAppWishConstants() {
     public static final String BASH_PATH = "/bin/bash";
     public static final String C_ARGUMENT = "-c";
+    public static final String CP_ARGUMENT="-cp ";
     public static final String JAVA_TEXT = "java ";
 
+    public static final String CP_PATH= ".:external_libs/* " ;
+
 
     public static final String MAIN_TEXT="Main";
     public static final String MAIN_DOT_JAVA="Main.java";
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/controller/AppHistoryController.java b/AppWish/AppWish/src/main/java/pn/app_wish/controller/AppHistoryController.java
@@ -17,7 +17,8 @@
 import pn.app_wish.AppWish;
 import pn.app_wish.constant.AboutConstants;
 import pn.app_wish.constant.GUIConstants;
-import pn.app_wish.constant.StaticAppWishConstants;
+
+import pn.app_wish.model.AppCmd;
 import pn.app_wish.util.AppWishUtil;
 import pn.cg.datastorage.constant.PathConstants;
 
@@ -26,7 +27,7 @@
 import java.net.URL;
 
 import java.nio.file.Files;
-import java.nio.file.Path;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -85,7 +86,8 @@ private void handleSelectButtonAction(ActionEvent ae) {
             final String r2 = ".java";
             final String executePath = selectedFile.getAbsolutePath().replace(r1, r2);
 
-            processBuilder = new ProcessBuilder(BASH_PATH, C_ARGUMENT, JAVA_TEXT + executePath);
+
+            processBuilder = new ProcessBuilder(new AppCmd(executePath).GetCMDForRunningApp_Application());
             executingJavaAppProcess = processBuilder.inheritIO().start();
         } catch (IOException e) {
             System.out.println("RuntimeException while starting Java executable");
@@ -195,7 +197,7 @@ private void deleteJavaApp(File classFileOfApplication) {
             try {
 
                 // Delete the Class File of the chosen application
-                Files.delete(classFileOfApplication.toPath());
+                Files.deleteIfExists(classFileOfApplication.toPath());
                 log.info("The class file of your selected application has been deleted");
             } catch (IOException e) {
 
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/model/AppCmd.java b/AppWish/AppWish/src/main/java/pn/app_wish/model/AppCmd.java
@@ -1,10 +1,20 @@
 package pn.app_wish.model;
+
 import pn.app_wish.constant.StaticAppWishConstants;
+import pn.app_wish.util.AppWishUtil;
+
 
 public record AppCmd(String javaExecutablePath) {
 
     public final String[] GetCMDForRunningApp_Application() {
 
-        return new String[]{StaticAppWishConstants.BASH_PATH,StaticAppWishConstants.C_ARGUMENT, StaticAppWishConstants.JAVA_TEXT + javaExecutablePath};
+        boolean isExternalLibraries = AppWishUtil.isExternalLibrariesBeingUsed();
+        if (isExternalLibraries) {
+            return new String[]{StaticAppWishConstants.BASH_PATH, StaticAppWishConstants.C_ARGUMENT, StaticAppWishConstants.JAVA_TEXT + StaticAppWishConstants.CP_ARGUMENT + StaticAppWishConstants.CP_PATH + javaExecutablePath};
+
+        } else {
+            return new String[]{StaticAppWishConstants.BASH_PATH, StaticAppWishConstants.C_ARGUMENT, StaticAppWishConstants.JAVA_TEXT + javaExecutablePath};
+
+        }
     }
 }
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/util/AppWishUtil.java b/AppWish/AppWish/src/main/java/pn/app_wish/util/AppWishUtil.java
@@ -1,5 +1,6 @@
 package pn.app_wish.util;
 
+import pn.cg.datastorage.CodeGeneratorConfig;
 import pn.cg.datastorage.DataStorage;
 import pn.cg.datastorage.constant.PathConstants;
 
@@ -80,5 +81,20 @@ public final static void deleteTmpCodeBaseFiles(){
                 }
             });
         }}
+
+    /**
+     * See if external libraries are used or not. Will also create a new CodeGenerator config
+     * in case no code generation has occurred in the session previously
+     * @return boolean
+     */
+    public final static boolean isExternalLibrariesBeingUsed(){
+
+        if(DataStorage.getInstance().getCodeGeneratorConfig() == null) {
+          final CodeGeneratorConfig codeGeneratorConfig = new CodeGeneratorConfig();
+            DataStorage.getInstance().setCodeGeneratorConfig(codeGeneratorConfig);}
+
+       return DataStorage.getInstance().getCodeGeneratorConfig().isUSE_EXTERNAL_LIBRARIES();
     }
 
+}
+
diff --git a/AppWish/AppWish/src/main/resources/config.props b/AppWish/AppWish/src/main/resources/config.props
@@ -2,3 +2,4 @@ NUM_CTX=2048
 TOP_K=40
 NUM_PREDICT=-1
 TEMPERATURE=0.8
+USE_EXTERNAL_LIBRARIES=off
diff --git a/AppWish/AppWish/src/main/resources/scripts/compile_class_with_external_classpath.sh b/AppWish/AppWish/src/main/resources/scripts/compile_class_with_external_classpath.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+javac -cp .:external_libs/* $1 2>&1 | tee
+
diff --git a/cg/CodeGenerator/CodeGenerator/dependency-reduced-pom.xml b/cg/CodeGenerator/CodeGenerator/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>pn.dev</groupId>
   <artifactId>code-generator-ollama</artifactId>
-  <version>2.0.5</version>
+  <version>2.1</version>
   <description>The Java Application-Generator (pn.dev.code-generator-ollama) creates applications by giving a string of your desired features for a Java application, like this: AppSystem.StartCodeGenerator(String appWish)</description>
   <inceptionYear>2024</inceptionYear>
   <developers>
diff --git a/cg/CodeGenerator/CodeGenerator/pom.xml b/cg/CodeGenerator/CodeGenerator/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>pn.dev</groupId>
     <artifactId>code-generator-ollama</artifactId>
-    <version>2.0.5</version>
+    <version>2.1</version>
 
 
     <description>The Java Application-Generator (pn.dev.code-generator-ollama) creates applications by giving a string of your desired features for a Java application, like this: AppSystem.StartCodeGenerator(String appWish)</description>
diff --git a/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/app_system/code_generation/ClassCompiler.java b/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/app_system/code_generation/ClassCompiler.java
@@ -11,7 +11,6 @@
 import pn.cg.util.TaskUtil;
 
 
-import java.nio.file.Path;
 import java.util.concurrent.ExecutorService;
 
 public class ClassCompiler {
@@ -23,7 +22,8 @@ public ClassCompiler() {
 
     /**
      * Tries to compile a file with java source code into byte code
-     * @param className Class name of the class that we will try to compile
+     *
+     * @param className   Class name of the class that we will try to compile
      * @param superAppDir A String path that will be provided if it is a super app generation and left as null if not
      */
     private final void compile(String className, String superAppDir) {
@@ -35,35 +35,49 @@ private final void compile(String className, String superAppDir) {
 
         ExecutorService executor = ThreadPoolMaster.getInstance().getExecutor();
 
-        if(isSuperAppGeneration)
+        if (isSuperAppGeneration)
             log.info("Compiler path -> {}", TaskUtil.addFilePathOfSuperAppToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION, DataStorage.getInstance().getSuperAppDirectoryName()));
-            else
-        log.info("Compiler path -> {}", TaskUtil.addFilePathToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION));
+        else
+            log.info("Compiler path -> {}", TaskUtil.addFilePathToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION));
+
+        String regularCompileScript = ScriptConstants.JAVAC_SCRIPT_NAME;
+        String compileScriptWithAddedClassPath = ScriptConstants.JAVAC_WITH_ADDED_CLASS_PATH_TO_EXTERNAL_LIBRARIES;
+
+        final boolean useExternalLibraries = DataStorage.getInstance().getCodeGeneratorConfig().isUSE_EXTERNAL_LIBRARIES();
+
+        if (isSuperAppGeneration) {
 
-        String scriptToUse = ScriptConstants.JAVAC_SCRIPT_NAME;
-        log.debug("script used when compiling -> {}", scriptToUse);
+            if (useExternalLibraries) {
+                executor.execute(new CompileClassTask(compileScriptWithAddedClassPath, new String[]{TaskUtil.addFilePathOfSuperAppToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION, DataStorage.getInstance().getSuperAppDirectoryName())}));
+            } else {
+                executor.execute(new CompileClassTask(regularCompileScript, new String[]{TaskUtil.addFilePathOfSuperAppToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION, DataStorage.getInstance().getSuperAppDirectoryName())}));
+            }
+        } else {
 
-        if(isSuperAppGeneration)
-           executor.execute(new CompileClassTask(scriptToUse,new String[]{TaskUtil.addFilePathOfSuperAppToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION,DataStorage.getInstance().getSuperAppDirectoryName())}));
-            else
-        executor.execute(new CompileClassTask(scriptToUse, new String[]{TaskUtil.addFilePathToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION)}));
+            if (useExternalLibraries) {
+                executor.execute(new CompileClassTask(compileScriptWithAddedClassPath, new String[]{TaskUtil.addFilePathToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION)}));
 
+            } else {
+                executor.execute(new CompileClassTask(regularCompileScript, new String[]{TaskUtil.addFilePathToClassName(className + CommonStringConstants.JAVA_FILE_EXTENSION)}));
+            }
+        }
     }
+
     /**
      * Tries to compile a file with java source code into byte code
+     *
      * @param className Class name of the class that we will try to compile
      */
-    public void compileClass(String className){
-        compile(className,null);
+    public void compileClass(String className) {
+        compile(className, null);
     }
 
     /**
-     *
-     * @param className Class name of the class that we will try to compile
+     * @param className   Class name of the class that we will try to compile
      * @param superAppDir The path to the directory of the super app
      */
-    public void compileSuperClass(String className, String superAppDir){
-        compile(className,superAppDir);
+    public void compileSuperClass(String className, String superAppDir) {
+        compile(className, superAppDir);
 
     }
 
diff --git a/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/app_system/code_generation/model/OllamaConfig.java b/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/app_system/code_generation/model/OllamaConfig.java
@@ -1,10 +1,11 @@
 package pn.cg.app_system.code_generation.model;
 
 /**
- * Record for the Ollama config options that you can edit in appwish
+ * Record for the Ollama config options that you can edit in app wish
  * @param num_ctx
  * @param top_k
  * @param num_predict
  * @param temperature
+ * @param useExternalLibraries
  */
-public record OllamaConfig(int num_ctx,int top_k,int num_predict,float temperature){}
+public record OllamaConfig(int num_ctx,int top_k,int num_predict,float temperature,boolean useExternalLibraries){}
diff --git a/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/datastorage/CodeGeneratorConfig.java b/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/datastorage/CodeGeneratorConfig.java
@@ -19,8 +19,8 @@ public class CodeGeneratorConfig {
 
     /**
      * @OllamaDocs Size of context window (default 2048)
-     * @use-info  Remember that a high context window demands more compute resources
-     * @use-info  It is important to check the documentation of the AI-Model you are using regarding the supported context window sizes
+     * @use-info Remember that a high context window demands more compute resources
+     * @use-info It is important to check the documentation of the AI-Model you are using regarding the supported context window sizes
      */
     private final int NUM_CTX;
 
@@ -39,6 +39,11 @@ public class CodeGeneratorConfig {
      */
     private final float TEMPERATURE;
 
+    /**
+     * This config states wherever external libraries should be added to the classpath or not
+     */
+    private final boolean USE_EXTERNAL_LIBRARIES;
+
     public CodeGeneratorConfig() {
         // This method should only be called once (when app is initializing) constructor
         this.OLLAMA_MODEL = GetOllamaModelNameFromPropFile();
@@ -51,10 +56,12 @@ public CodeGeneratorConfig() {
         this.TOP_K = ollamaConfig.top_k();
         this.NUM_PREDICT = ollamaConfig.num_predict();
         this.TEMPERATURE = ollamaConfig.temperature();
+        this.USE_EXTERNAL_LIBRARIES = ollamaConfig.useExternalLibraries();
     }
 
     /**
      * Get the value from the "ollama_model.props"
+     *
      * @return String that contains the model name
      */
     private final String GetOllamaModelNameFromPropFile() {
@@ -77,8 +84,9 @@ private final String GetOllamaModelNameFromPropFile() {
 
     /**
      * Creates an OllamaConfigDTO.
-     * @use-info In the event of an error, the record returned will only contain the default values
+     *
      * @return Record with Ollama config options that are editable in appwish
+     * @use-info In the event of an error, the record returned will only contain the default values
      */
     private final OllamaConfig CreateOllamaConfigDTOFromPropFile() {
         OllamaConfig newOllamaConfigRecord;
@@ -96,23 +104,26 @@ private final OllamaConfig CreateOllamaConfigDTOFromPropFile() {
             final String PROPERTY_NAME_TOP_K = "TOP_K";
             final String PROPERTY_NAME_NUM_PREDICT = "NUM_PREDICT";
             final String PROPERTY_NAME_TEMPERATURE = "TEMPERATURE";
+            final String PROPERTY_NAME_USE_EXTERNAL_LIBRARIES = "USE_EXTERNAL_LIBRARIES";
 
             final Properties properties = PropUtil.ReadPropertiesFile(PROPERTIES_FILE_NAME_FOR_CONFIG);
 
             newOllamaConfigRecord = new OllamaConfig(Integer.parseInt(properties.getProperty(PROPERTY_NAME_NUM_CTX)),
                     Integer.parseInt(properties.getProperty(PROPERTY_NAME_TOP_K)),
                     Integer.parseInt(properties.getProperty(PROPERTY_NAME_NUM_PREDICT)),
-                    Float.parseFloat(properties.getProperty(PROPERTY_NAME_TEMPERATURE)));
+                    Float.parseFloat(properties.getProperty(PROPERTY_NAME_TEMPERATURE)),
+                    convertExternalLibConfigIntoBooleanValue(properties.getProperty(PROPERTY_NAME_USE_EXTERNAL_LIBRARIES)));
         } catch (IOException e) {
             System.err.println("Error when fetching the ollama config file\nSetting default values for all config parameters..");
             // Default values should be returned if the ollama config file is corrupted
-            newOllamaConfigRecord = new OllamaConfig(2048, 40, 128, 0.8f);
+            newOllamaConfigRecord = new OllamaConfig(2048, 40, 128, 0.8f, false);
         }
         return newOllamaConfigRecord;
     }
 
     /**
      * Retrieves the name of the AI model that is being used with AppWish
+     *
      * @return String
      */
     public final String getOllamaModel() {
@@ -121,6 +132,7 @@ public final String getOllamaModel() {
 
     /**
      * Get the value of the context window
+     *
      * @return int
      */
     public final int getNUM_CTX() {
@@ -129,6 +141,7 @@ public final int getNUM_CTX() {
 
     /**
      * Get the TOP_K value
+     *
      * @return int
      */
     public final int getTOP_K() {
@@ -137,6 +150,7 @@ public final int getTOP_K() {
 
     /**
      * Get the number of tokens to predict
+     *
      * @return int
      */
     public final int getNUM_PREDICT() {
@@ -145,9 +159,20 @@ public final int getNUM_PREDICT() {
 
     /**
      * Get the temperature that the AI Model uses
+     *
      * @return float
      */
     public final float getTEMPERATURE() {
         return TEMPERATURE;
     }
+
+    public boolean isUSE_EXTERNAL_LIBRARIES() {
+        return USE_EXTERNAL_LIBRARIES;
+    }
+
+    private final boolean convertExternalLibConfigIntoBooleanValue(String value) {
+
+        return value.equalsIgnoreCase("On");
+
+    }
 }
diff --git a/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/datastorage/DataStorage.java b/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/datastorage/DataStorage.java
diff --git a/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/datastorage/constant/QuestionConstants.java b/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/datastorage/constant/QuestionConstants.java
diff --git a/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/datastorage/constant/ScriptConstants.java b/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/datastorage/constant/ScriptConstants.java
diff --git a/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/ollama_ai_remote/request/RequestHandlerImpl.java b/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/ollama_ai_remote/request/RequestHandlerImpl.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+javac -cp .:external_libs/* $1 2>&1 \| tee`
	`3`	`+`