From b1188587fc4b75acd9b84998c2345bfd189e6d0d Mon Sep 17 00:00:00 2001 From: Federico Luzzi Date: Sun, 21 Jul 2024 18:39:46 -0300 Subject: [PATCH] change to openai 4o mini and improvements to ai code for new model --- connpy/_version.py | 2 +- connpy/ai.py | 30 ++++++++++++++++++++---------- docs/connpy/index.html | 34 ++++++++++++++++++++++------------ 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/connpy/_version.py b/connpy/_version.py index 87f75a0..52e5ccb 100644 --- a/connpy/_version.py +++ b/connpy/_version.py @@ -1,2 +1,2 @@ -__version__ = "4.1.0" +__version__ = "4.1.1" diff --git a/connpy/ai.py b/connpy/ai.py index cae38f2..11f0a02 100755 --- a/connpy/ai.py +++ b/connpy/ai.py @@ -14,7 +14,7 @@ class ai: ### Attributes: - - model (str): Model of GPT api to use. Default is gpt-3.5-turbo. + - model (str): Model of GPT api to use. Default is gpt-4o-mini. - temp (float): Value between 0 and 1 that control the randomness of generated text, with higher values increasing @@ -39,7 +39,7 @@ class ai: - api_key (str): A unique authentication token required to access and interact with the API. - - model (str): Model of GPT api to use. Default is gpt-3.5-turbo. + - model (str): Model of GPT api to use. Default is gpt-4o-mini. - temp (float): Value between 0 and 1 that control the randomness of generated text, with higher values increasing @@ -68,7 +68,7 @@ class ai: try: self.model = self.config.config["openai"]["model"] except: - self.model = "gpt-3.5-turbo" + self.model = "gpt-4o-mini" self.temp = temp self.__prompt = {} self.__prompt["original_system"] = """ @@ -128,7 +128,7 @@ Categorize the user's request based on the operation they want to perform on the self.__prompt["original_function"]["parameters"]["required"] = ["type", "filter"] self.__prompt["command_system"] = """ For each OS listed below, provide the command(s) needed to perform the specified action, depending on the device OS (e.g., Cisco IOSXR router, Linux server). - The application knows how to connect to devices via SSH, so you only need to provide the command(s) to run after connecting. + The application knows how to connect to devices via SSH, so you only need to provide the command(s) to run after connecting. This includes access configuration mode and commiting if required. If the commands needed are not for the specific OS type, just send an empty list (e.g., []). Note: Preserving the integrity of user-provided commands is of utmost importance. If a user has provided a specific command to run, include that command exactly as it was given, even if it's not recognized or understood. Under no circumstances should you modify or alter user-provided commands. """ @@ -143,7 +143,7 @@ Categorize the user's request based on the operation they want to perform on the self.__prompt["command_function"]["name"] = "get_commands" self.__prompt["command_function"]["descriptions"] = """ For each OS listed below, provide the command(s) needed to perform the specified action, depending on the device OS (e.g., Cisco IOSXR router, Linux server). - The application knows how to connect to devices via SSH, so you only need to provide the command(s) to run after connecting. + The application knows how to connect to devices via SSH, so you only need to provide the command(s) to run after connecting. This includes access configuration mode and commiting if required. If the commands needed are not for the specific OS type, just send an empty list (e.g., []). """ self.__prompt["command_function"]["parameters"] = {} @@ -196,7 +196,7 @@ Categorize the user's request based on the operation they want to perform on the @MethodHook def _clean_command_response(self, raw_response, node_list): - #Parse response for command request to openAI GPT. + # Parse response for command request to openAI GPT. info_dict = {} info_dict["commands"] = [] info_dict["variables"] = {} @@ -204,14 +204,24 @@ Categorize the user's request based on the operation they want to perform on the for key, value in node_list.items(): newvalue = {} commands = raw_response[value] - for i,e in enumerate(commands, start=1): - newvalue[f"command{i}"] = e + # Ensure commands is a list + if isinstance(commands, str): + commands = [commands] + # Determine the number of digits required for zero-padding + num_commands = len(commands) + num_digits = len(str(num_commands)) + + for i, e in enumerate(commands, start=1): + # Zero-pad the command number + command_num = f"command{str(i).zfill(num_digits)}" + newvalue[command_num] = e if f"{{command{i}}}" not in info_dict["commands"]: - info_dict["commands"].append(f"{{command{i}}}") - info_dict["variables"]["__global__"][f"command{i}"] = "" + info_dict["commands"].append(f"{{{command_num}}}") + info_dict["variables"]["__global__"][command_num] = "" info_dict["variables"][key] = newvalue return info_dict + @MethodHook def _get_commands(self, user_input, nodes): #Send the request for commands for each device to openAI GPT. diff --git a/docs/connpy/index.html b/docs/connpy/index.html index 211056a..7ad08da 100644 --- a/docs/connpy/index.html +++ b/docs/connpy/index.html @@ -1160,7 +1160,7 @@ indicating successful verification.

This class generates a ai object. Containts all the information and methods to make requests to openAI chatGPT to run actions on the application.

