ragflow-cli 0.25.0.dev5__tar.gz → 0.25.0.dev6__tar.gz

{ragflow_cli-0.25.0.dev5 → ragflow_cli-0.25.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragflow-cli
-Version: 0.25.0.dev5
+Version: 0.25.0.dev6
 Summary: Admin Service's client of [RAGFlow](https://github.com/infiniflow/ragflow). The Admin Service provides user management and system monitoring. 
 Author-email: Lynn <lynn_inf@hotmail.com>
 License: Apache License, Version 2.0

{ragflow_cli-0.25.0.dev5 → ragflow_cli-0.25.0.dev6}/parser.py

@@ -93,6 +93,11 @@ sql_command: login_user
            | list_chat_sessions
            | chat_on_session
            | list_server_configs
+           | show_fingerprint
+           | set_license
+           | set_license_config
+           | show_license
+           | check_license
            | benchmark
 
 // meta command definition
@@ -178,6 +183,10 @@ PING: "PING"i
 SESSION: "SESSION"i
 SESSIONS: "SESSIONS"i
 SERVER: "SERVER"i
+FINGERPRINT: "FINGERPRINT"i
+LICENSE: "LICENSE"i
+CHECK: "CHECK"i
+CONFIG: "CONFIG"i
 
 login_user: LOGIN USER quoted_string ";"
 list_services: LIST SERVICES ";"
@@ -223,6 +232,12 @@ list_variables: LIST VARS ";"
 list_configs: LIST CONFIGS ";"
 list_environments: LIST ENVS ";"
 
+show_fingerprint: SHOW FINGERPRINT ";"
+set_license: SET LICENSE quoted_string ";"
+set_license_config: SET LICENSE CONFIG NUMBER NUMBER ";"
+show_license: SHOW LICENSE ";"
+check_license: CHECK LICENSE ";"
+
 list_server_configs: LIST SERVER CONFIGS ";"
 
 benchmark: BENCHMARK NUMBER NUMBER user_statement
@@ -305,7 +320,7 @@ identifier_list: identifier ("," identifier)*
 
 identifier: WORD
 quoted_string: QUOTED_STRING
-status: WORD
+status: ON | WORD
 
 QUOTED_STRING: /'[^']+'/ | /"[^"]+"/
 WORD: /[a-zA-Z0-9_\-\.]+/
@@ -477,6 +492,24 @@ class RAGFlowCLITransformer(Transformer):
     def list_environments(self, items):
         return {"type": "list_environments"}
 
+    def show_fingerprint(self, items):
+        return {"type": "show_fingerprint"}
+
+    def set_license(self, items):
+        license = items[2].children[0].strip("'\"")
+        return {"type": "set_license", "license": license}
+
+    def set_license_config(self, items):
+        value1: int = int(items[3])
+        value2: int = int(items[4])
+        return {"type": "set_license_config", "value1": value1, "value2": value2}
+
+    def show_license(self, items):
+        return {"type": "show_license"}
+
+    def check_license(self, items):
+        return {"type": "check_license"}
+
     def list_server_configs(self, items):
         return {"type": "list_server_configs"}
 

