Merge pull request #29 from kcl-lang/refactor-parser-api

refactor: parser api

Author: Peefy

java/Cargo.toml

@@ -11,3 +11,5 @@ doc = false
 jni = "0.21.1"
 anyhow = "1"
 kcl-lang = {path = "../"}
+once_cell = "1.19.0"
+lazy_static = "1.4.0"

java/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.kcl</groupId>
-    <artifactId>kcl-java</artifactId>
+    <artifactId>kcl-java-lib</artifactId>
     <version>0.1.0</version>
 
     <properties>

java/src/lib.rs

@@ -1,11 +1,20 @@
 extern crate anyhow;
 extern crate jni;
 extern crate kcl_lang;
+extern crate lazy_static;
+extern crate once_cell;
 
 use anyhow::Result;
 use jni::objects::{JByteArray, JClass, JObject};
 use jni::sys::jbyteArray;
 use jni::JNIEnv;
+use lazy_static::lazy_static;
+use once_cell::sync::OnceCell;
+use std::sync::Mutex;
+
+lazy_static! {
+    static ref API_INSTANCE: Mutex<OnceCell<kcl_lang::API>> = Mutex::new(OnceCell::new());
+}
 
 #[no_mangle]
 pub extern "system" fn Java_com_kcl_api_API_callNative(
@@ -21,11 +30,12 @@ pub extern "system" fn Java_com_kcl_api_API_callNative(
 }
 
 fn intern_call_native(env: &mut JNIEnv, name: JByteArray, args: JByteArray) -> Result<jbyteArray> {
-    let api = kcl_lang::API::new()?;
+    let binding = API_INSTANCE.lock().unwrap();
+    let api = binding.get_or_init(|| kcl_lang::API::new().expect("Failed to create API instance"));
     let name = env.convert_byte_array(name)?;
     let args = env.convert_byte_array(args)?;
     let result = api.call_native(&name, &args)?;
-    let j_byte_array = env.byte_array_from_slice(result)?;
+    let j_byte_array = env.byte_array_from_slice(&result)?;
     Ok(j_byte_array.into_raw())
 }
 

java/src/main/java/com/kcl/api/API.java

@@ -38,7 +38,8 @@ public API() {
 	 * }</pre>
 	 * 
 	 * @param args the arguments specifying the file paths to be parsed.
-	 * @return the result of parsing the program and parse errors, including the AST in JSON format.
+	 * @return the result of parsing the program and parse errors, including the AST
+	 *         in JSON format.
 	 * @throws Exception if an error occurs during the remote procedure call.
 	 */
 	@Override

python/kcl_py/api/gpyrpc_pb2.py

@@ -1,4 +1,4 @@
-from .gpyrpc_pb2 import *
+from .spec_pb2 import *
 from .service import API
 
 __all__ = ["API"]

python/kcl_py/__init__.py renamed to python/kcl_py_lib/__init__.py

@@ -1,8 +1,8 @@
 import ctypes
 import tempfile
 import threading
-from kcl_py.bootstrap import (lib_full_name, install_kclvm)
-from .gpyrpc_pb2 import *
+from kcl_py_lib.bootstrap import (lib_full_name, install_kclvm)
+from .spec_pb2 import *
 from ctypes import c_char_p, c_void_p
 import google.protobuf.json_format as json_format
 from google.protobuf import message as _message
@@ -26,6 +26,12 @@ class API:
     def __init__(self):
         self.caller = Caller()
 
+    def parse_file(self, args: ParseFile_Args) -> ParseFile_Result:
+        return self.caller.call("KclvmService.ParseFile", args)
+
+    def parse_program(self, args: ParseProgram_Args) -> ParseProgram_Result:
+        return self.caller.call("KclvmService.ParseProgram", args)
+
     def exec_program(self, args: ExecProgram_Args) -> ExecProgram_Result:
         return self.caller.call("KclvmService.ExecProgram", args)
 
@@ -103,6 +109,10 @@ def call(self, name: str, args):
     def create_method_req_message(self, method: str) -> _message.Message:
         if method in ["Ping", "KclvmService.Ping"]:
             return Ping_Args()
+        if method in ["ParseFile", "KclvmService.ParseFile"]:
+            return ParseFile_Args()
+        if method in ["ParseProgram", "KclvmService.ParseProgram"]:
+            return ParseProgram_Args()
         if method in ["ExecProgram", "KclvmService.ExecProgram"]:
             return ExecProgram_Args()
         if method in ["ResetPlugin", "KclvmService.ResetPlugin"]:
@@ -130,6 +140,10 @@ def create_method_req_message(self, method: str) -> _message.Message:
     def create_method_resp_message(self, method: str) -> _message.Message:
         if method in ["Ping", "KclvmService.Ping"]:
             return Ping_Result()
+        if method in ["ParseFile", "KclvmService.ParseFile"]:
+            return ParseFile_Result()
+        if method in ["ParseProgram", "KclvmService.ParseProgram"]:
+            return ParseProgram_Result()
         if method in ["ExecProgram", "KclvmService.ExecProgram"]:
             return ExecProgram_Result()
         if method in ["ResetPlugin", "KclvmService.ResetPlugin"]: