ApiLogicServer 12.0.4__py3-none-any.whl → 12.1.0__py3-none-any.whl

api_logic_server_cli/genai.py

@@ -1,3 +1,5 @@
+import json
+import time
 from typing import Dict, List
 from api_logic_server_cli.cli_args_project import Project
 import logging
@@ -7,11 +9,31 @@ import requests
 import os
 import create_from_model.api_logic_server_utils as utils
 import shutil
+import openai
+from openai import OpenAI
+from typing import List, Dict
+from pydantic import BaseModel
+from dotmap import DotMap
 
 log = logging.getLogger(__name__)
 
-k_update_prior_response = ', by updating the prior response.'
-""" , by updating the prior response. """
+class Rule(BaseModel):
+    name: str
+    description: str
+    code: str # logicbank rule code
+    
+class Model(BaseModel):
+    classname: str
+    code: str # sqlalchemy model code
+    description: str
+    name: str
+
+class WGResult(BaseModel):  # must match system/genai/prompt_inserts/response_format.prompt
+    # response: str # result
+    models : List[Model] # list of sqlalchemy classes in the response
+    rules : List[Rule] # list rule declarations
+    test_data: str
+
 
 class GenAI(object):
     """ Create project from genai prompt(s).  
@@ -83,32 +105,46 @@ class GenAI(object):
         self.project.from_model = f'system/genai/temp/create_db_models.py' # we always write the model to this file
         self.ensure_system_dir_exists()  # ~ manager, so we can write to system/genai/temp
         self.delete_temp_files()
+        self.post_error = ""
+        """ eg, if response contains table defs, save_prompt_messages_to_system_genai_temp_project raises an exception to trigger retry """
         self.prompt = ""
         """ `--using` - can come from file or text argument """
 
         self.messages = self.get_prompt_messages()  # compute self.messages, from file, dir or text argument
 
         if self.project.genai_repaired_response == '':  # normal path - get response from ChatGPT
-            log.debug(f'.. ChatGPT - saving response to: system/genai/temp/chatgpt_original.response')
-            self.headers = self.get_headers_with_openai_api_key()
-            url = "https://api.openai.com/v1/chat/completions"
             api_version = f'{self.project.genai_version}'  # eg, "gpt-4o"
-            data = {"model": api_version, "messages": self.messages}
-            response = requests.post(url, headers=self.headers, json=data)
-            create_db_models = self.get_and_save_raw_response_data(response)
+            api_version = "gpt-4o-2024-08-06"
+            start_time = time.time()
+            client = OpenAI(api_key=os.getenv("APILOGICSERVER_CHATGPT_APIKEY"))
+            completion = client.beta.chat.completions.parse(
+                messages=self.messages, response_format=WGResult,
+                # temperature=0.0,
+                model=api_version
+            )
+            log.debug(f'ChatGPT ({str(int(time.time() - start_time))} secs) - response at: system/genai/temp/chatgpt_original.response')
+            
+            data = completion.choices[0].message.content
+            response_dict = json.loads(data)
+            self.get_and_save_raw_response_data(completion=completion, response_dict=response_dict)
+            # print(json.dumps(json.loads(data), indent=4))
+            pass
+
         else: # for retry from corrected response... eg system/genai/temp/chatgpt_retry.response
             log.debug(f'\nUsing [corrected] response from: {self.project.genai_repaired_response}')
-            with open(self.project.genai_repaired_response, 'r') as file:
-                create_db_models = file.read()
-        self.create_db_models = create_db_models
+            with open(self.project.genai_repaired_response, 'r') as response_file:
+                response_dict = json.load(response_file)
+
+        self.response_dict = DotMap(response_dict)
         """ the raw response data from ChatGPT which will be fixed & saved create_db_models.py """
 
-        self.project.genai_logic = self.get_logic_from_prompt()
+        # self.project.genai_logic = self.get_logic_from_prompt()
 
-        self.fix_and_write_model_file(create_db_models) # write create_db_models.py for db creation   
+        self.fix_and_write_model_file() # write create_db_models.py for db creation, & logic 
         self.save_prompt_messages_to_system_genai_temp_project()  # save prompts, response and models.py
         if project.project_name_last_node == 'genai_demo_conversation':
             debug_string = "good breakpoint - check create_db_models.py"
+        pass # if we've set self.post_error, we'll raise an exception to trigger retry
         pass # return to api_logic_server.ProjectRun to create db/project from create_db_models.py
 
     def delete_temp_files(self):
@@ -118,6 +154,7 @@ class GenAI(object):
         if self.project.genai_repaired_response == '':  # clean up unless retrying from chatgpt_original.response
             Path('system/genai/temp/chatgpt_original.response').unlink(missing_ok=True)
             Path('system/genai/temp/chatgpt_retry.response').unlink(missing_ok=True)
+            Path('system/genai/temp/create_db_models.sqlite').unlink(missing_ok=True)
     
     def create_presets(self, prompt_messages: List[Dict[str, str]]):
         """ Create presets - you are a data modelling expert, and logicbank api etc """
@@ -132,7 +169,6 @@ class GenAI(object):
         log.debug(f'.. conv[000] presets: {starting_message}')
         log.debug(f'.. conv[001] presets: {learning_requests[0]["content"][:30]}...')
         return len(learning_requests)
-
     
     def get_prompt_messages(self) -> List[Dict[str, str]]:
         """ Get prompt from file, dir (conversation) or text argument
