Added: click support for additional_context (#37)

gptty/__main__.py

@@ -137,20 +137,21 @@ async def chat_async_wrapper(config_path:str, verbose:bool):
 # @click.option('--log', '-l', is_flag=True, callback=print_version,
 #               expose_value=False, is_eager=True, help="Show question log.")
 @click.option('--config_path', '-c', default=os.path.join(os.getcwd(),'gptty.ini'), help="Path to config file.")
+@click.option('--additional_context', '-a', default="", help="Pass more context to your questions.")
 @click.option('--question', '-q', multiple=True, help='Repeatable list of questions.')
 @click.option('--tag', '-t', default="", help='Tag to categorize your query. [optional]')
 @click.option('--verbose', '-v', is_flag=True, help="Show debug data.")
 @click.option('--json', '-j', is_flag=True, help="Return query as JSON object.")
 @click.option('--quiet', is_flag=True, help="Don't write to stdout.")
-def query(config_path:str, question:str, tag:str, verbose:bool, json:bool, quiet:bool):
+def query(config_path:str, additional_context:str, question:str, tag:str, verbose:bool, json:bool, quiet:bool):
   """
   Submit a gptty query
   """
 
-  asyncio.run(query_async_wrapper(config_path, question, tag, verbose, json, quiet))
+  asyncio.run(query_async_wrapper(config_path, question, tag, additional_context, verbose, json, quiet))
 
 
-async def query_async_wrapper(config_path:str, question:str, tag:str, verbose:bool, json:bool, quiet:bool):
+async def query_async_wrapper(config_path:str, question:str, tag:str, additional_context:str, verbose:bool, json:bool, quiet:bool):
   # load the app configs
   configs = get_config_data(config_file=config_path)
 
@@ -161,7 +162,7 @@ async def query_async_wrapper(config_path:str, question:str, tag:str, verbose:bo
   # create the output file if it doesn't exist
   with open (configs['output_file'], 'a'): pass
 
-  await run_query(questions=question, tag=tag, configs=configs, config_path=config_path, verbose=verbose, return_json=json, quiet=quiet)
+  await run_query(questions=question, tag=tag, configs=configs, additional_context=additional_context, config_path=config_path, verbose=verbose, return_json=json, quiet=quiet)
 
 
 @click.command()

gptty/context.py

@@ -74,6 +74,8 @@ def get_context(tag: str,
                 question: str = None, 
                 debug: bool = False):
 
+    # additional_context = additional_context.replace("\n",'')
+
     if len(tag) < 1:
         if model_type == 'v1/chat/completions':
 
@@ -99,7 +101,7 @@ def get_context(tag: str,
 
                 remaining_tokens = max_context_length - (len(question.split()))
                 if remaining_tokens > 0:
-                    question = ' '.join(additional_context.split()[:remaining_tokens]) + question
+                    question = ' '.join(additional_context.split()[:remaining_tokens]) + " " + question
 
 
             if debug:
@@ -174,7 +176,7 @@ def get_context(tag: str,
             # inexplicable responses.
             remaining_tokens = max_context_length - (len(context.split()) + len(question.split()))
             if remaining_tokens > 0:
-                context = ' '.join(additional_context.split()[:remaining_tokens]) + context
+                context = ' '.join(additional_context.split()[:remaining_tokens]) + " " + context
 
 
         context = context.strip() + ' ' + question

gptty/gptty.py

@@ -228,7 +228,7 @@ async def create_chat_room(configs=get_config_data(), log_responses:bool=True, c
 
 
 # this is used when we run the `query` command
-async def run_query(questions:list, tag:str, configs=get_config_data(), log_responses:bool=True, config_path=None, verbose:bool=False, return_json:bool=False, quiet:bool=False):
+async def run_query(questions:list, tag:str, configs=get_config_data(), additional_context:str="", log_responses:bool=True, config_path=None, verbose:bool=False, return_json:bool=False, quiet:bool=False):
 
     if not os.path.exists(config_path):
         click.echo(f"{RED}FAILED to access app config file at {config_path}. Are you sure this is a valid config file? Run `gptty chat --help` for more information.")
@@ -284,7 +284,7 @@ async def run_query(questions:list, tag:str, configs=get_config_data(), log_resp
             # we create the callable wait_graphic task
             wait_task = asyncio.create_task(wait_graphic())
 
-        fully_contextualized_question = get_context(tag, configs['max_context_length'], configs['output_file'], model_engine, context_keywords_only=configs['context_keywords_only'], model_type=model_type, question=question, debug=verbose)
+        fully_contextualized_question = get_context(tag, configs['max_context_length'], configs['output_file'], model_engine, additional_context=additional_context, context_keywords_only=configs['context_keywords_only'], model_type=model_type, question=question, debug=verbose)
 
         response_task = asyncio.create_task(fetch_response(fully_contextualized_question, model_engine, max_tokens, temperature, model_type))