Resolved merge conflict in app.py

.gitattributes

@@ -0,0 +1,35 @@
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.arrow filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+*.ftz filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.h5 filter=lfs diff=lfs merge=lfs -text
+*.joblib filter=lfs diff=lfs merge=lfs -text
+*.lfs.* filter=lfs diff=lfs merge=lfs -text
+*.mlmodel filter=lfs diff=lfs merge=lfs -text
+*.model filter=lfs diff=lfs merge=lfs -text
+*.msgpack filter=lfs diff=lfs merge=lfs -text
+*.npy filter=lfs diff=lfs merge=lfs -text
+*.npz filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text
+*.ot filter=lfs diff=lfs merge=lfs -text
+*.parquet filter=lfs diff=lfs merge=lfs -text
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.pickle filter=lfs diff=lfs merge=lfs -text
+*.pkl filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.pth filter=lfs diff=lfs merge=lfs -text
+*.rar filter=lfs diff=lfs merge=lfs -text
+*.safetensors filter=lfs diff=lfs merge=lfs -text
+saved_model/**/* filter=lfs diff=lfs merge=lfs -text
+*.tar.* filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
+*.tflite filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.wasm filter=lfs diff=lfs merge=lfs -text
+*.xz 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

README.md

@@ -0,0 +1,12 @@
+---
+title: ResumeParser
+emoji: 🔥
+colorFrom: green
+colorTo: blue
+sdk: streamlit
+sdk_version: 1.29.0
+app_file: app.py
+pinned: false
+---
+
+Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference

app.py

@@ -10,7 +10,10 @@ from resume_template import Resume
 from json import JSONDecodeError
 import PyPDF2
 import json
+<<<<<<< HEAD
 import time
+=======
+>>>>>>> 726975d5ca7f0a98a5047fbda8870a0f03f55283
 
 load_dotenv()
 
@@ -84,10 +87,17 @@ st.title("Resume Parser")
 
 # Set up the LLM dictionary
 llm_dict = {
+<<<<<<< HEAD
     # "gpt-4-1106-preview": ChatOpenAI(temperature=0, model="gpt-4-1106-preview"),
     # "gpt-4": ChatOpenAI(temperature=0, model="gpt-4"),
     "gpt-3.5-turbo-1106": ChatOpenAI(temperature=0, model="gpt-3.5-turbo-1106"),
     # "claude-2": ChatAnthropic(model="claude-2", max_tokens=20_000),
+=======
+    "gpt-4-1106-preview": ChatOpenAI(temperature=0, model="gpt-4-1106-preview"),
+    "gpt-4": ChatOpenAI(temperature=0, model="gpt-4"),
+    "gpt-3.5-turbo-1106": ChatOpenAI(temperature=0, model="gpt-3.5-turbo-1106"),
+    "claude-2": ChatAnthropic(model="claude-2", max_tokens=20_000),
+>>>>>>> 726975d5ca7f0a98a5047fbda8870a0f03f55283
     "claude-instant-1": ChatAnthropic(model="claude-instant-1", max_tokens=20_000)
 }
 
@@ -101,14 +111,18 @@ uploaded_file = st.file_uploader("Upload a PDF file", type="pdf")
 if uploaded_file is not None:
     # Add a button to trigger the conversion
     if st.button("Convert PDF to Text"):
+<<<<<<< HEAD
         start_time = time.time()  # Start the timer
         
+=======
+>>>>>>> 726975d5ca7f0a98a5047fbda8870a0f03f55283
         # Convert the uploaded file to a string
         text = pdf_to_string(uploaded_file)
         
         # Extract resume fields using the selected model
         extracted_fields = extract_resume_fields(text, selected_model)
         
+<<<<<<< HEAD
         end_time = time.time()  # Stop the timer
         elapsed_time = end_time - start_time  # Calculate the elapsed time
         
@@ -125,3 +139,7 @@ if uploaded_file is not None:
         for key, value in extracted_fields.items():
             st.write(f"{key}: {value}")
         
+=======
+        # Display the extracted fields on the Streamlit app
+        st.json(extracted_fields)
+>>>>>>> 726975d5ca7f0a98a5047fbda8870a0f03f55283