@@ -178,7 +214,7 @@ class GenAI(object):
                         request_count += 1      # rebuild response with *all* tables
                         if request_count > 1:   # Run Config: genai AUTO DEALERSHIP CONVERSATION
                             if 'updating the prior response' not in prompt:
-                                prompt += k_update_prior_response                    
+                                prompt = self.get_prompt__with_inserts(raw_prompt=prompt, for_iteration=True)                  
                     prompt_messages.append( {"role": role, "content": prompt})
                 else:
                     log.debug(f'.. .. conv ignores: {os.path.basename(each_file)}')
@@ -218,7 +254,7 @@ class GenAI(object):
                         learning_requests.append( {"role": "user", "content": learning_request_lines})
         return learning_requests  # TODO - what if no learning requests?
     
-    def get_prompt__with_inserts(self, raw_prompt: str) -> str:
+    def get_prompt__with_inserts(self, raw_prompt: str, for_iteration: bool = False) -> str:
         """ prompt-engineering: insert db-specific logic into prompt 
             raw_prompt: the prompt from file or text argument
         """
@@ -236,12 +272,35 @@ class GenAI(object):
             prompt_inserts = f'mysql_inserts.prompt'
 
         if prompt_inserts != "*":
-            assert Path(f'system/genai/prompt_inserts/{prompt_inserts}').exists(), \
-                f"Missing prompt_inserts file: {prompt_inserts}"  # eg api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts.prompt
-            log.debug(f'get_prompt__with_inserts: {str(os.getcwd())} / {prompt_inserts}')
-            with open(f'system/genai/prompt_inserts/{prompt_inserts}', 'r') as file:
+            prompt_eng_file_name = f'system/genai/prompt_inserts/{prompt_inserts}'
+            if for_iteration:
+                prompt_eng_file_name = prompt_eng_file_name.replace('.', '_iterations.')
+            assert Path(prompt_eng_file_name).exists(), \
+                f"Missing prompt_inserts file: {prompt_eng_file_name}"  # eg api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts.prompt
+            log.debug(f'get_prompt__with_inserts: {str(os.getcwd())} / {prompt_eng_file_name}')
+            with open(prompt_eng_file_name, 'r') as file:
                 pre_post = file.read()  # eg, Use SQLAlchemy to create a sqlite database named system/genai/temp/create_db_models.sqlite, with
             prompt_result = pre_post.replace('{{prompt}}', raw_prompt)
