[knext] fix knext config bug (#4)

cloudext/impl/computing/local/src/main/java/com/antgroup/openspg/cloudext/impl/computing/local/impl/LocalBuilderExecutorImpl.java

@@ -154,14 +154,14 @@ public class LocalBuilderExecutorImpl implements LocalBuilderExecutor {
                     builderStat.success(finalI);
                 } catch (Throwable e) {
                     builderStat.failure(finalI);
-                    log.warn("run buildingJobInstId={} error", jobInst.getJobInstId(), e);
+                    log.error("run buildingJobInstId={} error", jobInst.getJobInstId(), e);
                 } finally {
                     if (builderStat.isFinished()) {
                         try {
                             builderMetric.close();
                             recordCollector.close();
                         } catch (Throwable e) {
-                            log.warn("close builderMetric or recordCollector error", e);
+                            log.error("close builderMetric or recordCollector error", e);
                         }
                     }
                 }

cloudext/impl/search-engine/elasticsearch/src/main/java/com/antgroup/openspg/cloudext/impl/searchengine/elasticsearch/ElasticSearchEngineClient.java

@@ -35,6 +35,7 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 
 @Slf4j
@@ -124,6 +125,7 @@ public class ElasticSearchEngineClient extends BaseIdxSearchEngineClient {
         configuration.setVariableValue(ElasticSearchConstants.SCHEME, scheme);
         configuration.setVariableValue(ElasticSearchConstants.HOST, host);
         configuration.setVariableValue(ElasticSearchConstants.PORT, port);
+        configuration.setReadTimeout(30, TimeUnit.SECONDS);
         configuration.setLogEnabled(false);
         configuration.setBackendName("httpclient");
     }

cloudext/impl/search-engine/elasticsearch/src/main/java/com/antgroup/openspg/cloudext/impl/searchengine/elasticsearch/util/ElasticSearchRecordUtils.java

@@ -60,6 +60,9 @@ public class ElasticSearchRecordUtils {
             for (IdxRecord idxRecord : idxRecords) {
                 ForestResponse<String> upsert = client.upsert(
                     idxName, idxRecord.getDocId(), idxRecord.getFields());
+                if (upsert.isTimeout()) {
+                    throw new RuntimeException("upsertIdxRecords timeout");
+                }
                 if (!upsert.isSuccess()) {
                     throw new RuntimeException("upsertIdxRecords error, errorMsg=" + upsert.getContent());
                 }

dev/release/openspg/release-openspg-docker.sh

@@ -14,4 +14,4 @@
 #
 
 # mvn clean package -DskipTests
-docker buildx build -f Dockerfile --platform linux/amd64 --push -t baifuyu/openspg:0.0.1-beta1 -t baifuyu/openspg:latest .
+docker buildx build -f Dockerfile --platform linux/amd64 --push -t baifuyu/openspg:0.0.1-beta2 -t baifuyu/openspg:latest .

python/KNEXT_VERSION

@@ -1 +1 @@
-0.0.1
+0.0.1-beta2

python/MANIFEST.in

@@ -1 +1,2 @@
-recursive-include knext *
+recursive-include knext *
+recursive-exclude knext/examples *

python/knext/__init__.py

@@ -11,4 +11,4 @@
 
 
 __package_name__ = "openspg-knext"
-__version__ = "0.0.1"
+__version__ = "0.0.1-beta2"

python/knext/client/command/config.py

@@ -114,8 +114,10 @@ def _get_cfg_files():
     Get global and local knext config files and paths.
     """
     global_cfg_path = (
-        os.environ.get("XDG_CONFIG_HOME") or Path("~/.config").expanduser()
+                          Path(os.environ.get("XDG_CONFIG_HOME") or "~/.config").expanduser()
-    ) / ".knext.cfg"
+                      ) / ".knext.cfg"
+    if not global_cfg_path.parent.exists():
+        Path.mkdir(global_cfg_path.parent)
     global_cfg = ConfigParser()
     global_cfg.read(global_cfg_path)
     local_cfg_path = _closest_cfg()

python/knext/client/knext_cli.py

@@ -96,6 +96,11 @@ operator.command("list")(list_operator)
 @_main.group()
 def project() -> None:
     """Project client."""
+    project_cfg, root_path = get_config()
+
+    if project_cfg.has_section("global"):
+        for cfg in GLOBAL_CONFIG:
+            os.environ[CFG_PREFIX + cfg.upper()] = project_cfg.get("global", cfg)
     pass
 
 

python/requirements.txt

@@ -2,7 +2,6 @@ wget==3.2
 pytest==7.4.2
 retrying==1.3.4
 tabulate==0.9.0
-pemja==0.4.0
 jieba==0.42.1
 nltk==3.8.1
 tqdm==4.66.1