Remove CachingPythonFileReader and related file-level caching features for simplification and refactoring.

Author: maksymuimanov

cache/python-executor-spring-boot-cache-autoconfigure/src/main/java/io/maksymuimanov/python/autoconfigure/FileCacheLevelCondition.java

@@ -5,7 +5,6 @@
 import io.maksymuimanov.python.cache.HashCacheKeyGenerator;
 import io.maksymuimanov.python.executor.CachingPythonExecutor;
 import io.maksymuimanov.python.executor.PythonExecutor;
-import io.maksymuimanov.python.file.CachingPythonFileReader;
 import io.maksymuimanov.python.file.PythonFileReader;
 import io.maksymuimanov.python.processor.CachingPythonProcessor;
 import io.maksymuimanov.python.processor.PythonProcessor;
@@ -48,7 +47,6 @@
  *
  * @see PythonCacheProperties
  * @see CacheKeyGenerator
- * @see CachingPythonFileReader
  * @see CachingPythonResolverHolder
  * @see CachingPythonExecutor
  * @see CachingPythonProcessor
@@ -73,26 +71,6 @@ public CacheKeyGenerator cacheKeyGenerator(PythonCacheProperties cacheProperties
         return new HashCacheKeyGenerator(keyProperties.getHashAlgorithm(), keyProperties.getCharset(), keyProperties.getDelimiter());
     }
 
-    /**
-     * Wraps the existing {@link PythonFileReader} with caching capabilities
-     * when file cache level is enabled.
-     *
-     * @param cacheProperties non-null Python cache configuration properties
-     * @param pythonFileReader non-null delegate {@link PythonFileReader} bean
-     * @param cacheManager non-null Spring cache manager for cache resolution
-     * @return a caching-enabled {@link PythonFileReader} bean marked as primary
-     */
-    @Bean
-    @Primary
-    @ConditionalOnBean(PythonFileReader.class)
-    @Conditional(FileCacheLevelCondition.class)
-    public PythonFileReader cachingPythonFileHandler(PythonCacheProperties cacheProperties,
-                                                     PythonFileReader pythonFileReader,
-                                                     CacheManager cacheManager) {
-        var nameProperties = cacheProperties.getName();
-        return new CachingPythonFileReader(nameProperties.getFileBodies(), nameProperties.getFilePaths(), pythonFileReader, cacheManager);
-    }
-
     /**
      * Wraps the existing {@link PythonResolverHolder} with caching capabilities
      * when resolver cache level is enabled.

cache/python-executor-spring-boot-cache-autoconfigure/src/main/java/io/maksymuimanov/python/autoconfigure/PythonCacheAutoConfiguration.java

@@ -2,7 +2,6 @@
 
 import io.maksymuimanov.python.cache.HashCacheKeyGenerator;
 import io.maksymuimanov.python.executor.CachingPythonExecutor;
-import io.maksymuimanov.python.file.CachingPythonFileReader;
 import io.maksymuimanov.python.processor.CachingPythonProcessor;
 import io.maksymuimanov.python.resolver.CachingPythonResolverHolder;
 import lombok.Getter;
@@ -37,7 +36,6 @@
  * }</pre>
  *
  * @see HashCacheKeyGenerator
- * @see CachingPythonFileReader
  * @see CachingPythonResolverHolder
  * @see CachingPythonExecutor
  * @see CachingPythonProcessor
@@ -54,7 +52,7 @@ public class PythonCacheProperties {
     /**
      * Defines which parts of the Python processing flow are cached.
      */
-    private PythonCacheLevel[] levels = new PythonCacheLevel[]{PythonCacheLevel.FILE, PythonCacheLevel.PROCESSOR};
+    private PythonCacheLevel[] levels = new PythonCacheLevel[]{PythonCacheLevel.PROCESSOR};
     /**
      * Configuration properties defining cache names for each cache segment.
      */
