Update app.py

app.py

@@ -1,5 +1,5 @@
 import dash
-from dash import dcc, html, Input, Output, State
+from dash import dcc, html, Input, Output, State, callback
 import dash_bootstrap_components as dbc
 from datetime import datetime, timedelta
 import google.generativeai as genai
@@ -19,8 +19,9 @@ app = dash.Dash(__name__, external_stylesheets=[dbc.themes.BOOTSTRAP])
 HF_GEMINI_API_KEY = os.environ.get('HF_GEMINI_API_KEY')
 HF_GITHUB_TOKEN = os.environ.get('HF_GITHUB_TOKEN')
 
-# Global variable to store generated files
+# Global variables to store generated files and PR URL
 generated_file = None
+pr_url = None
 
 def generate_release_notes(git_provider, repo_url, start_date, end_date, folder_location):
     global generated_file
@@ -94,51 +95,61 @@ def generate_release_notes(git_provider, repo_url, start_date, end_date, folder_
         generated_file = io.BytesIO(markdown_content.encode())
         generated_file.seek(0)
 
-        # Update SUMMARY.md
-        summary_url = "https://github.com/MicroHealthLLC/maiko-assistant/blob/main/documentation%2Freleases%2FSUMMARY.md"
-        update_summary(summary_url, file_name)
-
         return release_notes, file_name
     
     except Exception as e:
         return f"An error occurred: {str(e)}", None
 
-def update_summary(summary_url, new_file_name):
+def update_summary_and_create_pr(repo_url, folder_location, new_file_name, markdown_content):
+    global pr_url
     try:
         g = Github(HF_GITHUB_TOKEN)
-        repo = g.get_repo("MicroHealthLLC/maiko-assistant")
-        summary_content = repo.get_contents("documentation/releases/SUMMARY.md").decoded_content.decode()
+        repo = g.get_repo(repo_url)
+
+        # Get the current content of SUMMARY.md
+        summary_path = f"{folder_location}/SUMMARY.md"
+        summary_content = repo.get_contents(summary_path).decoded_content.decode()
 
         # Add new file to the top of the Releases section
         new_entry = f"{datetime.now().strftime('%b %d, %Y')}\n"
-        updated_content = summary_content.replace("Releases\n", f"Releases\n{new_entry}")
+        updated_summary = summary_content.replace("Releases\n", f"Releases\n{new_entry}")
 
         # Create a new branch for the PR
         base_branch = repo.default_branch
-        new_branch = f"update-summary-{datetime.now().strftime('%Y%m%d%H%M%S')}"
+        new_branch = f"update-release-notes-{datetime.now().strftime('%Y%m%d%H%M%S')}"
         ref = repo.get_git_ref(f"heads/{base_branch}")
         repo.create_git_ref(ref=f"refs/heads/{new_branch}", sha=ref.object.sha)
 
         # Update SUMMARY.md in the new branch
         repo.update_file(
-            "documentation/releases/SUMMARY.md",
+            summary_path,
             f"Update SUMMARY.md with new release notes {new_file_name}",
-            updated_content,
-            repo.get_contents("documentation/releases/SUMMARY.md").sha,
+            updated_summary,
+            repo.get_contents(summary_path).sha,
+            branch=new_branch
+        )
+
+        # Create the new release notes file
+        new_file_path = f"{folder_location}/{new_file_name}"
+        repo.create_file(
+            new_file_path,
+            f"Add release notes {new_file_name}",
+            markdown_content,
             branch=new_branch
         )
 
         # Create a pull request
         pr = repo.create_pull(
-            title=f"Update SUMMARY.md with new release notes {new_file_name}",
-            body="Automatically generated PR to update SUMMARY.md with new release notes.",
+            title=f"Add release notes {new_file_name} and update SUMMARY.md",
+            body="Automatically generated PR to add new release notes and update SUMMARY.md.",
             head=new_branch,
             base=base_branch
         )
 
-        return f"Pull request created: {pr.html_url}"
+        pr_url = pr.html_url
+        return f"Pull request created: {pr_url}"
     except Exception as e:
-        return f"Error updating SUMMARY.md: {str(e)}"
+        return f"Error creating PR: {str(e)}"
 
 # App layout
 app.layout = dbc.Container([
@@ -192,7 +203,11 @@ app.layout = dbc.Container([
     dbc.Card([
         dbc.CardBody([
             html.H4("Generated Release Notes"),
-            html.Pre(id="output-notes", style={"white-space": "pre-wrap"})
+            dcc.Loading(
+                id="loading-output",
+                type="circle",
+                children=[html.Pre(id="output-notes", style={"white-space": "pre-wrap"})]
+            )
         ])
     ]),
     dcc.Download(id="download-markdown")
@@ -232,18 +247,30 @@ def download_markdown(n_clicks):
     return dcc.send_bytes(generated_file.getvalue(), f"release_notes_{datetime.now().strftime('%Y%m%d%H%M%S')}.md")
 
 @app.callback(
-    Output("pr-button", "children"),
+    [Output("pr-button", "children"),
+     Output("pr-button", "disabled")],
     Input("pr-button", "n_clicks"),
-    [State("folder-location", "value")],
+    [State("repo-url", "value"),
+     State("folder-location", "value")],
     prevent_initial_call=True
 )
-def create_pr(n_clicks, folder_location):
+def create_pr(n_clicks, repo_url, folder_location):
     if n_clicks is None:
-        return dash.no_update
+        return dash.no_update, dash.no_update
+    
+    global generated_file
+    if generated_file is None:
+        return "Error: No file generated", True
+
+    file_name = f"{datetime.now().strftime('%m-%d-%Y')}.md"
+    markdown_content = generated_file.getvalue().decode()
+    
+    result = update_summary_and_create_pr(repo_url, folder_location, file_name, markdown_content)
     
-    # Implement PR creation logic here
-    # For now, we'll just return a placeholder message
-    return "PR Created"
+    if pr_url:
+        return f"PR Created: {pr_url}", True
+    else:
+        return result, False
 
 if __name__ == '__main__':
     print("Starting the Dash application...")