+
+            prompt_lines = prompt_result.split('\n')
+            prompt_line_number = 0
+            for each_line in prompt_lines:
+                if "LogicBank" in each_line:
+                    log.debug(f'.. inserted: {each_line}')
+                    prompt_eng_logic_file_name = f'system/genai/prompt_inserts/logic_inserts.prompt'
+                    with open(prompt_eng_logic_file_name, 'r') as file:
+                        prompt_logic = file.read()  # eg, Use SQLAlchemy to...
+                    prompt_lines[prompt_line_number] = prompt_logic
+                    break
+                prompt_line_number += 1
+            
+            response_format_file_name = f'system/genai/prompt_inserts/response_format.prompt'
+            with open(response_format_file_name, 'r') as file:
+                response_format = file.readlines()
+            prompt_lines.extend(response_format)
+
+            prompt_result = "\n".join(prompt_lines)  # back to a string
+            pass
         return prompt_result
     
     def ensure_system_dir_exists(self):
@@ -261,7 +320,7 @@ class GenAI(object):
             copied_path = shutil.copytree(src=from_dir, dst=to_dir, dirs_exist_ok=True)
 
     def get_logic_from_prompt(self) -> list[str]:
-        """ Get logic from ChatGPT prompt
+        """ Get logic from ChatGPT prompt (code after "Enforce")
 
         Args:
 
@@ -331,18 +390,17 @@ class GenAI(object):
 
         logic_file = self.project.project_directory_path.joinpath('logic/declare_logic.py')
         in_logic = False
-        translated_logic = "\n    # Logic from GenAI:\n\n"
-        for each_line in self.create_db_models.split('\n'):
-            if in_logic:
-                if each_line.startswith('    '):    # indent => still in logic
-                    each_repaired_line = self.remove_logic_halluncinations(each_line=each_line)
+        translated_logic = "\n    # Logic from GenAI: (or, use your IDE w/ code completion)\n"
+        for each_rule in self.response_dict.rules:
+            comment_line = each_rule.description
+            translated_logic += f'\n    # {comment_line}\n'
+            each_line = each_rule.code
+            if 'declare_logic.py' not in each_line:
+                each_repaired_line = self.remove_logic_halluncinations(each_line=each_line)
+                if not each_repaired_line.startswith('    '):  # sometimes in indents, sometimes not
+                    each_repaired_line = '    ' + each_repaired_line
+                if 'def declare_logic' not in each_repaired_line:
                     translated_logic += each_repaired_line + '\n'      
