remove 'core' package. rename llm package to client

spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/llm/AzureOpenAiClient.java

@@ -20,11 +20,11 @@
 import com.azure.ai.openai.models.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.ai.core.llm.AiClient;
-import org.springframework.ai.core.llm.AiResponse;
-import org.springframework.ai.core.llm.Generation;
-import org.springframework.ai.core.prompt.Prompt;
-import org.springframework.ai.core.prompt.messages.Message;
+import org.springframework.ai.client.AiClient;
+import org.springframework.ai.client.AiResponse;
+import org.springframework.ai.client.Generation;
+import org.springframework.ai.prompt.Prompt;
+import org.springframework.ai.prompt.messages.Message;
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;

spring-ai-core/src/main/java/org/springframework/ai/core/chain/AbstractChain.java → spring-ai-core/src/main/java/org/springframework/ai/chain/AbstractChain.java

@@ -1,6 +1,6 @@
-package org.springframework.ai.core.chain;
+package org.springframework.ai.chain;
 
-import org.springframework.ai.core.memory.Memory;
+import org.springframework.ai.memory.Memory;
 
 import java.util.*;
 

spring-ai-core/src/main/java/org/springframework/ai/core/chain/Chain.java → spring-ai-core/src/main/java/org/springframework/ai/chain/Chain.java

@@ -1,4 +1,4 @@
-package org.springframework.ai.core.chain;
+package org.springframework.ai.chain;
 
 import java.util.List;
 import java.util.Map;

spring-ai-core/src/main/java/org/springframework/ai/core/llm/AiClient.java → spring-ai-core/src/main/java/org/springframework/ai/client/AiClient.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.llm;
+package org.springframework.ai.client;
 
