- moved hardcoded constants into options;

Author: jaltmayerpizzorno

src/coverup/coverup.py

@@ -64,7 +64,7 @@ def Path_dir(value):
     ap.add_argument('--checkpoint', type=Path, 
                     help=f'path to save progress to (and to resume it from)')
     ap.add_argument('--no-checkpoint', action='store_const', const=None, dest='checkpoint', default=argparse.SUPPRESS,
-                    help=f'disables checkpoint')
+                    help='disable checkpoint')
 
     def default_model():
         if 'OPENAI_API_KEY' in os.environ:
@@ -82,6 +82,12 @@ def default_model():
                     default='gpt-v2',
                     help='Prompt style to use')
 
+    ap.add_argument('--ollama-api-base', type=str, default="http://localhost:11434",
+                    help='"api_base" setting for Ollama models')
+
+    ap.add_argument('--bedrock-anthropic-version', type=str, default="bedrock-2023-05-31",
+                    help='"anthropic_version" setting for bedrock Anthropic models')
+
     ap.add_argument('--model-temperature', type=float, default=0,
                     help='Model "temperature" to use')
 
@@ -657,6 +663,13 @@ def main():
             if args.rate_limit:
                 chatter.set_token_rate_limit((args.rate_limit, 60))
 
+            extra_request_pars = {}
+            if "ollama" in args.model:
+                extra_request_pars['api_base'] = args.ollama_api_base
+            if args.model.startswith("bedrock/anthropic"):
+                extra_request_pars['anthropic_version'] = args.bedrock_anthropic_version
+            chatter.set_extra_request_pars(extra_request_pars)
+
             prompter = prompter_registry[args.prompt](cmd_args=args)
             for f in prompter.get_functions():
                 chatter.add_function(f)

src/coverup/llm.py

@@ -112,6 +112,7 @@ def __init__(self, model: str) -> None:
         self._signal_retry = lambda: None
         self._functions: dict[str, dict[str, T.Any]] = dict()
         self._max_func_calls_per_chat = 50
+        self._extra_request_pars = None
 
     @staticmethod
     def _validate_model(model) -> None:
@@ -174,6 +175,10 @@ def set_signal_retry(self, signal_retry: T.Callable) -> None:
         """Sets up a callback to indicate a retry."""
         self._signal_retry = signal_retry
 
+    def set_extra_request_pars(self, request_pars: dict[str, T.Any] | None) -> None:
+        """Sets additional parameters to pass into the LLM request."""
+        self._extra_request_pars = request_pars
+
     def add_function(self, function: T.Callable) -> None:
         """Makes a function availabe to the LLM."""
         if not litellm.supports_function_calling(self._model):
@@ -190,19 +195,14 @@ def add_function(self, function: T.Callable) -> None:
         self._functions[schema['name']] = {"function": function, "schema": schema}
 
     def _request(self, messages: T.List[dict]) -> dict:
-        request = {
+        return {
             'model': self._model,
             **({'temperature': self._model_temperature} if self._model_temperature is not None else {}),
             'messages': messages,
-            **({'api_base': "http://localhost:11434"} if "ollama" in self._model else {}),
-            **({'tools': [{'type': 'function', 'function': f['schema']} for f in self._functions.values()]} if self._functions else {})
+            **({'tools': [{'type': 'function', 'function': f['schema']} for f in self._functions.values()]} if self._functions else {}),
+            **(self._extra_request_pars if self._extra_request_pars else {})
         }
 
-        if self._model.startswith("bedrock/anthropic"):
-            request['anthropic_version'] = "bedrock-2023-05-31"
-
-        return request
-
     async def _send_request(self, request: dict, ctx: object) -> litellm.ModelResponse | None:
         """Sends the LLM chat request, handling common failures and returning the response."""
         sleep = 1