Version 2.0 second run

app.py

@@ -123,8 +123,8 @@ embedder_both = SentenceTransformersTextEmbedder(model="BAAI/bge-large-en-v1.5",
 retriever_embedding_both = InMemoryEmbeddingRetriever(document_store=document_store)
 retriever_bm25_both = InMemoryBM25Retriever(document_store=document_store)
 joiner = DocumentJoiner(
-    join_mode="reciprocal_rank_fusion", # UPDATED: Use RRF for better hybrid fusion
-    weights=[0.5, 0.5] # UPDATED: Equal weights for embedding and BM25; adjust as needed (e.g., [0.6, 0.4] for more semantic bias)
+    join_mode="reciprocal_rank_fusion",
+    weights=[0.5, 0.5]
 )
 # Both (Hybrid) pipeline
 both_pipeline = Pipeline()
@@ -136,12 +136,14 @@ both_pipeline.connect("embedder.embedding", "retriever_embedding.query_embedding
 both_pipeline.connect("retriever_embedding", "joiner")
 both_pipeline.connect("retriever_bm25", "joiner")
 logger.info(f"Both pipeline components: {both_pipeline.graph.nodes.keys()}")
+
 # Components for keyword_pipeline
 retriever_bm25_key = InMemoryBM25Retriever(document_store=document_store)
 # Keywords pipeline
 keyword_pipeline = Pipeline()
 keyword_pipeline.add_component("retriever_bm25", retriever_bm25_key)
 logger.info(f"Keyword pipeline components: {keyword_pipeline.graph.nodes.keys()}")
+
 # Components for semantic_pipeline
 embedder_sem = SentenceTransformersTextEmbedder(model="BAAI/bge-large-en-v1.5", normalize_embeddings=True)
 retriever_embedding_sem = InMemoryEmbeddingRetriever(document_store=document_store)
@@ -662,7 +664,8 @@ def save_codex_tree(tree):
             api.upload_file(
                 path_or_fileobj=codex_tree_path,
                 path_in_repo=codex_tree_path,
-                repo_id="hetzerdj/preternatural-text-ui"  # Your SPACE_ID
+                repo_id="hetzerdj/preternatural-text-ui",
+                repo_type="space"  # Fixed for Spaces
             )
             logger.info("Auto-committed codex_tree.json to HF repo")
         except Exception as e:
@@ -715,7 +718,48 @@ def render_static_story(story):
     text = full_md[story['start_char']:story['end_char']]
     return f"# {story['title']}\n\n**Source**: {book_slug.replace('_', ' ').title()}\n**Pages**: {story['pages']}\n**Keywords**: {story['keywords']}\n\n{text}"
 
-# Gradio UI Definition
+# Helper: Reset hidden page
+def reset_hidden_page():
+    return "0" # Invalid page to trigger change
+
+# Helper: Set hidden page
+def set_hidden_page(selected):
+    if not selected:
+        return "1"
+    return selected['pages'].split('-')[0]
+
+# Helper: Update pending after changes
+def update_pending_after_changes(pending, selected, new_start, new_end, new_keywords):
+    if not selected:
+        return pending
+    book_slug = selected['book_slug']
+    title = selected['title']
+    orig_start = selected['start_char']
+    orig_end = selected['end_char']
+    orig_keywords = selected['keywords']
+    update_dict = {}
+    changed = False
+    if new_start != orig_start:
+        changed = True
+        update_dict['start_char'] = new_start
+    if new_end != orig_end:
+        changed = True
+        update_dict['end_char'] = new_end
+    if new_keywords != orig_keywords:
+        changed = True
+        kw_list = list(set([k.strip() for k in new_keywords.split(',') if k.strip()]))
+        update_dict['keywords'] = kw_list
+    if changed:
+        if book_slug not in pending:
+            pending[book_slug] = {}
+        pending[book_slug][title] = update_dict
+    elif book_slug in pending and title in pending[book_slug]:
+        del pending[book_slug][title]
+        if not pending[book_slug]:
+            del pending[book_slug]
+    return pending
+
+# Gradio UI Definition (updated for multi-book: book dropdown, per-book loads)
 def gradio_ui():
     try:
         logger.info("Building Gradio UI...")
@@ -731,7 +775,7 @@ def gradio_ui():
             edited_end = gr.State(0)
             edited_keywords = gr.State("")
             results_state = gr.State([])
-            pending_updates = gr.State({})
+            pending_updates = gr.State({}) # {book_slug: {title: {'start_char': int, 'end_char': int}}}
             codex_tree_state = gr.State(load_codex_tree())
             # For chained dropdowns (shared for assignment and tree nav)
             cat_path = gr.State([])
@@ -748,7 +792,6 @@ def gradio_ui():
                         search_mode = gr.Dropdown(label="Search Mode", choices=["Keywords (Exact/Phrase Matches)", "Semantic (Conceptual Similarity)", "Both (Hybrid)", "Exact (Word/Phrase)"], value="Both (Hybrid)")
                         min_score_input = gr.Number(label="Min Score Threshold", value=0.1, minimum=0.0, step=0.05)
                         search_btn = gr.Button("Search")
-
                     # Main Row: Three Columns
                     with gr.Row(variant="panel"):
                         # Left: Search results
@@ -761,7 +804,7 @@ def gradio_ui():
                             gr.Markdown("### Story Viewer")
                             viewer = gr.HTML(value="Select a story to view...", show_label=False)
                             hidden_page = gr.Textbox(visible=False, show_label=False)
-                            start_slider = gr.Slider(label="Start Char", minimum=0, maximum=1000000, step=1, interactive=True, visible=False)
+                            start_slider = gr.Slider(label="Start Char", minimum=0, maximum=1000000, step=1, interactive=True, visible=False) # Larger max for multi-book
                             end_slider = gr.Slider(label="End Char", minimum=0, maximum=1000000, step=1, interactive=True, visible=False)
                             start_phrase = gr.Textbox(label="Start After Phrase (e.g., introduction)", placeholder="Phrase to set start after...")
                             end_phrase = gr.Textbox(label="End Before Phrase (e.g., conclusion)", placeholder="Phrase to set end before...")
@@ -775,7 +818,6 @@ def gradio_ui():
                             level4 = gr.Dropdown(label="Level 4", choices=[], value=None)
                             level5 = gr.Dropdown(label="Level 5", choices=[], value=None)
                             level6 = gr.Dropdown(label="Level 6", choices=[], value=None)
-                            category_assignment = gr.Textbox(label="Selected Category", value="", interactive=False)
                             reset_btn = gr.Button("Reset Boundaries")
                             edit_status = gr.Textbox(label="Status", value="", interactive=False)
                             add_btn = gr.Button("Add to List")
@@ -1035,10 +1077,10 @@ def gradio_ui():
 
                     def assign_category(l1, l2, l3, l4, l5, l6, tree, sel, start, end, kw):
                         if not sel:
-                            return tree, ""
+                            return tree
                         path = [p for p in [l1, l2, l3, l4, l5, l6] if p]
                         if not path:
-                            return tree, ""
+                            return tree
                         story = {
                             "title": sel['title'],
                             "book_slug": sel['book_slug'],
@@ -1049,8 +1091,8 @@ def gradio_ui():
                         }
                         tree = assign_to_path(tree, path, story)
                         save_codex_tree(tree)
-                        return tree, path_to_string(path)
-                    level6.change(assign_category, [level1, level2, level3, level4, level5, level6, codex_tree_state, selected_story, edited_start, edited_end, edited_keywords], [codex_tree_state, category_assignment])
+                        return tree
+                    level6.change(assign_category, [level1, level2, level3, level4, level5, level6, codex_tree_state, selected_story, edited_start, edited_end, edited_keywords], codex_tree_state)
 
                 with gr.TabItem("Codex Tree"):
                     with gr.Row():
@@ -1064,21 +1106,17 @@ def gradio_ui():
                             tree_level5 = gr.Dropdown(label="Level 5", choices=[], value=None)
                             tree_level6 = gr.Dropdown(label="Level 6", choices=[], value=None)
                             tree_stories_radio = gr.Radio(label="Stories", choices=[], interactive=True)
-                            tree_path_display = gr.Textbox(label="Current Path", value="", interactive=False)
                             # Chained updates same as above
-                            tree_level1.change(update_level2, tree_level1, tree_level2).then(lambda: gr.update(value=None), tree_level2, tree_level2).then(lambda l1: path_to_string([l1]), tree_level1, tree_path_display)
-                            tree_level2.change(update_level3, [tree_level1, tree_level2], tree_level3).then(lambda: gr.update(value=None), tree_level3, tree_level3).then(lambda l1, l2: path_to_string([l1, l2]), [tree_level1, tree_level2], tree_path_display)
-                            tree_level3.change(update_level4, [tree_level1, tree_level2, tree_level3], tree_level4).then(lambda: gr.update(value=None), tree_level4, tree_level4).then(lambda l1, l2, l3: path_to_string([l1, l2, l3]), [tree_level1, tree_level2, tree_level3], tree_path_display)
-                            tree_level4.change(update_level5, [tree_level1, tree_level2, tree_level3, tree_level4], tree_level5).then(lambda: gr.update(value=None), tree_level5, tree_level5).then(lambda l1, l2, l3, l4: path_to_string([l1, l2, l3, l4]), [tree_level1, tree_level2, tree_level3, tree_level4], tree_path_display)
-                            tree_level5.change(update_level6, [tree_level1, tree_level2, tree_level3, tree_level4, tree_level5], tree_level6).then(lambda: gr.update(value=None), tree_level6, tree_level6).then(lambda l1, l2, l3, l4, l5: path_to_string([l1, l2, l3, l4, l5]), [tree_level1, tree_level2, tree_level3, tree_level4, tree_level5], tree_path_display)
-                            tree_level6.change(lambda l1, l2, l3, l4, l5, l6: path_to_string([l1, l2, l3, l4, l5, l6]), [tree_level1, tree_level2, tree_level3, tree_level4, tree_level5, tree_level6], tree_path_display)
-
+                            tree_level1.change(update_level2, tree_level1, tree_level2).then(lambda: gr.update(value=None), tree_level2, tree_level2)
+                            tree_level2.change(update_level3, [tree_level1, tree_level2], tree_level3).then(lambda: gr.update(value=None), tree_level3, tree_level3)
+                            tree_level3.change(update_level4, [tree_level1, tree_level2, tree_level3], tree_level4).then(lambda: gr.update(value=None), tree_level4, tree_level4)
+                            tree_level4.change(update_level5, [tree_level1, tree_level2, tree_level3, tree_level4], tree_level5).then(lambda: gr.update(value=None), tree_level5, tree_level5)
+                            tree_level5.change(update_level6, [tree_level1, tree_level2, tree_level3, tree_level4, tree_level5], tree_level6).then(lambda: gr.update(value=None), tree_level6, tree_level6)
                             def update_tree_stories(l1, l2, l3, l4, l5, l6, tree):
                                 path = [p for p in [l1, l2, l3, l4, l5, l6] if p]
                                 stories = get_stories_at_path(tree, path)
-                                if not path or not stories:
-                                    return gr.update(choices=[], value=None, label="Stories (No Stories Yet)")
-                                return gr.update(choices=[s['title'] for s in stories], value=None, label="Stories")
+                                choices = [s['title'] for s in stories]
+                                return gr.update(choices=choices, value=None)
                             tree_level6.change(update_tree_stories, [tree_level1, tree_level2, tree_level3, tree_level4, tree_level5, tree_level6, codex_tree_state], tree_stories_radio)
 
                             download_json_btn = gr.Button("Download codex_tree.json")
@@ -1094,21 +1132,21 @@ def gradio_ui():
                             view_in_text_btn = gr.Button("View in Text")
 
                     # Tree events
-                    def select_tree_story(selected_title, tree_path, tree):
+                    def select_tree_story(selected_title, l1, l2, l3, l4, l5, l6, tree):
                         if not selected_title:
                             return "No story selected.", "Static"
-                        path = [p for p in tree_path if p]
+                        path = [p for p in [l1, l2, l3, l4, l5, l6] if p]
                         stories = get_stories_at_path(tree, path)
                         story = next((s for s in stories if s['title'] == selected_title), None)
                         if story:
                             return render_static_story(story), "Static"
                         return "Story not found.", "Static"
-                    tree_stories_radio.change(select_tree_story, [tree_stories_radio, [tree_level1, tree_level2, tree_level3, tree_level4, tree_level5, tree_level6], codex_tree_state], [tree_viewer, view_mode])
+                    tree_stories_radio.change(select_tree_story, [tree_stories_radio, tree_level1, tree_level2, tree_level3, tree_level4, tree_level5, tree_level6, codex_tree_state], [tree_viewer, view_mode])
 
-                    def toggle_view_mode(story_title, mode, tree_path, tree, hidden_page):
-                        path = [p for p in tree_path if p]
+                    def toggle_view_mode(selected_title, mode, l1, l2, l3, l4, l5, l6, tree):
+                        path = [p for p in [l1, l2, l3, l4, l5, l6] if p]
                         stories = get_stories_at_path(tree, path)
-                        story = next((s for s in stories if s['title'] == story_title), None)
+                        story = next((s for s in stories if s['title'] == selected_title), None)
                         if not story:
                             return "Story not found.", "Static"
                         if mode == "Static":
@@ -1117,7 +1155,7 @@ def gradio_ui():
                             return html, "Book"
                         else:
                             return render_static_story(story), "Static"
-                    view_in_text_btn.click(toggle_view_mode, [tree_stories_radio, view_mode, [tree_level1, tree_level2, tree_level3, tree_level4, tree_level5, tree_level6], codex_tree_state, hidden_page], [tree_viewer, view_mode])
+                    view_in_text_btn.click(toggle_view_mode, [tree_stories_radio, view_mode, tree_level1, tree_level2, tree_level3, tree_level4, tree_level5, tree_level6, codex_tree_state], [tree_viewer, view_mode])
 
             return demo
     except Exception as e: