aiverify-moonshot 0.4.11__py3-none-any.whl → 0.5.0__py3-none-any.whl

moonshot/src/connectors_endpoints/connector_endpoint.py

@@ -1,12 +1,20 @@
 from pathlib import Path
 
-from pydantic import validate_call
+from pydantic import constr, validate_call
 from slugify import slugify
 
 from moonshot.src.configs.env_variables import EnvVariables
 from moonshot.src.connectors_endpoints.connector_endpoint_arguments import (
     ConnectorEndpointArguments,
 )
+from moonshot.src.messages_constants import (
+    CONNECTOR_ENDPOINT_CREATE_ERROR,
+    CONNECTOR_ENDPOINT_DELETE_ERROR,
+    CONNECTOR_ENDPOINT_GET_AVAILABLE_ITEMS_ERROR,
+    CONNECTOR_ENDPOINT_READ_ERROR,
+    CONNECTOR_ENDPOINT_READ_INVALID,
+    CONNECTOR_ENDPOINT_UPDATE_ERROR,
+)
 from moonshot.src.storage.storage import Storage
 from moonshot.src.utils.log import configure_logger
 
@@ -16,6 +24,7 @@ logger = configure_logger(__name__)
 
 class ConnectorEndpoint:
     @staticmethod
+    @validate_call
     def create(ep_args: ConnectorEndpointArguments) -> str:
         """
         Creates a new connector endpoint and stores its details as a JSON object.
@@ -47,6 +56,7 @@ class ConnectorEndpoint:
                 "token": ep_args.token,
                 "max_calls_per_second": ep_args.max_calls_per_second,
                 "max_concurrency": ep_args.max_concurrency,
+                "model": ep_args.model,
                 "params": ep_args.params,
             }
 
@@ -57,12 +67,12 @@ class ConnectorEndpoint:
             return ep_id
 
         except Exception as e:
-            logger.error(f"Failed to create endpoint: {str(e)}")
+            logger.error(CONNECTOR_ENDPOINT_CREATE_ERROR.format(message=str(e)))
             raise e
 
     @staticmethod
     @validate_call
-    def read(ep_id: str) -> ConnectorEndpointArguments:
+    def read(ep_id: constr(min_length=1)) -> ConnectorEndpointArguments:
         """
         Retrieves the details of a specified endpoint by its ID.
 
@@ -72,27 +82,24 @@ class ConnectorEndpoint:
         any other error occurs, an exception is raised with an appropriate error message.
 
         Args:
-            ep_id (str): The unique identifier of the endpoint whose details are to be retrieved.
+            ep_id (constr(min_length=1)): The unique identifier of the endpoint whose details are to be retrieved.
 
         Returns:
             ConnectorEndpointArguments: An instance filled with the endpoint's details.
 
         Raises:
-            RuntimeError: If the endpoint ID is empty or the specified endpoint does not exist.
+            RuntimeError: If the specified endpoint does not exist.
             Exception: For any issues encountered during the file reading or data parsing process.
         """
         try:
-            if not ep_id:
-                raise RuntimeError("Connector Endpoint ID is empty.")
-
             endpoint_details = ConnectorEndpoint._read_endpoint(ep_id)
             if not endpoint_details:
-                raise RuntimeError(f"Endpoint with ID '{ep_id}' does not exist.")
+                raise RuntimeError(CONNECTOR_ENDPOINT_READ_INVALID.format(ep_id=ep_id))
 
             return ConnectorEndpointArguments(**endpoint_details)
 
         except Exception as e:
-            logger.error(f"Failed to read endpoint: {str(e)}")
+            logger.error(CONNECTOR_ENDPOINT_READ_ERROR.format(message=str(e)))
             raise e
 
     @staticmethod
@@ -124,6 +131,7 @@ class ConnectorEndpoint:
         return connector_endpoint_info
 
     @staticmethod
+    @validate_call
     def update(ep_args: ConnectorEndpointArguments) -> bool:
         """
         Updates the endpoint information in the storage based on the provided ConnectorEndpointArguments object.
@@ -138,11 +146,10 @@ class ConnectorEndpoint:
             ep_args (ConnectorEndpointArguments): The object encapsulating the updated attributes of the endpoint.
 
         Returns:
-            bool: Indicates whether the update operation was successful. Returns True if the update was successfully
-            persisted to the storage; otherwise, an exception is raised.
+            bool: True if the update was successfully persisted to the storage; otherwise, an exception is raised.
 
         Raises:
-            Exception: Signifies a failure in the update process, potentially due to issues with data serialization or
+            Exception: If the update process encounters an error, potentially due to issues with data serialization or
             storage access.
         """
         try:
@@ -160,24 +167,24 @@ class ConnectorEndpoint:
             return True
 
         except Exception as e:
-            logger.error(f"Failed to update endpoint: {str(e)}")
+            logger.error(CONNECTOR_ENDPOINT_UPDATE_ERROR.format(message=str(e)))
             raise e
 
     @staticmethod
     @validate_call
-    def delete(ep_id: str) -> bool:
+    def delete(ep_id: constr(min_length=1)) -> bool:
         """
         Deletes the endpoint with the specified ID.
 
         This method attempts to delete the endpoint corresponding to the given ID from the storage.