-                elif each_line.strip() == '':       # blank => still in logic
-                    pass
-                else:                               # no-indent => end of logic
-                    in_logic = False
-            if "declare_logic()" in each_line:
-                in_logic = True
         translated_logic += "\n    # End Logic from GenAI\n\n"
         utils.insert_lines_at(lines=translated_logic, 
                               file_name=logic_file, 
@@ -380,7 +438,7 @@ class GenAI(object):
             log.error(f"\n\nERROR creating genai project docs: {docs_dir}\n\n{traceback.format_exc()}")
         pass
 
-    def fix_and_write_model_file(self, response_data: str):
+    def fix_and_write_model_file(self):
         """
         1. break response data into lines
         2. throw away instructions
@@ -392,104 +450,165 @@ class GenAI(object):
             response_data (str): the chatgpt response
 
         """
-        model_class =  "# created from response - used to create database and project\n"
-        model_class += "#  should run without error\n"
-        model_class += "#  if not, check for decimal, indent, or import issues\n\n"
-        with open(f'system/genai/create_db_models_inserts/create_db_models_prefix.py', "r") as inserts:
-            model_lines = inserts.readlines()
-        for each_line in model_lines:
-            model_class += each_line + '\n'
-
-        response_array = response_data.split('\n')
-        line_num = 0
-        writing = False
-        indents_to_remove = 0
-        for each_line in response_array:
-            line_num += 1
-            if "```python" in each_line:
-                writing = True
-                # count spaces before "```"
-                # next_line = response_array[line_num+1]
-                position = each_line.find("```")
-                if position > 0:
-                    indents_to_remove = each_line[:position].count(' ')                
-            elif "```" in each_line:
-                writing = False
-            elif writing:  # ChatGPT work-arounds
-                ''' decimal issues
-
-                    1. bad import: see Run: tests/test_databases/ai-created/genai_demo/genai_demo_decimal
-                        from decimal import Decimal  # Decimal fix: needs to be from decimal import DECIMAL
-
-                    2. Missing missing import: from SQLAlchemy import .... DECIMAL
-
-                    3. Column(Decimal) -> Column(DECIMAL)
-                        see in: tests/test_databases/ai-created/budget_allocation/budget_allocations/budget_allocations_3_decimal
-
-                    4. Bad syntax on test data: see Run: blt/time_cards_decimal from RESPONSE
-                        got:    balance=DECIMAL('100.50')
-                        needed: balance=1000.0
-                        fixed with import in create_db_models_prefix.py
-
-                    5. Bad syntax on test data cals: see api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation_bad_decimal/genai_demo_03.response
-                        got: or Decimal('0.00')
-                        needed: or decimal.Decimal('0.00')
-
-                    6. Bad syntax on test data cals: see api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation_bad_decimal_2/genai_demo_conversation_002.response
-                        got: or DECIMAL('
-                        needed: or decimal.Decimal('0.00')
-                '''
-                if 'sqlite:///' in each_line:  # must be sqlite:///system/genai/temp/create_db_models.sqlite
-                    current_url_rest = each_line.split('sqlite:///')[1]
-                    quote_type = "'"
-                    if '"' in current_url_rest:
-                        quote_type = '"'  # eg, tests/test_databases/ai-created/time_cards/time_card_decimal/genai.response
-                    current_url = current_url_rest.split(quote_type)[0]  
-                    proper_url = 'system/genai/temp/create_db_models.sqlite'
-                    each_line = each_line.replace(current_url, proper_url)
-                    if current_url != proper_url:
-                        log.debug(f'.. fixed sqlite url: {current_url} -> system/genai/temp/create_db_models.sqlite')
-                if 'Decimal,' in each_line:  # SQLAlchemy import
-                    each_line = each_line.replace('Decimal,', 'DECIMAL,')
-                    # other Decimal bugs: see api_logic_server_cli/prototypes/manager/system/genai/reference/errors/chatgpt_decimal.txt
-                if ', Decimal' in each_line:  # Cap'n K, at your service
-                    each_line = each_line.replace(', Decimal', ', DECIMAL')
-                if 'rom decimal import Decimal' in each_line:
-                    each_line = each_line.replace('from decimal import Decimal', 'import decimal')
-                if '=Decimal(' in each_line:
-                    each_line = each_line.replace('=Decimal(', '=decimal.Decimal(')
-                if ' Decimal(' in each_line:
-                    each_line = each_line.replace(' Decimal(', ' decimal.Decimal(')
-                if 'Column(Decimal)' in each_line:
-                    each_line = each_line.replace('Column(Decimal)', 'Column(DECIMAL)')
-                if "DECIMAL('" in each_line:
-                    each_line = each_line.replace("DECIMAL('", "decimal.Decimal('")
-                if 'end_time(datetime' in each_line:  # tests/test_databases/ai-created/time_cards/time_card_kw_arg/genai.response
-                    each_line = each_line.replace('end_time(datetime', 'end_time=datetime')
-                if indents_to_remove > 0:
-                    each_line = each_line[indents_to_remove:]
-                if 'relationship(' in each_line and self.project.genai_use_relns == False:
-                    # airport4 fails with could not determine join condition between parent/child tables on relationship Airport.flights
-                    if each_line.startswith('    '):
-                        each_line = each_line.replace('    ', '    # ')
-                    else:  # sometimes it puts relns outside the class (so, outdented)
-                        each_line = '# ' + each_line
-                if 'sqlite:///system/genai/temp/model.sqlite':  # fix prior version
-                    each_line = each_line.replace('sqlite:///system/genai/temp/model.sqlite', 
-                                                  'sqlite:///system/genai/temp/create_db_models.sqlite')
-
-                # logicbank fixes
-                if 'from logic_bank' in each_line:  # we do our own imports
-                    each_line = each_line.replace('from', '# from')
-                if 'LogicBank.activate' in each_line:
-                    each_line = each_line.replace('LogicBank.activate', '# LogicBank.activate')
-                
-                model_class += each_line + '\n'
-        with open(f'{self.project.from_model}', "w") as model_file:
-            model_file.write(model_class)
+        create_db_model_lines =  list()
+        create_db_model_lines.extend(self.get_lines_from_file(f'system/genai/create_db_models_inserts/create_db_models_imports.py'))
+
+        models = self.response_dict.models
+        did_base = False
+        for each_model in models:
+            model_lines = self.get_model_class_lines(model=each_model)
+            for each_line in model_lines:
+                each_fixed_line = each_line.replace('sa.', '')      # sometimes it puts sa. in front of Column
+                if 'Base = declarative_base()' in each_fixed_line:  # sometimes created for each class
+                    if did_base:
+                        each_fixed_line = '# ' + each_fixed_line
+                    did_base = True 
+                create_db_model_lines.append(each_fixed_line)
+
+        create_db_model_lines.extend(self.get_lines_from_file(f'system/genai/create_db_models_inserts/create_db_models_create_db.py'))
+
+        test_data_lines = self.response_dict.test_data.split('\n')
+        row_names = list()
+        for each_line in test_data_lines:
+            each_fixed_line = each_line
+            if '=datetime' in each_fixed_line:
+                each_fixed_line = each_fixed_line.replace('=datetime.date', '=date') 
+            if 'engine = create_engine' in each_fixed_line:  # CBT sometimes has engine = create_engine, so do we!
+                each_fixed_line = each_fixed_line.replace('engine = create_engine', '# engine = create_engine')
+            if 'Base.metadata.create_all(engine)e' in each_fixed_line:
+                each_fixed_line = each_fixed_line.replace('Base.metadata.create_all(engine)', '# Base.metadata.create_all(engine)')
+            create_db_model_lines.append(each_fixed_line + '\n')
+            if ' = ' in each_line and '(' in each_line:  # CPT test data might have: tests = []
+                assign = each_line.split(' = ')[0]
+                # no tokens for: Session = sessionmaker(bind=engine) or session = Session()
+                if '.' not in assign and 'Session' not in each_line and 'session.' not in each_line:
+                    row_names.append(assign)
+
+        create_db_model_lines.append('\n\n')
+        row_name_list = ', '.join(row_names)
+        add_rows = f'session.add_all([{row_name_list}])'
+        create_db_model_lines.append(add_rows + '\n')  
+        create_db_model_lines.append('session.commit()\n')  
+
+        with open(f'{self.project.from_model}', "w") as create_db_model_file:
+            for line in create_db_model_lines:
+                create_db_model_file.write(f"{line}")
         
         log.debug(f'.. model file created: {self.project.from_model}')
 
+    def get_lines_from_file(self, file_name: str) -> list[str]:
+        """Get lines from a file
+
+        Args:
+            file_name (str): the file name
+
+        Returns:
+            list[str]: the lines from the file
+        """
+
+        with open(file_name, "r") as file:
+            lines = file.readlines()
+        return lines
+    
+    def get_model_test_data_lines_ZZ(self, model: DotMap) -> list[str]:
+        create_db_model_lines =  list()
+        create_db_model_lines.append('\n\n')
+        sample_data = model.sample_data
+        for each_line in sample_data:
+            create_db_model_lines.append(each_line + '\n')
+        return create_db_model_lines
+
+    def get_model_class_lines(self, model: DotMap) -> list[str]:
+        """Get the model class from the model
+
+        Args:
+            model (Model): the model
+
+        Returns:
+            stlist[str]: the model class lines, fixed up
+        """
+
+        create_db_model_lines =  list()
+        create_db_model_lines.append('\n\n')
+        class_lines = model.code.split('\n')
+        line_num = 0
+        indents_to_remove = 0
+        for each_line in class_lines:
+            line_num += 1
+            ''' decimal issues
+
+                1. bad import: see Run: tests/test_databases/ai-created/genai_demo/genai_demo_decimal
+                    from decimal import Decimal  # Decimal fix: needs to be from decimal import DECIMAL
+
+                2. Missing missing import: from SQLAlchemy import .... DECIMAL
+
+                3. Column(Decimal) -> Column(DECIMAL)
+                    see in: tests/test_databases/ai-created/budget_allocation/budget_allocations/budget_allocations_3_decimal
+
+                4. Bad syntax on test data: see Run: blt/time_cards_decimal from RESPONSE
+                    got:    balance=DECIMAL('100.50')
+                    needed: balance=1000.0
+                    fixed with import in create_db_models_prefix.py
+
+                5. Bad syntax on test data cals: see api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation_bad_decimal/genai_demo_03.response
+                    got: or Decimal('0.00')
+                    needed: or decimal.Decimal('0.00')
+
+                6. Bad syntax on test data cals: see api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation_bad_decimal_2/genai_demo_conversation_002.response
+                    got: or DECIMAL('
+                    needed: or decimal.Decimal('0.00')
+            '''
+            if "= Table(" in each_line:  # tests/test_databases/ai-created/time_cards/time_card_kw_arg/genai.response
+                log.debug(f'.. fix_and_write_model_file detects table - raise excp to trigger retry')
+                self.post_error = "ChatGPT Response contains table (not class) definitions: " + each_line
+            if 'sqlite:///' in each_line:  # must be sqlite:///system/genai/temp/create_db_models.sqlite
+                current_url_rest = each_line.split('sqlite:///')[1]
+                quote_type = "'"
+                if '"' in current_url_rest:
+                    quote_type = '"'  # eg, tests/test_databases/ai-created/time_cards/time_card_decimal/genai.response
+                current_url = current_url_rest.split(quote_type)[0]  
+                proper_url = 'system/genai/temp/create_db_models.sqlite'
+                each_line = each_line.replace(current_url, proper_url)
+                if current_url != proper_url:
+                    log.debug(f'.. fixed sqlite url: {current_url} -> system/genai/temp/create_db_models.sqlite')
+            if 'Decimal,' in each_line:  # SQLAlchemy import
+                each_line = each_line.replace('Decimal,', 'DECIMAL,')
+                # other Decimal bugs: see api_logic_server_cli/prototypes/manager/system/genai/reference/errors/chatgpt_decimal.txt
+            if ', Decimal' in each_line:  # Cap'n K, at your service
+                each_line = each_line.replace(', Decimal', ', DECIMAL')
+            if 'rom decimal import Decimal' in each_line:
+                each_line = each_line.replace('from decimal import Decimal', 'import decimal')
+            if '=Decimal(' in each_line:
+                each_line = each_line.replace('=Decimal(', '=decimal.Decimal(')
+            if ' Decimal(' in each_line:
+                each_line = each_line.replace(' Decimal(', ' decimal.Decimal(')
+            if 'Column(Decimal)' in each_line:
+                each_line = each_line.replace('Column(Decimal)', 'Column(DECIMAL)')
+            if "DECIMAL('" in each_line:
+                each_line = each_line.replace("DECIMAL('", "decimal.Decimal('")
+            if 'end_time(datetime' in each_line:  # tests/test_databases/ai-created/time_cards/time_card_kw_arg/genai.response
+                each_line = each_line.replace('end_time(datetime', 'end_time=datetime')
+            if indents_to_remove > 0:
+                each_line = each_line[indents_to_remove:]
+            if 'relationship(' in each_line and self.project.genai_use_relns == False:
+                # airport4 fails with could not determine join condition between parent/child tables on relationship Airport.flights
+                if each_line.startswith('    '):
+                    each_line = each_line.replace('    ', '    # ')
+                else:  # sometimes it puts relns outside the class (so, outdented)
+                    each_line = '# ' + each_line
+            if 'sqlite:///system/genai/temp/model.sqlite':  # fix prior version
+                each_line = each_line.replace('sqlite:///system/genai/temp/model.sqlite', 
+                                            'sqlite:///system/genai/temp/create_db_models.sqlite')
+
+            # logicbank fixes
+            if 'from logic_bank' in each_line:  # we do our own imports
+                each_line = each_line.replace('from', '# from')
+            if 'LogicBank.activate' in each_line:
+                each_line = each_line.replace('LogicBank.activate', '# LogicBank.activate')
+            
+            create_db_model_lines.append(each_line + '\n')
+        return create_db_model_lines
+    
     def save_prompt_messages_to_system_genai_temp_project(self):
         """
         Save prompts / responses to system/genai/temp/{project}/genai.response
@@ -509,36 +628,37 @@ class GenAI(object):
             if to_dir_save_dir.exists():
                 shutil.rmtree(to_dir_save_dir)
             os.makedirs(to_dir_save_dir, exist_ok=True)
-            log.debug(f'save_prompt_messages_to_system_genai_temp_project()')
+            log.debug(f'save_prompt_messages_to_system_genai_temp_project() - {str(to_dir_save_dir)}')
 
             if self.project.genai_repaired_response == '':  # normal path, from --using
                 if write_prompt := True:
                     pass
                     file_num = 0
+                    flat_project_name = Path(self.project.project_name).stem  # in case project is dir/project-name
                     for each_message in self.messages:
                         suffix = 'prompt'
                         if each_message['role'] == 'system':
                             suffix = 'response' 
-                        file_name = f'{self.project.project_name}_{str(file_num).zfill(3)}.{suffix}'
+                        file_name = f'{flat_project_name}_{str(file_num).zfill(3)}.{suffix}'
                         file_path = to_dir_save_dir.joinpath(file_name)
                         log.debug(f'.. saving[{file_name}]  - {each_message["content"][:30]}...')
                         with open(file_path, "w") as message_file:
                             message_file.write(each_message['content']) 
                         file_num += 1
                     suffix = 'response'  # now add the this response
-                    file_name = f'{self.project.project_name}_{str(file_num).zfill(3)}.{suffix}'
+                    file_name = f'{flat_project_name}_{str(file_num).zfill(3)}.{suffix}'  # FIXME 
                     file_path = to_dir_save_dir.joinpath(file_name)
                     log.debug(f'.. saving[{file_name}]  - {each_message["content"][:30]}...')
                     with open(file_path, "w") as message_file:
-                        message_file.write(self.create_db_models)
+                        json.dump(self.response_dict.toDict(), message_file, indent=4)
                 shutil.copyfile(self.project.from_model, to_dir_save_dir.joinpath('create_db_models.py'))
         except Exception as inst:
             # FileNotFoundError(2, 'No such file or directory')
-            log.error(f"\n\nError {inst} creating project diagnostic files: {str(gen_temp_dir)}\n\n")
+            log.error(f"\n\nError: {inst} \n..creating diagnostic files into dir: {str(gen_temp_dir)}\n\n")
             pass  # intentional try/catch/bury - it's just diagnostics, so don't fail
         debug_string = "good breakpoint - return to main driver, and execute create_db_models.py"
 
-    def get_headers_with_openai_api_key(self) -> dict:
+    def get_headers_with_openai_api_key_ZZ(self) -> dict:
         """
         Returns:
             dict: api header with OpenAI key (exits if not provided)
@@ -564,35 +684,32 @@ class GenAI(object):
         }
         return headers
     