Attributes:

-
- model        (str): Model of GPT api to use. Default is gpt-3.5-turbo.
+
- model        (str): Model of GPT api to use. Default is gpt-4o-mini.
 
 - temp       (float): Value between 0 and 1 that control the randomness 
                       of generated text, with higher values increasing 
@@ -1178,7 +1178,7 @@ indicating successful verification.

 - api_key (str): A unique authentication token required to access 
                  and interact with the API.
 
-- model   (str): Model of GPT api to use. Default is gpt-3.5-turbo.
+- model   (str): Model of GPT api to use. Default is gpt-4o-mini.
 
 - temp  (float): Value between 0 and 1 that control the randomness 
                  of generated text, with higher values increasing 
@@ -1194,7 +1194,7 @@ class ai:
 
     ### Attributes:  
 
-        - model        (str): Model of GPT api to use. Default is gpt-3.5-turbo.
+        - model        (str): Model of GPT api to use. Default is gpt-4o-mini.
 
         - temp       (float): Value between 0 and 1 that control the randomness 
                               of generated text, with higher values increasing 
@@ -1219,7 +1219,7 @@ class ai:
             - api_key (str): A unique authentication token required to access 
                              and interact with the API.
 
-            - model   (str): Model of GPT api to use. Default is gpt-3.5-turbo. 
+            - model   (str): Model of GPT api to use. Default is gpt-4o-mini. 
 
             - temp  (float): Value between 0 and 1 that control the randomness 
                              of generated text, with higher values increasing 
@@ -1248,7 +1248,7 @@ class ai:
             try:
                 self.model = self.config.config["openai"]["model"]
             except:
-                self.model = "gpt-3.5-turbo"
+                self.model = "gpt-4o-mini"
         self.temp = temp
         self.__prompt = {}
         self.__prompt["original_system"] = """
@@ -1308,7 +1308,7 @@ Categorize the user's request based on the operation they want to perform on
         self.__prompt["original_function"]["parameters"]["required"] = ["type", "filter"]
         self.__prompt["command_system"] = """
         For each OS listed below, provide the command(s) needed to perform the specified action, depending on the device OS (e.g., Cisco IOSXR router, Linux server).
-        The application knows how to connect to devices via SSH, so you only need to provide the command(s) to run after connecting. 
+        The application knows how to connect to devices via SSH, so you only need to provide the command(s) to run after connecting. This includes access configuration mode and commiting if required.
         If the commands needed are not for the specific OS type, just send an empty list (e.g., []). 
         Note: Preserving the integrity of user-provided commands is of utmost importance. If a user has provided a specific command to run, include that command exactly as it was given, even if it's not recognized or understood. Under no circumstances should you modify or alter user-provided commands.
     """
@@ -1323,7 +1323,7 @@ Categorize the user's request based on the operation they want to perform on
         self.__prompt["command_function"]["name"] = "get_commands"
         self.__prompt["command_function"]["descriptions"] = """ 
         For each OS listed below, provide the command(s) needed to perform the specified action, depending on the device OS (e.g., Cisco IOSXR router, Linux server).
-        The application knows how to connect to devices via SSH, so you only need to provide the command(s) to run after connecting. 
+        The application knows how to connect to devices via SSH, so you only need to provide the command(s) to run after connecting. This includes access configuration mode and commiting if required.
         If the commands needed are not for the specific OS type, just send an empty list (e.g., []). 
     """
         self.__prompt["command_function"]["parameters"] = {}
@@ -1376,7 +1376,7 @@ Categorize the user's request based on the operation they want to perform on
 
     @MethodHook
     def _clean_command_response(self, raw_response, node_list):
-        #Parse response for command request to openAI GPT.
+        # Parse response for command request to openAI GPT.
         info_dict = {}
         info_dict["commands"] = []
         info_dict["variables"] = {}
@@ -1384,14 +1384,24 @@ Categorize the user's request based on the operation they want to perform on
         for key, value in node_list.items():
             newvalue = {}
             commands = raw_response[value]
-            for i,e in enumerate(commands, start=1):
-                newvalue[f"command{i}"] = e
+            # Ensure commands is a list
+            if isinstance(commands, str):
+                commands = [commands]
+            # Determine the number of digits required for zero-padding
+            num_commands = len(commands)
+            num_digits = len(str(num_commands))
+
+            for i, e in enumerate(commands, start=1):
+                # Zero-pad the command number
+                command_num = f"command{str(i).zfill(num_digits)}"
+                newvalue[command_num] = e
                 if f"{{command{i}}}" not in info_dict["commands"]:
-                    info_dict["commands"].append(f"{{command{i}}}")
-                    info_dict["variables"]["__global__"][f"command{i}"] = ""
+                    info_dict["commands"].append(f"{{{command_num}}}")
+                    info_dict["variables"]["__global__"][command_num] = ""
                 info_dict["variables"][key] = newvalue
         return info_dict
 
+
     @MethodHook
     def _get_commands(self, user_input, nodes):
         #Send the request for commands for each device to openAI GPT.