-        If the deletion is successful, it returns True. If an error occurs, it prints an error message
+        If the deletion is successful, it returns True. If an error occurs, it logs an error message
         and re-raises the exception.
 
         Args:
-            ep_id (str): The unique identifier of the endpoint to be deleted.
+            ep_id (constr(min_length=1)): The unique identifier of the endpoint to be deleted
 
         Returns:
-            bool: True if the endpoint was successfully deleted.
+            bool: True if the endpoint was successfully deleted; otherwise, an exception is raised.
 
         Raises:
             Exception: If the deletion process encounters an error.
@@ -187,7 +194,7 @@ class ConnectorEndpoint:
             return True
 
         except Exception as e:
-            logger.error(f"Failed to delete endpoint: {str(e)}")
+            logger.error(CONNECTOR_ENDPOINT_DELETE_ERROR.format(message=str(e)))
             raise e
 
     @staticmethod
@@ -204,6 +211,9 @@ class ConnectorEndpoint:
         Returns:
             tuple[list[str], list[ConnectorEndpointArguments]]: A tuple containing a list of endpoint IDs and a list of
             ConnectorEndpointArguments objects with endpoint details.
+
+        Raises:
+            Exception: If the process of fetching available items encounters an error.
         """
         try:
             retn_eps = []
@@ -223,5 +233,7 @@ class ConnectorEndpoint:
             return retn_eps_ids, retn_eps
 
         except Exception as e:
-            logger.error(f"Failed to get available endpoints: {str(e)}")
+            logger.error(
+                CONNECTOR_ENDPOINT_GET_AVAILABLE_ITEMS_ERROR.format(message=str(e))
+            )
             raise e

moonshot/src/connectors_endpoints/connector_endpoint_arguments.py

@@ -22,6 +22,8 @@ class ConnectorEndpointArguments(BaseModel):
         gt=0
     )  # max_concurrency (int): The number of concurrent api calls
 
+    model: str  # model (str): The model identifier for the LLM connector.
+
     params: dict  # params (dict): A dictionary that contains connection specified parameters
 
     # created_date (str): The date and time the endpoint was created in isoformat without 'T'.
@@ -34,7 +36,7 @@ class ConnectorEndpointArguments(BaseModel):
 
         This method takes all the attributes of the ConnectorEndpointArguments instance and constructs a dictionary
         with attribute names as keys and their corresponding values. This includes the id, name, connector_type, uri,
-        token, max_calls_per_second, max_concurrency, params, and created_date. This dictionary can be used for
+        token, max_calls_per_second, max_concurrency, model, params, and created_date. This dictionary can be used for
         serialization purposes, such as storing the endpoint information in a JSON file or sending it over a network.
 
         Returns:
@@ -49,6 +51,7 @@ class ConnectorEndpointArguments(BaseModel):
             "token": self.token,
             "max_calls_per_second": self.max_calls_per_second,
             "max_concurrency": self.max_concurrency,
+            "model": self.model,
             "params": self.params,
             "created_date": self.created_date,
         }

moonshot/src/messages_constants.py

@@ -15,7 +15,9 @@ BOOKMARK_GET_BOOKMARK_ERROR_1 = "[Bookmark] Invalid bookmark name: {message}"
 # BOOKMARK - delete_bookmark
 # ------------------------------------------------------------------------------
 BOOKMARK_DELETE_BOOKMARK_SUCCESS = "[Bookmark] Bookmark record deleted."
-BOOKMARK_DELETE_BOOKMARK_FAIL = "[Bookmark] Bookmark record not found. Unable to delete."
+BOOKMARK_DELETE_BOOKMARK_FAIL = (
+    "[Bookmark] Bookmark record not found. Unable to delete."
+)
 BOOKMARK_DELETE_BOOKMARK_ERROR = (
     "[Bookmark] Failed to delete bookmark record: {message}"
 )
@@ -33,9 +35,89 @@ BOOKMARK_DELETE_ALL_BOOKMARK_ERROR = (
 # BOOKMARK - export_bookmarks
 # ------------------------------------------------------------------------------
 BOOKMARK_EXPORT_BOOKMARK_ERROR = "[Bookmark] Failed to export bookmarks: {message}"
-BOOKMARK_EXPORT_BOOKMARK_VALIDATION_ERROR = "Export filename must be a non-empty string"
+BOOKMARK_EXPORT_BOOKMARK_VALIDATION_ERROR = (
+    "Export filename must be a non-empty string."
+)
 
 # ------------------------------------------------------------------------------
 # BOOKMARK ARGUMENTS - from_tuple_to_dict
 # ------------------------------------------------------------------------------
-BOOKMARK_ARGUMENTS_FROM_TUPLE_TO_DICT_VALIDATION_ERROR = "[BookmarkArguments] Failed to convert to dictionary because of the insufficient number of values"  # noqa: E501
+BOOKMARK_ARGUMENTS_FROM_TUPLE_TO_DICT_VALIDATION_ERROR = "[BookmarkArguments] Failed to convert to dictionary because of the insufficient number of values."  # noqa: E501
+
+# ------------------------------------------------------------------------------
+# CONNECTOR - perform_retry_callback
+# ------------------------------------------------------------------------------
+CONNECTOR_PERFORM_RETRY_CALLBACK_ERROR = "[Connector ID: {connector_id}] Attempt {attempt_no} failed due to error: {message}"  # noqa: E501
+
+# ------------------------------------------------------------------------------
+# CONNECTOR - load
+# ------------------------------------------------------------------------------
+CONNECTOR_LOAD_CONNECTOR_ENDPOINT_ARGUMENTS_VALIDATION_ERROR = "[Connector] The 'ep_args' argument must be an instance of ConnectorEndpointArguments and not None."  # noqa: E501
+CONNECTOR_LOAD_CONNECTOR_INSTANCE_RUNTIME_ERROR = (
+    "[Connector] Failed to get connector instance: {message}"
+)
+
+# ------------------------------------------------------------------------------
+# CONNECTOR - create
+# ------------------------------------------------------------------------------
+CONNECTOR_CREATE_CONNECTOR_ENDPOINT_ARGUMENTS_VALIDATION_ERROR = "[Connector] The 'ep_args' argument must be an instance of ConnectorEndpointArguments and not None."  # noqa: E501
+CONNECTOR_CREATE_ERROR = "[Connector] Failed to create connector: {message}"
+
+# ------------------------------------------------------------------------------
+# CONNECTOR - get_available_items
+# ------------------------------------------------------------------------------
+CONNECTOR_GET_AVAILABLE_ITEMS_ERROR = (
+    "[Connector] Failed to get available connectors: {message}"
+)
+
+# ------------------------------------------------------------------------------
+# CONNECTOR - get_prediction
+# ------------------------------------------------------------------------------
+CONNECTOR_GET_PREDICTION_ARGUMENTS_GENERATED_PROMPT_VALIDATION_ERROR = "[Connector] The 'generated_prompt' argument must be an instance of ConnectorPromptArguments and not None."  # noqa: E501
+CONNECTOR_GET_PREDICTION_ARGUMENTS_CONNECTOR_VALIDATION_ERROR = "[Connector] The 'connector' argument must be an instance of Connector and not None."  # noqa: E501
+CONNECTOR_GET_PREDICTION_INFO = (
+    "[Connector ID: {connector_id}] Predicting Prompt Index {prompt_index}."
+)
+CONNECTOR_GET_PREDICTION_TIME_TAKEN_INFO = "[Connector ID: {connector_id}] Prompt Index {prompt_index} took {prompt_duration}s."  # noqa: E501
+CONNECTOR_GET_PREDICTION_ERROR = "[Connector ID: {connector_id}] Prompt Index {prompt_index} failed to get prediction: {message}"  # noqa: E501
+
+# ------------------------------------------------------------------------------
+# CONNECTOR - set_system_prompt
+# ------------------------------------------------------------------------------
+CONNECTOR_SET_SYSTEM_PROMPT_VALIDATION_ERROR = "[Connector] The 'system_prompt' argument must be an instance of string and not None."  # noqa: E501
+
+# ------------------------------------------------------------------------------
+# CONNECTOR ENDPOINT - create
+# ------------------------------------------------------------------------------
+CONNECTOR_ENDPOINT_CREATE_ERROR = (
+    "[ConnectorEndpoint] Failed to create connector endpoint: {message}"
+)
+
+# ------------------------------------------------------------------------------
+# CONNECTOR ENDPOINT - read
+# ------------------------------------------------------------------------------
+CONNECTOR_ENDPOINT_READ_INVALID = "Invalid connector endpoint id - {ep_id}"
+CONNECTOR_ENDPOINT_READ_ERROR = (
+    "[ConnectorEndpoint] Failed to read connector endpoint: {message}"
+)
+
+# ------------------------------------------------------------------------------
+# CONNECTOR ENDPOINT - update
+# ------------------------------------------------------------------------------
+CONNECTOR_ENDPOINT_UPDATE_ERROR = (
+    "[ConnectorEndpoint] Failed to update connector endpoint: {message}"
+)
+
+# ------------------------------------------------------------------------------
+# CONNECTOR ENDPOINT - delete
+# ------------------------------------------------------------------------------
+CONNECTOR_ENDPOINT_DELETE_ERROR = (
+    "[ConnectorEndpoint] Failed to delete connector endpoint: {message}"
+)
+
+# ------------------------------------------------------------------------------
+# CONNECTOR ENDPOINT - get_available_items
+# ------------------------------------------------------------------------------
+CONNECTOR_ENDPOINT_GET_AVAILABLE_ITEMS_ERROR = (
+    "[ConnectorEndpoint] Failed to get available connector endpoints: {message}"
+)