new baseline, git lfs issues resolved, repo clean

.gitattributes

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
+
 *.7z filter=lfs diff=lfs merge=lfs -text
 *.arrow filter=lfs diff=lfs merge=lfs -text
 *.bin filter=lfs diff=lfs merge=lfs -text
@@ -35,9 +34,8 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
-=======
-*.png filter=lfs diff=lfs merge=lfs -text
 
-=======
 *.png filter=lfs diff=lfs merge=lfs -text
 
+
+

.gitignore

@@ -4,5 +4,6 @@ models
 seed_images/
 cuda_12.4.0_550.54.14_linux.run
 models/
+blobs-ids.txt
 
 

card_generator.py

@@ -23,11 +23,7 @@ test_item = {'Name': 'Pustulent Raspberry', 'Type': 'Fruit', 'Value': '1 cp', 'P
 # Function that takes in an image url and a dictionary and uses the values to print onto a card.
 def paste_image_and_resize(base_image,sticker_path, x_position, y_position,img_width, img_height, purchased_item_key = None):
     
-<<<<<<< HEAD
     # Check for if item has a Rarity string that is in the dictionary of sticker paths
-=======
-    # Check for if item has a Rarity string that is a in the dictionary of sticket paths
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     if purchased_item_key:
         if sticker_path[purchased_item_key]:
             sticker_path = sticker_path[purchased_item_key]

item_dict_gen.py

@@ -4,32 +4,16 @@ import gc
 import torch
 
 model_path = "./models/starling-lm-7b-alpha.Q8_0.gguf"
-<<<<<<< HEAD
-
-=======
-# Set gpu_layers to the number of layers to offload to GPU. Set to 0 if no GPU acceleration is available on your system.
-
-
-# Simple inference example
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
 def load_llm(user_input):
   llm = Llama(
   model_path=model_path,
   n_ctx=8192,  # The max sequence length to use - note that longer sequence lengths require much more resources
   n_threads=8,            # The number of CPU threads to use, tailor to your system and the resulting performance
-<<<<<<< HEAD
   n_gpu_layers=32 # The number of layers to offload to GPU, if you have GPU acceleration available
   )
   return llm(
   f"GPT4 User: {prompt_instructions}  the item is {user_input}: <|end_of_turn|>GPT4 Assistant:", # Prompt
   max_tokens=768,  # Generate up to 512 tokens
-=======
-  n_gpu_layers=-1         # The number of layers to offload to GPU, if you have GPU acceleration available
-)
-  return llm(
-  f"GPT4 User: {prompt_instructions}  the item is {user_input}: <|end_of_turn|>GPT4 Assistant:", # Prompt
-  max_tokens=512,  # Generate up to 512 tokens
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
   stop=["</s>"],   # Example stop token - not necessarily correct for this specific model! Please check before using.
   echo=False        # Whether to echo the prompt
   )

main.py

@@ -6,13 +6,6 @@ import ctypes
 import user_input as useri
 import gradio as gr
 import template_builder as tb
-<<<<<<< HEAD
-=======
-import threading
-import time
-
-
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
 
 # This is a fix for the way that python doesn't release system memory back to the OS and it was leading to locking up the system
 libc = ctypes.cdll.LoadLibrary("libc.so.6")
@@ -22,13 +15,6 @@ M_MMAP_THRESHOLD = -3
 libc.mallopt(M_MMAP_THRESHOLD, 2**20)
 initial_name = "A Crowbar"
 
-<<<<<<< HEAD
-=======
-
-    
-
-
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
 with gr.Blocks() as demo:
     
     # Functions and State Variables
@@ -68,32 +54,13 @@ with gr.Blocks() as demo:
     def set_textbox_defaults(textbox_default_dict, key):
         item_name = textbox_default_dict[key]
         return item_name
-<<<<<<< HEAD
 
 
     # Function called when user generates item info, then assign values of dictionary to variables, output once to State, twice to textbox
-    def generate_text_update_textboxes(user_input):
     def generate_text_update_textboxes(user_input):
         u.reclaim_mem()
 
 
-=======
-    
-    
-                
-    # Function called when user generates item info, then assign values of dictionary to variables, output once to State, twice to textbox
-    def generate_text_update_textboxes(user_input, progress = gr.Progress()):
-        u.reclaim_mem()
-        
-        # Define a function to update progress
-        def update_progress(duration, progress):
-            for i in range(10):
-                time.sleep(duration / 10)  # Wait for a fraction of the total duration
-                progress((i + 1) / 10, desc="Thinking...")  # Update progress
-       # Start the progress update in a separate thread, passing `progress` explicitly
-        threading.Thread(target=update_progress, args=(10, progress)).start()
-        
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
         llm_output=useri.call_llm(user_input)
         item_key = list(llm_output.keys())
         
@@ -107,7 +74,6 @@ with gr.Blocks() as demo:
         if 'Damage' in item_key_values: 
             item_damage = llm_output[item_key[0]]['Damage']
         else: item_damage = ''
-<<<<<<< HEAD
 
 
         item_weight = llm_output[item_key[0]]['Weight']
@@ -117,13 +83,6 @@ with gr.Blocks() as demo:
         sd_prompt = llm_output[item_key[0]]['SD Prompt']
 
 
-=======
-        item_weight = llm_output[item_key[0]]['Weight']
-        item_description = llm_output[item_key[0]]['Description']
-        item_quote = llm_output[item_key[0]]['Quote']    
-
-        sd_prompt = llm_output[item_key[0]]['SD Prompt']
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
         return [item_name, item_name,
                 item_type, item_type,
                 item_rarity, item_rarity,
@@ -171,51 +130,35 @@ with gr.Blocks() as demo:
         return image_list, image_list
    
 
-<<<<<<< HEAD
     # Beginning of UI Page
     # Beginning of UI Page
-=======
-    # Beginning of page format
-    # Title
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     gr.HTML(""" <div id="inner"> <header>
             <h1>Item Card Generator</h1>
             <p>
             With this AI driven tool you will build a collectible style card of a fantasy flavored item with details.
             </p>
             </div>""")
-<<<<<<< HEAD
     
     
-=======
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     gr.HTML(""" <div id="inner"> <header>
             <h2><b>First:</b> Build a Card Template</h2>
                 </div>""")
     with gr.Row():
-<<<<<<< HEAD
         with gr.Column():
-=======
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
 
     # Template Gallery instructions
-        gr.HTML(""" <div id="inner"> <header>
-                <h3>1. Click a border from the 'Card Template Gallery'</h3> 
-                </div>""")
+            gr.HTML(""" <div id="inner"> <header>
+                        <h3>1. Click a border from the 'Card Template Gallery'</h3> 
+                        </div>""")
         
     border_gallery = gr.Gallery(label = "Card Template Gallery", 
                                     scale = 2,
-<<<<<<< HEAD
                                     value = useri.index_image_paths("Drakosfire/CardGenerator", "seed_images/card_templates"),
-=======
-                                    value = useri.index_image_paths("./seed_images/card_templates/", "card_templates/"),
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
                                     show_label = True,
                                     columns = [3], rows = [3],
                                     object_fit = "contain",
                                     height = "auto",
                                     elem_id = "Template Gallery")
-<<<<<<< HEAD
     
     gr.HTML(""" <div id="inner"> <header>
                 <h3>2. Click a image from the Seed Image Gallery</h3><br>
@@ -225,35 +168,16 @@ with gr.Blocks() as demo:
     seed_image_gallery = gr.Gallery(label= " Image Seed Gallery",
                                     scale = 2,
                                     value = useri.index_image_paths("Drakosfire/CardGenerator", "seed_images/item_seeds"),
-=======
-    gr.HTML(""" <div id="inner"> <header>
-                <h3>2. Click a image from the Seed Image Gallery</h3><br>
-                </div>""")
-    border_gallery.select(assign_img_path, outputs = selected_border_image)
-
-    seed_image_gallery = gr.Gallery(label= " Image Seed Gallery",
-                                    scale = 2,
-                                    value = useri.index_image_paths("./seed_images/item_seeds/","item_seeds/"),
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
                                     show_label = True,
                                     columns = [3], rows = [3],
                                     object_fit = "contain",
                                     height = "auto",
                                     elem_id = "Template Gallery",
-<<<<<<< HEAD
                                     interactive=True)                 
-=======
-                                    interactive=True) 
-                
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
 
     gr.HTML(""" <div id="inner"> <header><h4> -Or- Upload your own seed image, by dropping it into the 'Generated Template Gallery' </h4><br>
                 <h3>3. Click 'Generate Card Template'</h3><br>
             </div>""")
-<<<<<<< HEAD
-=======
-
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     
     built_template_gallery = gr.Gallery(label= "Generated Template Gallery",
                                         scale = 1,
@@ -267,10 +191,6 @@ with gr.Blocks() as demo:
     
     seed_image_gallery.select(assign_img_path, outputs = selected_seed_image)
     built_template_gallery.upload(u.receive_upload, inputs=built_template_gallery, outputs= selected_seed_image)
-<<<<<<< HEAD
-=======
-
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     build_card_template_button = gr.Button(value = "Generate Card Template")
     build_card_template_button.click(build_template, inputs = [selected_border_image, selected_seed_image], outputs = [built_template_gallery, built_template]) 
         
@@ -281,11 +201,6 @@ with gr.Blocks() as demo:
                         <h3>1. Use a few words to describe the item then click 'Generate Text' </h3>
                         </div>""")
     with gr.Row():
-<<<<<<< HEAD
-=======
-        
-        
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
         user_input =  gr.Textbox(label = 'Item', lines =1, placeholder= "Flaming Magical Sword", elem_id= "Item", scale =4)
         item_text_generate = gr.Button(value = "Generate item text", scale=1)
 
@@ -293,20 +208,11 @@ with gr.Blocks() as demo:
                 <h3> 2. Review and Edit the text</h3>
                 </div>""") 
     with gr.Row():
-<<<<<<< HEAD
 
     # Build text boxes for the broken up item dictionary values         
 
     # Build text boxes for the broken up item dictionary values         
         with gr.Column(scale = 1):
-=======
-    # Build text boxes for the broken up item dictionary values
-         
-        with gr.Column(scale = 1):
-    
-    
-            
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
             item_name_output = gr.Textbox(value = set_textbox_defaults(textbox_default_dict, 'Name'),label = 'Name', lines = 1, interactive=True, elem_id='Item Name')
             item_type_output = gr.Textbox(value = set_textbox_defaults(textbox_default_dict, 'Type'),label = 'Type', lines = 1, interactive=True, elem_id='Item Type')
             item_rarity_output = gr.Textbox(value = set_textbox_defaults(textbox_default_dict, 'Rarity'),label = 'Rarity : [Common, Uncommon, Rare, Very Rare, Legendary]', lines = 1, interactive=True, elem_id='Item Rarity')
@@ -319,11 +225,8 @@ with gr.Blocks() as demo:
             item_description_output = gr.Textbox(value = set_textbox_defaults(textbox_default_dict, 'Description'),label = 'Description', lines = 1, interactive=True, elem_id='Item Description')
             item_quote_output = gr.Textbox(value = set_textbox_defaults(textbox_default_dict, 'Quote'),label = 'Quote', lines = 1, interactive=True, elem_id='Item quote')
     item_properties_output = gr.Textbox(value = set_textbox_defaults(textbox_default_dict, 'Properties'),label = 'Properties : [List of comma seperated values]', lines = 1, interactive=True, elem_id='Item Properties')
-<<<<<<< HEAD
     
     
-=======
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     gr.HTML(""" <div id="inner"> <header>
                 <h3> 3. This text will be used to generate the card's image.</h3>
                 </div>""") 
@@ -352,11 +255,7 @@ with gr.Blocks() as demo:
                                     )
         generate_final_item_card = gr.Button(value = "Add Text", elem_id = "Generate user card")
     
-<<<<<<< HEAD
     
-=======
-      
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     card_gen_button.click(fn = generate_image_update_gallery, inputs =[num_image_to_generate,item_sd_prompt_output,item_name_output,built_template], outputs= generate_gallery)
     generate_gallery.select(assign_img_path, outputs = selected_generated_image)
 
@@ -384,12 +283,7 @@ with gr.Blocks() as demo:
                                                         item_sd_prompt_var,
                                                         item_sd_prompt_output])          
         
-<<<<<<< HEAD
         
-=======
-       
-   
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     generate_final_item_card.click(card.render_text_on_card, inputs = [selected_generated_image,
                                                                         item_name_output, 
                                                                         item_type_output, 
@@ -403,12 +297,7 @@ with gr.Blocks() as demo:
                                                                         ], 
                                                                         outputs = generate_gallery )
     
-<<<<<<< HEAD
     
-=======
-
-
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
 if __name__ == '__main__':
     demo.launch(server_name = "0.0.0.0", server_port = 8000, share = False, allowed_paths = ["/media/drakosfire/Shared/","/media/drakosfire/Shared/MerchantBot/card_templates"])
         

user_input.py

@@ -5,17 +5,13 @@ import utilities as u
 import sys
 import tempfile
 from PIL import Image
-<<<<<<< HEAD
 from github import Github
-=======
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
 
 image_path = str
 end_phrase = """<|end_of_turn|>"""
 # Indexing the contents of Card templates and temp images
 card_template_path = "./card_templates/"
 temp_image_path = "./image_temp"
-<<<<<<< HEAD
 
 def index_image_paths(repo_name,directory_path):
     g = Github()  # No token needed for public repos
@@ -28,17 +24,6 @@ def index_image_paths(repo_name,directory_path):
             files.append(content_file.download_url)  # Or content_file.path for just the path
     
     return files
-=======
-def index_image_paths(directory_path, github_path):
-    list_temp_files = []
-    list_of_image_paths = u.directory_contents(directory_path)
-    for image_path in list_of_image_paths:
-        image_path = f"https://raw.githubusercontent.com/Drakosfire/CardGenerator/alpha-templates/seed_images/{github_path}{image_path}"
-        print(image_path)
-        list_temp_files.append(image_path)
-    return list_temp_files
-
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
 
 user_pick_template_prompt = "Pick a template number from this list : "
 user_pick_image_prompt = "Select an image : "
@@ -79,10 +64,7 @@ def call_llm(user_input):
         response = response
     
     response = response.replace("GPT4 Assistant: ", "")
-<<<<<<< HEAD
     print(response)
-=======
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
     response = igen.convert_to_dict(response)
     if not response:
         response = call_llm(user_input)
@@ -99,10 +81,7 @@ def prompt_user_input():
             mimic = True
 
         #user_input_template = input(f"Pick a template number from this list : {process_list_for_user_response(list_of_card_templates)}")
-<<<<<<< HEAD
         
-=======
->>>>>>> 9a956dd (Polished and launch to Hugging Face)
         user_input_template = user_pick_item(user_pick_template_prompt,list_of_card_templates)
         response = call_llm(user_input_item)        
         print(response[u.keys_list(response,0)])