From 63befbdcce735bfd5966664e723766c67800b118 Mon Sep 17 00:00:00 2001
From: Odai Athamneh <heyodai@gmail.com>
Date: Thu, 9 Nov 2023 15:34:58 -0600
Subject: [PATCH 1/2] Add guard logic to prevent crash when no newlines in
 response

Closes #44
---
 cli/magic_commit/magic_commit.py | 35 +++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/cli/magic_commit/magic_commit.py b/cli/magic_commit/magic_commit.py
index a9979e1..88d8539 100644
--- a/cli/magic_commit/magic_commit.py
+++ b/cli/magic_commit/magic_commit.py
@@ -23,11 +23,10 @@ class OpenAIKeyError(Exception):
     """Custom exception for OpenAI API key errors."""
 
 
-
 class Llama2ServerError(Exception):
     """Custom exception for Llama2 server errors."""
-    pass
 
+    pass
 
 
 def is_git_repository(directory: str) -> bool:
@@ -190,27 +189,31 @@ def generate_commit_message(
         # Call the Llama2 server
         response = call_llama2_server(llama2_url, messages)
         print(response)
-        response = response['choices'][0]['message']['content'].strip()
+        response = response["choices"][0]["message"]["content"].strip()
     else:
         # Use OpenAI's service
         openai.api_key = api_key
         response = openai.ChatCompletion.create(model=model, messages=messages)
         response = response.choices[0].message.content.strip()
 
-    # Strip the first line of response
-    # Assign it to start if it is empty
-    # Otherwise, remove the first line from the response
-    if start:
-        response = response.split("\n", 1)[1]
+    # Split the response by newline and store the result
+    split_response = response.split("\n", 1)
+
+    # Check if split_response contains at least 2 elements
+    if len(split_response) > 1:
+        response = split_response[1] if start else split_response[0]
     else:
-        start = response.split("\n", 1)[0]
-        response = response.split("\n", 1)[1]
+        # If there is no newline, the whole response is either the start or the generated message
+        if not start:
+            start = response
+        # If start is already set, we leave response as is, or set it to an empty string
+        else:
+            response = ""
 
     # Render and return the template
     return render_final_template(start, response, ticket).strip()
 
 
-
 def call_llama2_server(url: str, messages: list) -> dict:
     """
     Call the Llama2 server.
@@ -237,7 +240,9 @@ def call_llama2_server(url: str, messages: list) -> dict:
         response.raise_for_status()
         return response.json()
     except requests.exceptions.RequestException as e:
-        raise Llama2ServerError(f"An error occurred while connecting to the Llama2 server: {e}")
+        raise Llama2ServerError(
+            f"An error occurred while connecting to the Llama2 server: {e}"
+        )
 
 
 def render_template(message: str, template_name: str) -> str:
@@ -322,7 +327,7 @@ def run_magic_commit(
     api_key: str,
     model: str,
     show_loading_message: bool,
-    llama2_url: str = None
+    llama2_url: str = None,
 ) -> str:
     """
     Generate a commit message and return it.
@@ -359,7 +364,9 @@ def run_magic_commit(
         diff = run_git_diff(directory)
         if not check_git_status(directory):  # Check if there are staged changes
             return "⛔ Warning: No staged changes detected. Please stage some changes before running magic-commit."
-        commit_message = generate_commit_message(diff, start, ticket, api_key, model, llama2_url)
+        commit_message = generate_commit_message(
+            diff, start, ticket, api_key, model, llama2_url
+        )
     finally:
         # Ensure the loading animation stops
         if show_loading_message:

From b8c70db741fbf946c1b8d4efaccf8268270f5a38 Mon Sep 17 00:00:00 2001
From: Odai Athamneh <heyodai@gmail.com>
Date: Thu, 9 Nov 2023 15:35:57 -0600
Subject: [PATCH 2/2] Bump version to 0.6.2 in `setup.py`

---
 cli/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/setup.py b/cli/setup.py
index 03c3192..38028b2 100644
--- a/cli/setup.py
+++ b/cli/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="magic-commit",
-    version="0.6.1",
+    version="0.6.2",
     packages=find_packages(),
     include_package_data=True,  # This line is needed to include non-code files
     package_data={