From 2c75a6972a648ab33e377005a6535ea1fe2fbb3c Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Wed, 9 Oct 2024 20:56:08 +0800 Subject: [PATCH] (improvement)[build] Format the enumeration class with line breaks (#1761) --- .../common/jsqlparser/AggregateEnum.java | 9 +++++++-- .../supersonic/common/pojo/Criterion.java | 13 ++++++++++--- .../common/pojo/enums/AggOperatorEnum.java | 10 ++++++++-- .../common/pojo/enums/ChatModelType.java | 8 ++++---- .../common/pojo/enums/EngineType.java | 10 ++++++++-- .../common/pojo/enums/FilterOperatorEnum.java | 18 ++++++++++++++---- .../common/pojo/enums/RatioOverType.java | 9 +++++++-- .../common/pojo/enums/ReturnCode.java | 8 +++++--- .../common/pojo/enums/StatusEnum.java | 8 ++++++-- .../model/openai/OpenAiChatModelName.java | 17 +++++++++++------ .../chat/knowledge/DictUpdateMode.java | 7 +++++-- java-formatter.xml | 2 +- .../supersonic/util/LLMConfigUtils.java | 11 ++++++++--- 13 files changed, 94 insertions(+), 36 deletions(-) diff --git a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java index a0a5baee5..4e4110c0d 100644 --- a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java @@ -5,8 +5,13 @@ import java.util.Map; import java.util.stream.Collectors; public enum AggregateEnum { - MOST("最多", "max"), HIGHEST("最高", "max"), MAXIMUN("最大", "max"), LEAST("最少", - "min"), SMALLEST("最小", "min"), LOWEST("最低", "min"), AVERAGE("平均", "avg"); + MOST("最多", "max"), + HIGHEST("最高", "max"), + MAXIMUN("最大", "max"), + LEAST("最少", "min"), + SMALLEST("最小", "min"), + LOWEST("最低", "min"), + AVERAGE("平均", "avg"); private String aggregateCh; private String aggregateEN; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/Criterion.java b/common/src/main/java/com/tencent/supersonic/common/pojo/Criterion.java index 1b1dba5f6..2be9098c8 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/Criterion.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/Criterion.java @@ -40,9 +40,16 @@ public class Criterion { } public enum NumericDataType { - TINYINT("TINYINT"), SMALLINT("SMALLINT"), MEDIUMINT("MEDIUMINT"), INT("INT"), INTEGER( - "INTEGER"), BIGINT("BIGINT"), FLOAT( - "FLOAT"), DOUBLE("DOUBLE"), DECIMAL("DECIMAL"), NUMERIC("NUMERIC"),; + TINYINT("TINYINT"), + SMALLINT("SMALLINT"), + MEDIUMINT("MEDIUMINT"), + INT("INT"), + INTEGER("INTEGER"), + BIGINT("BIGINT"), + FLOAT("FLOAT"), + DOUBLE("DOUBLE"), + DECIMAL("DECIMAL"), + NUMERIC("NUMERIC"),; private String type; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java index 5271c34c8..1a5d46c79 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java @@ -9,13 +9,19 @@ public enum AggOperatorEnum { SUM("SUM"), - COUNT("COUNT"), COUNT_DISTINCT("COUNT_DISTINCT"), DISTINCT("DISTINCT"), + COUNT("COUNT"), + + COUNT_DISTINCT("COUNT_DISTINCT"), + + DISTINCT("DISTINCT"), TOPN("TOPN"), PERCENTILE("PERCENTILE"), - RATIO_ROLL("RATIO_ROLL"), RATIO_OVER("RATIO_OVER"), + RATIO_ROLL("RATIO_ROLL"), + + RATIO_OVER("RATIO_OVER"), UNKNOWN("UNKNOWN"); diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ChatModelType.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ChatModelType.java index 2f850f87c..d5dbe5139 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ChatModelType.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ChatModelType.java @@ -4,10 +4,10 @@ import lombok.Getter; @Getter public enum ChatModelType { - TEXT_TO_SQL("SQL生成", "Convert text query to SQL statement"), MULTI_TURN_REWRITE("多轮改写", - "Rewrite text query for multi-turn conversation"), MEMORY_REVIEW("记忆评估", - "Review memory in order to add few-shot examples"), RESPONSE_GENERATE("回复生成", - "Generate readable response to the end user"); + TEXT_TO_SQL("SQL生成", "Convert text query to SQL statement"), + MULTI_TURN_REWRITE("多轮改写", "Rewrite text query for multi-turn conversation"), + MEMORY_REVIEW("记忆评估", "Review memory in order to add few-shot examples"), + RESPONSE_GENERATE("回复生成", "Generate readable response to the end user"); private String description; private String name; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/EngineType.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/EngineType.java index 8d5d5f931..4b05d2620 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/EngineType.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/EngineType.java @@ -1,8 +1,14 @@ package com.tencent.supersonic.common.pojo.enums; public enum EngineType { - TDW(0, "tdw"), MYSQL(1, "mysql"), DORIS(2, "doris"), CLICKHOUSE(3, "clickhouse"), KAFKA(4, - "kafka"), H2(5, "h2"), POSTGRESQL(6, "postgresql"), OTHER(7, "other"); + TDW(0, "tdw"), + MYSQL(1, "mysql"), + DORIS(2, "doris"), + CLICKHOUSE(3, "clickhouse"), + KAFKA(4, "kafka"), + H2(5, "h2"), + POSTGRESQL(6, "postgresql"), + OTHER(7, "other"); private Integer code; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/FilterOperatorEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/FilterOperatorEnum.java index 0c21a3761..0b548c133 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/FilterOperatorEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/FilterOperatorEnum.java @@ -10,10 +10,20 @@ import net.sf.jsqlparser.expression.operators.relational.MinorThan; import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals; public enum FilterOperatorEnum { - IN("IN"), NOT_IN("NOT_IN"), EQUALS("="), BETWEEN("BETWEEN"), GREATER_THAN( - ">"), GREATER_THAN_EQUALS(">="), IS_NULL("IS_NULL"), IS_NOT_NULL("IS_NOT_NULL"), LIKE( - "LIKE"), MINOR_THAN("<"), MINOR_THAN_EQUALS( - "<="), NOT_EQUALS("!="), SQL_PART("SQL_PART"), EXISTS("EXISTS"); + IN("IN"), + NOT_IN("NOT_IN"), + EQUALS("="), + BETWEEN("BETWEEN"), + GREATER_THAN(">"), + GREATER_THAN_EQUALS(">="), + IS_NULL("IS_NULL"), + IS_NOT_NULL("IS_NOT_NULL"), + LIKE("LIKE"), + MINOR_THAN("<"), + MINOR_THAN_EQUALS("<="), + NOT_EQUALS("!="), + SQL_PART("SQL_PART"), + EXISTS("EXISTS"); private String value; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/RatioOverType.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/RatioOverType.java index 1df9bf2a4..5083aaebe 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/RatioOverType.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/RatioOverType.java @@ -1,8 +1,13 @@ package com.tencent.supersonic.common.pojo.enums; public enum RatioOverType { - DAY_ON_DAY("日环比"), WEEK_ON_DAY("周环比"), WEEK_ON_WEEK("周环比"), MONTH_ON_WEEK( - "月环比"), MONTH_ON_MONTH("月环比"), YEAR_ON_MONTH("年同比"), YEAR_ON_YEAR("年环比"); + DAY_ON_DAY("日环比"), + WEEK_ON_DAY("周环比"), + WEEK_ON_WEEK("周环比"), + MONTH_ON_WEEK("月环比"), + MONTH_ON_MONTH("月环比"), + YEAR_ON_MONTH("年同比"), + YEAR_ON_YEAR("年环比"); private String showName; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ReturnCode.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ReturnCode.java index 9e1e11db1..ce56f6279 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ReturnCode.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ReturnCode.java @@ -1,9 +1,11 @@ package com.tencent.supersonic.common.pojo.enums; public enum ReturnCode { - SUCCESS(200, "success"), INVALID_REQUEST(400, "invalid request"), INVALID_PERMISSION(401, - "invalid permission"), ACCESS_ERROR(403, - "access denied"), SYSTEM_ERROR(500, "system error"); + SUCCESS(200, "success"), + INVALID_REQUEST(400, "invalid request"), + INVALID_PERMISSION(401, "invalid permission"), + ACCESS_ERROR(403, "access denied"), + SYSTEM_ERROR(500, "system error"); private final int code; private final String message; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/StatusEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/StatusEnum.java index e0b948d03..168e1eda9 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/StatusEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/StatusEnum.java @@ -1,8 +1,12 @@ package com.tencent.supersonic.common.pojo.enums; public enum StatusEnum { - INITIALIZED("INITIALIZED", 0), ONLINE("ONLINE", 1), OFFLINE("OFFLINE", 2), DELETED("DELETED", - 3), UNAVAILABLE("UNAVAILABLE", 4), UNKNOWN("UNKNOWN", -1); + INITIALIZED("INITIALIZED", 0), + ONLINE("ONLINE", 1), + OFFLINE("OFFLINE", 2), + DELETED("DELETED", 3), + UNAVAILABLE("UNAVAILABLE", 4), + UNKNOWN("UNKNOWN", -1); private String status; private Integer code; diff --git a/common/src/main/java/dev/langchain4j/model/openai/OpenAiChatModelName.java b/common/src/main/java/dev/langchain4j/model/openai/OpenAiChatModelName.java index 06842f6da..56db8f911 100644 --- a/common/src/main/java/dev/langchain4j/model/openai/OpenAiChatModelName.java +++ b/common/src/main/java/dev/langchain4j/model/openai/OpenAiChatModelName.java @@ -3,8 +3,9 @@ package dev.langchain4j.model.openai; public enum OpenAiChatModelName { GPT_3_5_TURBO("gpt-3.5-turbo"), // alias @Deprecated - GPT_3_5_TURBO_0613("gpt-3.5-turbo-0613"), GPT_3_5_TURBO_1106( - "gpt-3.5-turbo-1106"), GPT_3_5_TURBO_0125("gpt-3.5-turbo-0125"), + GPT_3_5_TURBO_0613("gpt-3.5-turbo-0613"), + GPT_3_5_TURBO_1106("gpt-3.5-turbo-1106"), + GPT_3_5_TURBO_0125("gpt-3.5-turbo-0125"), GPT_3_5_TURBO_16K("gpt-3.5-turbo-16k"), // alias @Deprecated @@ -12,18 +13,22 @@ public enum OpenAiChatModelName { GPT_4("gpt-4"), // alias @Deprecated - GPT_4_0314("gpt-4-0314"), GPT_4_0613("gpt-4-0613"), + GPT_4_0314("gpt-4-0314"), + GPT_4_0613("gpt-4-0613"), GPT_4_TURBO_PREVIEW("gpt-4-turbo-preview"), // alias - GPT_4_1106_PREVIEW("gpt-4-1106-preview"), GPT_4_0125_PREVIEW("gpt-4-0125-preview"), + GPT_4_1106_PREVIEW("gpt-4-1106-preview"), + GPT_4_0125_PREVIEW("gpt-4-0125-preview"), GPT_4_32K("gpt-4-32k"), // alias - GPT_4_32K_0314("gpt-4-32k-0314"), GPT_4_32K_0613("gpt-4-32k-0613"), + GPT_4_32K_0314("gpt-4-32k-0314"), + GPT_4_32K_0613("gpt-4-32k-0613"), @Deprecated GPT_4_VISION_PREVIEW("gpt-4-vision-preview"), - GPT_4_O("gpt-4o"), GPT_4_O_MINI("gpt-4o-mini"); + GPT_4_O("gpt-4o"), + GPT_4_O_MINI("gpt-4o-mini"); private final String stringValue; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/DictUpdateMode.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/DictUpdateMode.java index 81897672d..85d2be561 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/DictUpdateMode.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/DictUpdateMode.java @@ -1,8 +1,11 @@ package com.tencent.supersonic.headless.chat.knowledge; public enum DictUpdateMode { - OFFLINE_FULL("OFFLINE_FULL"), OFFLINE_MODEL("OFFLINE_MODEL"), REALTIME_ADD( - "REALTIME_ADD"), REALTIME_DELETE("REALTIME_DELETE"), NOT_SUPPORT("NOT_SUPPORT"); + OFFLINE_FULL("OFFLINE_FULL"), + OFFLINE_MODEL("OFFLINE_MODEL"), + REALTIME_ADD("REALTIME_ADD"), + REALTIME_DELETE("REALTIME_DELETE"), + NOT_SUPPORT("NOT_SUPPORT"); private String value; diff --git a/java-formatter.xml b/java-formatter.xml index b5e2fc2b0..50bfb385b 100644 --- a/java-formatter.xml +++ b/java-formatter.xml @@ -291,7 +291,7 @@ - + diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/util/LLMConfigUtils.java b/launchers/standalone/src/test/java/com/tencent/supersonic/util/LLMConfigUtils.java index 300457bd9..f95056482 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/util/LLMConfigUtils.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/util/LLMConfigUtils.java @@ -4,9 +4,14 @@ import com.tencent.supersonic.common.pojo.ChatModelConfig; public class LLMConfigUtils { public enum LLMType { - OPENAI_GPT(false), OPENAI_MOONSHOT(false), OPENAI_DEEPSEEK(false), OPENAI_QWEN( - false), OPENAI_GLM( - false), OLLAMA_LLAMA3(true), OLLAMA_QWEN2(true), OLLAMA_QWEN25(true); + OPENAI_GPT(false), + OPENAI_MOONSHOT(false), + OPENAI_DEEPSEEK(false), + OPENAI_QWEN(false), + OPENAI_GLM(false), + OLLAMA_LLAMA3(true), + OLLAMA_QWEN2(true), + OLLAMA_QWEN25(true); public boolean isOllam;