Update to version 0.2 with minor code impromenet and standards

- Return rich error message.
- Move the api link to properties files.
- Structure improvement like adding interface and base class to the reusable/flexible implementations.
-  add license details to the files.

Author: Barqawiz

core/com.intellijava.core/.classpath

@@ -8,11 +8,12 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,9 +26,9 @@
 	</classpathentry>
 	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
 			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>

core/com.intellijava.core/pom.xml

@@ -6,11 +6,10 @@
 
   <groupId>com.intellijava</groupId>
   <artifactId>com.intellijava.core</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.2</version>
 
   <name>com.intellijava.core</name>
-  <!-- FIXME change it to the project's website -->
-  <url>http://www.example.com</url>
+  <url>https://github.com/Barqawiz/IntelliJava</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

core/com.intellijava.core/resources/config.properties

@@ -0,0 +1,3 @@
+url.openai.base=https://api.openai.com
+url.openai.completions=/v1/completions
+url.openai.testkey=

core/com.intellijava.core/src/main/java/com/intellijava/com/intellijava/core/controller/RemoteLanguageModel.java

@@ -1,6 +1,23 @@
+/**
+ * Copyright 2023 Github.com/Barqawiz/IntelliJava
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellijava.com.intellijava.core.controller;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.intellijava.com.intellijava.core.model.OpenaiResponseModel;
 import com.intellijava.com.intellijava.core.wrappers.OpenAIWrapper;
@@ -66,7 +83,13 @@ public String generateText(String model, String prompt, float temperature, int m
 	 */
 	private String generateOpensiText(String model, String prompt, float temperature, int maxTokens) throws IOException { 
 
-		OpenaiResponseModel resModel = openaiWrapper.generateText(model, prompt, temperature, maxTokens);
+		Map<String, Object> params = new HashMap<>();
+        params.put("model", model);
+        params.put("prompt", prompt);
+        params.put("temperature", temperature);
+        params.put("max_tokens", maxTokens);
+        
+		OpenaiResponseModel resModel = (OpenaiResponseModel) openaiWrapper.generateText(params);
 
 		return resModel.getChoices().get(0).getText();
 

core/com.intellijava.core/src/main/java/com/intellijava/com/intellijava/core/model/BaseRemoteModel.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2023 Github.com/Barqawiz/IntelliJava
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellijava.com.intellijava.core.model;
+
+public abstract class BaseRemoteModel {
+	private String id;
+	
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+}

core/com.intellijava.core/src/main/java/com/intellijava/com/intellijava/core/model/OpenaiResponseModel.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2023 Github.com/Barqawiz/IntelliJava
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellijava.com.intellijava.core.model;
 
 import java.util.List;
@@ -9,8 +24,8 @@
  * A model class to parse openai completion API response.
  *
  */
-public class OpenaiResponseModel {
-    private String id;
+public class OpenaiResponseModel extends BaseRemoteModel {
+    
     private String object;
     private long created;
     private String model;
@@ -79,14 +94,6 @@ public void setTotal_tokens(int total_tokens) {
 
     }
 
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
 	public String getObject() {
 		return object;
 	}

core/com.intellijava.core/src/main/java/com/intellijava/com/intellijava/core/utils/Config2.java

@@ -0,0 +1,53 @@
+/**
+ * Copyright 2023 Github.com/Barqawiz/IntelliJava
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellijava.com.intellijava.core.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * 
+ * @author  github.com/Barqawiz 
+ * 
+ * Read the configuration
+ *
+ */
+public class Config2 {
+    private static Config2 instance;
+    
+    private Properties prop;
+
+    private Config2() {
+        prop = new Properties();
+        try (InputStream input = getClass().getClassLoader().getResourceAsStream("config.properties")) {
+            prop.load(input);
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public static Config2 getInstance() {
+        if (instance == null) {
+            instance = new Config2();
+        }
+        return instance;
+    }
+
+    public String getProperty(String key) {
+        return prop.getProperty(key);
+    }
+}

core/com.intellijava.core/src/main/java/com/intellijava/com/intellijava/core/utils/ConnHelper.java

@@ -1,8 +1,26 @@
+/**
+ * Copyright 2023 Github.com/Barqawiz/IntelliJava
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellijava.com.intellijava.core.utils;
 
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.HttpURLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
@@ -45,4 +63,30 @@ public static <T> T convertSteamToModel(InputStream stream, Class<T> classOfT) {
 
 		return resModel;
 	}
+	
+	
+	public static String getErrorMessage(HttpURLConnection connection) throws IOException {
+		
+		String apiErrorMessage = readStream(connection.getErrorStream());
+		
+		String errorMessage = "Unexpected HTTP response: " + connection.getResponseCode();
+		
+		// add extra error details - if any
+		if (apiErrorMessage != null) {
+			errorMessage += " Error details:"+apiErrorMessage;
+		}
+		
+		return errorMessage;
+	}
+	
+	public static String readStream(InputStream stream) throws IOException {
+		  StringBuilder result = new StringBuilder();
+		  try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
+		    String line;
+		    while ((line = reader.readLine()) != null) {
+		      result.append(line);
+		    }
+		  }
+		  return result.toString();
+		}
 }

core/com.intellijava.core/src/main/java/com/intellijava/com/intellijava/core/wrappers/LanguageModelInterface.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2023 Github.com/Barqawiz/IntelliJava
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellijava.com.intellijava.core.wrappers;
+
+import java.io.IOException;
+import java.util.Map;
+import com.intellijava.com.intellijava.core.model.BaseRemoteModel;
+
+public interface LanguageModelInterface {
+
+	/**
+	 * 
+	 * Generate text from remote large language model based on the received prompt.
+	 * 
+	 * @param params key and value for the API parameters
+	 * @return BaseRemoteModel or any sub class
+	 * @throws IOException
+	 */
+	public BaseRemoteModel generateText(Map<String, Object> params) throws IOException;
+}

core/com.intellijava.core/src/main/java/com/intellijava/com/intellijava/core/wrappers/OpenAIWrapper.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2023 Github.com/Barqawiz/IntelliJava
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellijava.com.intellijava.core.wrappers;
 
 import java.io.IOException;
@@ -11,7 +26,9 @@
 import java.util.Map;
 
 import com.google.gson.Gson;
+import com.intellijava.com.intellijava.core.model.BaseRemoteModel;
 import com.intellijava.com.intellijava.core.model.OpenaiResponseModel;
+import com.intellijava.com.intellijava.core.utils.Config2;
 import com.intellijava.com.intellijava.core.utils.ConnHelper;
 
 /**
@@ -21,9 +38,9 @@
  * A wrapper to hide the complexity of openai API.
  *
  */
-public class OpenAIWrapper {
+public class OpenAIWrapper implements LanguageModelInterface {
 
-    private final String API_BASE_URL = "https://api.openai.com";
+    private final String API_BASE_URL = Config2.getInstance().getProperty("url.openai.base");
     private String API_KEY;
 
     /**
@@ -43,14 +60,9 @@ public OpenAIWrapper(String apiKey) {
      * @return the model response.
      * @throws IOException
      */
-    public OpenaiResponseModel generateText(String model, String prompt, float temperature, int maxTokens) throws IOException {
-        String url = API_BASE_URL + "/v1/completions";
-
-        Map<String, Object> params = new HashMap<>();
-        params.put("model", model);
-        params.put("prompt", prompt);
-        params.put("temperature", temperature);
-        params.put("max_tokens", maxTokens);
+    public BaseRemoteModel generateText(Map<String, Object> params) throws IOException {
+    	
+        String url = API_BASE_URL + Config2.getInstance().getProperty("url.openai.completions");
 
         String json = ConnHelper.convertMaptToJson(params);
 
@@ -65,7 +77,8 @@ public OpenaiResponseModel generateText(String model, String prompt, float tempe
         }
 
         if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
-            throw new IOException("Unexpected HTTP response: " + connection.getResponseCode());
+        	String errorMessage = ConnHelper.getErrorMessage(connection);
+            throw new IOException(errorMessage);
         }
 
         // get the response and convert to model