-import org.springframework.ai.core.prompt.Prompt;
-import org.springframework.ai.core.prompt.messages.UserMessage;
+import org.springframework.ai.prompt.Prompt;
+import org.springframework.ai.prompt.messages.UserMessage;
 
 @FunctionalInterface
 public interface AiClient {

spring-ai-core/src/main/java/org/springframework/ai/core/llm/AiResponse.java → spring-ai-core/src/main/java/org/springframework/ai/client/AiResponse.java

@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ai.core.llm;
+package org.springframework.ai.client;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

spring-ai-core/src/main/java/org/springframework/ai/core/llm/Generation.java → spring-ai-core/src/main/java/org/springframework/ai/client/Generation.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.llm;
+package org.springframework.ai.client;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 
 public class Generation {
 
+	// Just text for now
 	private final String text;
 
 	private Map<String, Object> info;

spring-ai-core/src/main/java/org/springframework/ai/core/document/Document.java → spring-ai-core/src/main/java/org/springframework/ai/document/Document.java

@@ -1,4 +1,4 @@
-package org.springframework.ai.core.document;
+package org.springframework.ai.document;
 
 import org.springframework.util.StringUtils;
 

spring-ai-core/src/main/java/org/springframework/ai/core/document/DocumentTransformer.java → spring-ai-core/src/main/java/org/springframework/ai/document/DocumentTransformer.java

@@ -1,4 +1,4 @@
-package org.springframework.ai.core.document;
+package org.springframework.ai.document;
 
 import java.util.List;
 import java.util.function.Function;

spring-ai-core/src/main/java/org/springframework/ai/core/document/MetadataMode.java → spring-ai-core/src/main/java/org/springframework/ai/document/MetadataMode.java

@@ -1,4 +1,4 @@
-package org.springframework.ai.core.document;
+package org.springframework.ai.document;
 
 public enum MetadataMode {
 

spring-ai-core/src/main/java/org/springframework/ai/core/embedding/Embedding.java → spring-ai-core/src/main/java/org/springframework/ai/embedding/Embedding.java

@@ -1,4 +1,4 @@
-package org.springframework.ai.core.embedding;
+package org.springframework.ai.embedding;
 
 import java.util.List;
 import java.util.Objects;

spring-ai-core/src/main/java/org/springframework/ai/core/embedding/EmbeddingClient.java → spring-ai-core/src/main/java/org/springframework/ai/embedding/EmbeddingClient.java

@@ -1,6 +1,6 @@
-package org.springframework.ai.core.embedding;
+package org.springframework.ai.embedding;
 
-import org.springframework.ai.core.document.Document;
+import org.springframework.ai.document.Document;
 
 import java.util.List;
 

spring-ai-core/src/main/java/org/springframework/ai/core/embedding/EmbeddingResponse.java → spring-ai-core/src/main/java/org/springframework/ai/embedding/EmbeddingResponse.java

@@ -1,4 +1,4 @@
-package org.springframework.ai.core.embedding;
+package org.springframework.ai.embedding;
 
 import java.util.HashMap;
 import java.util.List;

spring-ai-core/src/main/java/org/springframework/ai/loader/Loader.java

@@ -0,0 +1,14 @@
+package org.springframework.ai.loader;
+
+import org.springframework.ai.document.Document;
+import org.springframework.ai.splitter.TextSplitter;
+
+import java.util.List;
+
+public interface Loader {
+
+	List<Document> load();
+
+	List<Document> load(TextSplitter textSplitter);
+
+}

spring-ai-core/src/main/java/org/springframework/ai/core/loader/impl/JsonLoader.java → spring-ai-core/src/main/java/org/springframework/ai/loader/impl/JsonLoader.java

@@ -1,11 +1,11 @@
-package org.springframework.ai.core.loader.impl;
+package org.springframework.ai.loader.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.ai.core.document.Document;
-import org.springframework.ai.core.loader.Loader;
-import org.springframework.ai.core.splitter.TextSplitter;
-import org.springframework.ai.core.splitter.TokenTextSplitter;
+import org.springframework.ai.document.Document;
+import org.springframework.ai.loader.Loader;
+import org.springframework.ai.splitter.TextSplitter;
+import org.springframework.ai.splitter.TokenTextSplitter;
 import org.springframework.core.io.Resource;
 
 import java.io.IOException;

spring-ai-core/src/main/java/org/springframework/ai/core/memory/Memory.java → spring-ai-core/src/main/java/org/springframework/ai/memory/Memory.java

@@ -1,4 +1,4 @@
-package org.springframework.ai.core.memory;
+package org.springframework.ai.memory;
 
 import java.util.List;
 import java.util.Map;

spring-ai-core/src/main/java/org/springframework/ai/core/parser/OutputParser.java → spring-ai-core/src/main/java/org/springframework/ai/parser/OutputParser.java

@@ -1,6 +1,6 @@
-package org.springframework.ai.core.parser;
+package org.springframework.ai.parser;
 
-import org.springframework.ai.core.llm.Generation;
+import org.springframework.ai.client.Generation;
 
 import java.util.List;
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/AssistantPromptTemplate.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/AssistantPromptTemplate.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
-import org.springframework.ai.core.prompt.messages.AssistantMessage;
+import org.springframework.ai.prompt.messages.AssistantMessage;
 
 import java.util.Map;
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/ChatPromptTemplate.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/ChatPromptTemplate.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
-import org.springframework.ai.core.prompt.messages.Message;
+import org.springframework.ai.prompt.messages.Message;
 
 import java.util.ArrayList;
 import java.util.List;

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/FunctionPromptTemplate.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/FunctionPromptTemplate.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
 public class FunctionPromptTemplate extends PromptTemplate {
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/OutputParser.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/OutputParser.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
-import org.springframework.ai.core.llm.Generation;
+import org.springframework.ai.client.Generation;
 
 import java.util.List;
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/Prompt.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/Prompt.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.ai.core.prompt.messages.UserMessage;
-import org.springframework.ai.core.prompt.messages.Message;
+import org.springframework.ai.prompt.messages.UserMessage;
+import org.springframework.ai.prompt.messages.Message;
 
 public class Prompt {
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/PromptTemplate.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/PromptTemplate.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
 import org.antlr.runtime.Token;
 import org.antlr.runtime.TokenStream;
-import org.springframework.ai.core.prompt.messages.Message;
-import org.springframework.ai.core.prompt.messages.UserMessage;
+import org.springframework.ai.prompt.messages.Message;
+import org.springframework.ai.prompt.messages.UserMessage;
 import org.stringtemplate.v4.ST;
 import org.stringtemplate.v4.compiler.STLexer;
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/PromptTemplateActions.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/PromptTemplateActions.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
-import org.springframework.ai.core.prompt.messages.Message;
+import org.springframework.ai.prompt.messages.Message;
 
 import java.util.List;
 import java.util.Map;

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/SystemPromptTemplate.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/SystemPromptTemplate.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
 import java.util.Map;
 
-import org.springframework.ai.core.prompt.messages.SystemMessage;
+import org.springframework.ai.prompt.messages.SystemMessage;
 
 public class SystemPromptTemplate extends PromptTemplate {
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/TemplateFormat.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/TemplateFormat.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt;
+package org.springframework.ai.prompt;
 
 public enum TemplateFormat {
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/messages/AbstractMessage.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/AbstractMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt.messages;
+package org.springframework.ai.prompt.messages;
 
 import java.util.HashMap;
 import java.util.Map;

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/messages/AssistantMessage.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/AssistantMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt.messages;
+package org.springframework.ai.prompt.messages;
 
 import java.util.Map;
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/messages/ChatMessage.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/ChatMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt.messages;
+package org.springframework.ai.prompt.messages;
 
 import java.util.Map;
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/messages/FunctionMessage.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/FunctionMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt.messages;
+package org.springframework.ai.prompt.messages;
 
 import java.util.Map;
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/messages/Message.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/Message.java

@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt.messages;
+package org.springframework.ai.prompt.messages;
 
 import java.util.Map;
 
 public interface Message {
 
 	String getContent();
 
-	// TODO investigate use of "function_name" and "name" - maybe cna be first class
-	// representation vs. map.
 	Map<String, Object> getProperties();
 
 	MessageType getMessageType();

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/messages/MessageType.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/MessageType.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.ai.core.prompt.messages;
+package org.springframework.ai.prompt.messages;
 
 public enum MessageType {
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/messages/SystemMessage.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/SystemMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt.messages;
+package org.springframework.ai.prompt.messages;
 
 import java.util.Map;
 

spring-ai-core/src/main/java/org/springframework/ai/core/prompt/messages/UserMessage.java → spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/UserMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.core.prompt.messages;
+package org.springframework.ai.prompt.messages;
 
 import java.util.Map;
 

spring-ai-core/src/main/java/org/springframework/ai/core/retriever/Retriever.java → spring-ai-core/src/main/java/org/springframework/ai/retriever/Retriever.java

@@ -1,6 +1,6 @@
-package org.springframework.ai.core.retriever;
+package org.springframework.ai.retriever;
 
-import org.springframework.ai.core.document.Document;
+import org.springframework.ai.document.Document;
 
 import java.util.List;
 

spring-ai-core/src/main/java/org/springframework/ai/core/retriever/impl/VectorStoreRetriever.java → spring-ai-core/src/main/java/org/springframework/ai/retriever/impl/VectorStoreRetriever.java

@@ -1,8 +1,8 @@
-package org.springframework.ai.core.retriever.impl;
+package org.springframework.ai.retriever.impl;
 
-import org.springframework.ai.core.document.Document;
-import org.springframework.ai.core.retriever.Retriever;
-import org.springframework.ai.core.vectorstore.VectorStore;
+import org.springframework.ai.document.Document;
+import org.springframework.ai.retriever.Retriever;
+import org.springframework.ai.vectorstore.VectorStore;
 
 import java.util.List;
 import java.util.Objects;