-    def get_and_save_raw_response_data(self, response) -> str:
+    def get_and_save_raw_response_data(self, completion: object, response_dict: dict):
         """
         Returns:
             str: response_data
         """
         
-
+        '''  TODO - is exception used instead of return_code...
         # Check if the request was successful
-        if response.status_code == 400:
-            raise Exception("Bad ChatGPT Request: " + response.text)
+        if completion.status_code == 400:
+            raise Exception("Bad ChatGPT Request: " + completion.text)
         
-        if response.status_code != 200:
-            print("Error:", response.status_code, response.text)   # eg, You exceeded your current quota 
+        if completion.status_code != 200:
+            print("Error:", completion.status_code, completion.text)   # eg, You exceeded your current quota 
+        '''
 
-        response_data = response.json()['choices'][0]['message']['content']
-        file_name = f'system/genai/temp/chatgpt_original.response'
-        with open(f'system/genai/temp/chatgpt_original.response', "w") as model_file:  # save for debug
-            model_file.write(response_data)
-            file_name = model_file.name
-        with open(f'system/genai/temp/chatgpt_retry.response', "w") as model_file:     # repair this & retry
-            model_file.write(response_data)
-        log.debug(f'.. stored raw response: {model_file.name}')
-        return response_data
+        with open(f'system/genai/temp/chatgpt_original.response', "w") as response_file:  # save for debug
+            json.dump(response_dict, response_file, indent=4)
+        with open(f'system/genai/temp/chatgpt_retry.response', "w") as response_file:     # repair this & retry
+            json.dump(response_dict, response_file, indent=4)
+        return
 
 
 def genai(using, db_url, repaired_response: bool, genai_version: str, 
           retries: int, opt_locking: str, prompt_inserts: str, quote: bool,
           use_relns: bool, project_name: str):