@@ -71,7 +69,7 @@ public class PythonCacheProperties {
      * </p>
      */
     public enum PythonCacheLevel {
-        FILE, RESOLVER, EXECUTOR, PROCESSOR
+        RESOLVER, EXECUTOR, PROCESSOR
     }
 
     /**
@@ -82,14 +80,6 @@ public enum PythonCacheLevel {
      */
     @Getter @Setter
     public static class NameProperties {
-        /**
-         * Cache name for storing resolved Python file paths.
-         */
-        private String filePaths = "pythonFilePathsCache";
-        /**
-         * Cache name for storing Python file contents.
-         */
-        private String fileBodies = "pythonFileBodiesCache";
         /**
          * Cache name for storing resolved Python scripts.
          */

cache/python-executor-spring-boot-cache-autoconfigure/src/main/java/io/maksymuimanov/python/autoconfigure/PythonCacheProperties.java

@@ -31,26 +31,11 @@
       "name": "spring.python.cache.levels",
       "description": "Defines which parts of the Python processing flow are cached.",
       "defaultValue": [
-        "file",
         "processor"
       ],
       "type": "io.maksymuimanov.python.autoconfigure.PythonCacheProperties$PythonCacheLevel[]",
       "sourceType": "io.maksymuimanov.python.autoconfigure.PythonCacheProperties"
     },
-    {
-      "name": "spring.python.cache.name.file-paths",
-      "description": "Cache name for storing resolved Python file paths.",
-      "defaultValue": "pythonFilePathsCache",
-      "type": "java.lang.String",
-      "sourceType": "io.maksymuimanov.python.autoconfigure.PythonCacheProperties$NameProperties"
-    },
-    {
-      "name": "spring.python.cache.name.file-bodies",
-      "description": "Cache name for storing Python file contents (script bodies).",
-      "defaultValue": "pythonFileBodiesCache",
-      "type": "java.lang.String",
-      "sourceType": "io.maksymuimanov.python.autoconfigure.PythonCacheProperties$NameProperties"
-    },
     {
       "name": "spring.python.cache.name.resolver",
       "description": "Cache name for storing resolved Python scripts",
@@ -98,10 +83,6 @@
     {
       "name": "spring.python.cache.levels",
       "values": [
-        {
-          "value": "file",
-          "description": "Caches Python inside the PythonFileReader."
-        },
         {
           "value": "resolver",
           "description": "Caches Python inside the PythonResolverHolder."

cache/python-executor-spring-boot-cache-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -2,7 +2,7 @@
 
 import io.maksymuimanov.python.script.PythonScript;
 
-import java.nio.file.Path;
+import java.io.InputStream;
 
 /**
  * Defines reading operations for working with Python script files, including validation, I/O,
@@ -32,10 +32,10 @@ public interface PythonFileReader {
     PythonScript readScript(PythonScript pythonScript);
 
     /**
-     * Returns a {@link Path} object representing the location of the given script.
+     * Returns an {@link InputStream} object representing the input stream of the given script.
      *
      * @param path non-{@code null} file system path
-     * @return non-{@code null} {@link Path} instance pointing to the script
+     * @return non-{@code null} {@link InputStream} instance pointing to the script
      */
-    Path getScriptPath(String path);
+    InputStream getInputStream(String path);
 }

cache/python-executor-spring-boot-cache-core/src/main/java/io/maksymuimanov/python/file/CachingPythonFileReader.java

@@ -2,11 +2,16 @@
 
 import org.jspecify.annotations.Nullable;
 
+import java.util.Optional;
+
 /**
  * Response wrapper for Python script execution result.
  *
  * @param <R> the type of the execution result body
  * @param body the result returned from executing the Python script
  */
 public record PythonExecutionResponse<R>(@Nullable R body) {
+    public Optional<R> bodyOptional() {
+        return Optional.ofNullable(body);
+    }
 }

cache/python-executor-spring-boot-cache-core/src/main/java/io/maksymuimanov/python/file/package-info.java

@@ -7,8 +7,10 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -29,8 +31,13 @@
  */
 @RequiredArgsConstructor
 public class BasicPythonFileReader implements PythonFileReader {
+    private final Map<String, String> fileCache;
     private final String rootPath;
 
+    public BasicPythonFileReader(String rootPath) {
+        this(new ConcurrentHashMap<>(), rootPath);
+    }
+
     /**
      * Reads the content of a Python script file resolved from the given path string.
      *
@@ -40,30 +47,35 @@ public class BasicPythonFileReader implements PythonFileReader {
      */
     @Override
     public PythonScript readScript(PythonScript script) {
-        String source = script.getSource();
-        Path scriptPath = this.getScriptPath(source);
-        try (BufferedReader bufferedReader = Files.newBufferedReader(scriptPath)) {
-            String body = bufferedReader.lines().collect(Collectors.joining("\n"));
+        try {
+            String source = script.getSource();
+            String body = this.fileCache.computeIfAbsent(source, path -> {
+                try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(this.getInputStream(path)))) {
+                    return bufferedReader.lines().collect(Collectors.joining("\n"));
+                } catch (Exception e) {
+                    throw new PythonFileException(e);
+                }
+            });
             script.getBuilder().appendAll(body);
             return script;
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new PythonFileException(e);
         }
     }
 
     /**
-     * Resolves the {@link Path} for the script file by appending the given relative path
+     * Resolves the {@link InputStream} for the script file by appending the given relative path
      * to the base path configured in {@link BasicPythonFileReader#rootPath}.
      *
      * @param path the relative path string of the script file, must be non-null
-     * @return the resolved absolute {@link Path} to the script file
-     * @throws PythonFileException if the resource cannot be resolved as a file path
+     * @return the resolved {@link InputStream} to the script file
+     * @throws PythonFileException if the resource cannot be resolved
      */
     @Override
-    public Path getScriptPath(String path) {
+    public InputStream getInputStream(String path) {
         try {
-            ClassPathResource classPathResource = new ClassPathResource(rootPath + path);
-            return classPathResource.getFile().toPath();
+            ClassPathResource classPathResource = new ClassPathResource(this.rootPath + path);
+            return classPathResource.getInputStream();
         } catch (IOException e) {
             throw new PythonFileException(e);
         }