{ragflow_cli-0.25.0.dev5 → ragflow_cli-0.25.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ragflow-cli"
-version = "0.25.0.dev5"
+version = "0.25.0.dev6"
 description = "Admin Service's client of [RAGFlow](https://github.com/infiniflow/ragflow). The Admin Service provides user management and system monitoring. "
 authors = [{ name = "Lynn", email = "lynn_inf@hotmail.com" }]
 license = { text = "Apache License, Version 2.0" }

{ragflow_cli-0.25.0.dev5 → ragflow_cli-0.25.0.dev6}/ragflow_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragflow-cli
-Version: 0.25.0.dev5
+Version: 0.25.0.dev6
 Summary: Admin Service's client of [RAGFlow](https://github.com/infiniflow/ragflow). The Admin Service provides user management and system monitoring. 
 Author-email: Lynn <lynn_inf@hotmail.com>
 License: Apache License, Version 2.0

{ragflow_cli-0.25.0.dev5 → ragflow_cli-0.25.0.dev6}/ragflow_client.py

@@ -583,6 +583,60 @@ class RAGFlowClient:
         else:
             print(f"Fail to list variables, code: {res_json['code']}, message: {res_json['message']}")
 
+    def show_fingerprint(self, command):
+        if self.server_type != "admin":
+            print("This command is only allowed in ADMIN mode")
+        response = self.http_client.request("GET", "/admin/fingerprint", use_api_base=True, auth_kind="admin")
+        res_json = response.json()
+        if response.status_code == 200:
+            self._print_table_simple(res_json["data"])
+        else:
+            print(f"Fail to show fingerprint, code: {res_json['code']}, message: {res_json['message']}")
+
+    def set_license(self, command):
+        if self.server_type != "admin":
+            print("This command is only allowed in ADMIN mode")
+        license = command["license"]
+        response = self.http_client.request("POST", "/admin/license", json_body={"license": license}, use_api_base=True, auth_kind="admin")
+        res_json = response.json()
+        if response.status_code == 200:
+            print("Set license successfully")
+        else:
+            print(f"Fail to set license, code: {res_json['code']}, message: {res_json['message']}")
+
+    def set_license_config(self, command):
+        if self.server_type != "admin":
+            print("This command is only allowed in ADMIN mode")
+        value1 = command["value1"]
+        value2 = command["value2"]
+        response = self.http_client.request("POST", "/admin/license/config", json_body={"value1": value1, "value2": value2}, use_api_base=True, auth_kind="admin")
+        res_json = response.json()
+        if response.status_code == 200:
+            print("Set license successfully")
+        else:
+            print(f"Fail to set license, code: {res_json['code']}, message: {res_json['message']}")
+
+    def show_license(self, command):
+        if self.server_type != "admin":
+            print("This command is only allowed in ADMIN mode")
+        response = self.http_client.request("GET", "/admin/license", use_api_base=True, auth_kind="admin")
+        res_json = response.json()
+        if response.status_code == 200:
+            self._print_table_simple(res_json["data"])
+        else:
+            print(f"Fail to show license, code: {res_json['code']}, message: {res_json['message']}")
+
+    def check_license(self, command):
+        if self.server_type != "admin":
+            print("This command is only allowed in ADMIN mode")
+        response = self.http_client.request("GET", "/admin/license?check=true", use_api_base=True, auth_kind="admin")
+        res_json = response.json()
+        if response.status_code == 200:
+            print(res_json["data"])
+        else:
+            print(f"Fail to show license, code: {res_json['code']}, message: {res_json['message']}")
+
+
     def list_server_configs(self, command):
         """List server configs by calling /system/configs API and flattening the JSON response."""
         response = self.http_client.request("GET", "/system/configs", use_api_base=False, auth_kind="web")
@@ -710,14 +764,14 @@ class RAGFlowClient:
 
         iterations = command.get("iterations", 1)
         if iterations > 1:
-            response = self.http_client.request("POST", "/kb/list", use_api_base=False, auth_kind="web",
+            response = self.http_client.request("GET", "/datasets", use_api_base=True, auth_kind="web",
                                                 iterations=iterations)
             return response
         else:
-            response = self.http_client.request("POST", "/kb/list", use_api_base=False, auth_kind="web")
+            response = self.http_client.request("GET", "/datasets", use_api_base=True, auth_kind="web")
             res_json = response.json()
             if response.status_code == 200:
-                self._print_table_simple(res_json["data"]["kbs"])
+                self._print_table_simple(res_json["data"])
             else:
                 print(f"Fail to list datasets, code: {res_json['code']}, message: {res_json['message']}")
             return None
@@ -727,13 +781,13 @@ class RAGFlowClient:
             print("This command is only allowed in USER mode")
         payload = {
             "name": command["dataset_name"],
-            "embd_id": command["embedding"]
+            "embedding_model": command["embedding"]
         }
         if "parser_id" in command:
-            payload["parser_id"] = command["parser"]
+            payload["chunk_method"] = command["parser"]
         if "pipeline" in command:
             payload["pipeline_id"] = command["pipeline"]
-        response = self.http_client.request("POST", "/kb/create", json_body=payload, use_api_base=False,
+        response = self.http_client.request("POST", "/datasets", json_body=payload, use_api_base=True,
                                             auth_kind="web")
         res_json = response.json()
         if response.status_code == 200:
@@ -749,8 +803,8 @@ class RAGFlowClient:
         dataset_id = self._get_dataset_id(dataset_name)
         if dataset_id is None:
             return
-        payload = {"kb_id": dataset_id}
-        response = self.http_client.request("POST", "/kb/rm", json_body=payload, use_api_base=False, auth_kind="web")
+        payload = {"ids": [dataset_id]}
+        response = self.http_client.request("DELETE", "/datasets", json_body=payload, use_api_base=True, auth_kind="web")
         res_json = response.json()
         if response.status_code == 200:
             print(f"Drop dataset {dataset_name} successfully")
@@ -1295,13 +1349,13 @@ class RAGFlowClient:
         return res_json["data"]["docs"]
 
     def _get_dataset_id(self, dataset_name: str):
-        response = self.http_client.request("POST", "/kb/list", use_api_base=False, auth_kind="web")
+        response = self.http_client.request("GET", "/datasets", use_api_base=True, auth_kind="web")
         res_json = response.json()
         if response.status_code != 200:
             print(f"Fail to list datasets, code: {res_json['code']}, message: {res_json['message']}")
             return None
 
-        dataset_list = res_json["data"]["kbs"]
+        dataset_list = res_json["data"]
         dataset_id: str = ""
         for dataset in dataset_list:
             if dataset["name"] == dataset_name:
@@ -1514,6 +1568,16 @@ def run_command(client: RAGFlowClient, command_dict: dict):
             client.list_configs(command_dict)
         case "list_environments":
             client.list_environments(command_dict)
+        case "show_fingerprint":
+            client.show_fingerprint(command_dict)
+        case "set_license":
+            client.set_license(command_dict)
+        case "set_license_config":
+            client.set_license_config(command_dict)
+        case "show_license":
+            client.show_license(command_dict)
+        case "check_license":
+            client.check_license(command_dict)
         case "list_server_configs":
             client.list_server_configs(command_dict)
         case "create_model_provider":