-    """ cli caller provides using, or repaired_response & using
+    """ CLI caller provides using, or repaired_response & using
     
         Called from cli commands: genai, genai-create, genai-iterate
         
@@ -624,6 +741,7 @@ def genai(using, db_url, repaired_response: bool, genai_version: str,
                     project_name=resolved_project_name, db_url=db_url)
         log.info(f"GENAI successful")  
     else:
+        failed = False
         while try_number <= retries:
             try:
                 failed = False
@@ -687,6 +805,9 @@ def genai(using, db_url, repaired_response: bool, genai_version: str,
                 # to_dir_save_dir.rename(to_dir_save_dir_retry) 
                 assert to_dir_save_dir.is_dir(), f"\nInternal Error - missing save directory: {to_dir_save_dir}"
                 # assert to_dir_save_dir_retry.is_dir(), f"\nInternal Error - missing retry directory: {to_dir_save_dir_retry}"
+                log.debug(f'.. copying work files...')
+                log.debug(f'.... from: {to_dir_save_dir}')
+                log.debug(f'.... to:   {to_dir_save_dir_retry}')
                 shutil.copytree(to_dir_save_dir, to_dir_save_dir_retry, dirs_exist_ok=True) 
 
                 failed = True
@@ -696,8 +817,9 @@ def genai(using, db_url, repaired_response: bool, genai_version: str,
                     failed = False
                 else:
                     try_number += 1
+                    log.debug(f"\n\nRetry Genai #{try_number}\n")
             pass # retry (retries times)
-        if failed:
+        if failed == True:  # retries exhausted (if failed: threw "an integer is required" ??
             log.error(f"\n\nGenai Failed (Retries: {retries})") 
             exit(1) 
         log.info(f"GENAI successful on try {try_number}")