Merge pull request #55 from neph1/update-v0.20.1

Update v0.20.1

Author: neph1

tale/cmds/normal.py

@@ -9,6 +9,7 @@
 import itertools
 import random
 from typing import Iterable, List, Dict, Generator, Union, Optional
+from tale.llm.LivingNpc import LivingNpc
 
 from tale.llm.llm_ext import DynamicStory
 
@@ -1733,7 +1734,7 @@ def do_save(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None
     """Save the current story to file."""
     story = ctx.driver.story
     if isinstance(story, DynamicStory):
-        story.save()
+        story.save(save_name=parsed.unparsed)
     else:
         raise ActionRefused("Not a dynamic story")
 

tale/llm/LivingNpc.py

@@ -72,6 +72,9 @@ def notify_action(self, parsed: ParseResult, actor: Living) -> None:
             if self.handle_item_result(result, actor) and self.quest:
                 self.quest.check_completion({"item":result.item, "npc":result.to})
             self.do_say(parsed.unparsed, actor)
+        elif parsed.verb == 'attack' and targeted:
+            # TODO: should llm decide sentiment?
+            self.sentiments[actor.title] = 'hostile'
         if self.quest and self.quest.is_completed():
             # do last to give npc chance to react   
             self._clear_quest()

tale/llm/llm_ext.py

@@ -1,6 +1,7 @@
 import json
 import os
 import random
+import shutil
 from tale import parse_utils
 from tale.base import Item, Living, Location
 from tale.coord import Coord
@@ -125,6 +126,14 @@ def save(self, save_name: str = '') -> None:
         with open(os.path.join(save_path, 'llm_cache.json'), "w") as fp:
             json.dump(llm_cache.json_dump(), fp, indent=4)
 
+        if save_name:
+            resource_path = os.path.join(save_path, 'resources')
+            if not os.path.exists(resource_path):
+                os.mkdir(resource_path)
+            shutil.copy(os.path.join(os.getcwd(), 'story.py'), os.path.join(save_path, 'story.py'))
+            if os.path.exists(os.path.join(os.getcwd(), 'resources')):
+                shutil.copytree(os.path.join(os.getcwd(), 'resources'), resource_path, dirs_exist_ok=True)
+
 
     def generate_quest(self, npc: LivingNpc, type: QuestType = QuestType.GIVE) -> Quest:
         """ Generate a quest for the npc. """

tale/tio/if_browser_io.py

@@ -320,10 +320,12 @@ def wsgi_handle_story(self, environ: Dict[str, Any], parameters: Dict[str, str],
             return self.wsgi_not_modified(start_response)
         headers.append(("ETag", etag))
         start_response('200 OK', headers)
+
         txt = resource.text.format(story_version=self.driver.story.config.version,
                                    story_name=self.driver.story.config.name,
                                    story_author=self.driver.story.config.author,
                                    story_author_email=self.driver.story.config.author_address)
+        txt = self.modify_web_page(environ["wsgi.session"]["player_connection"], txt)
         return [txt.encode("utf-8")]
 
     def wsgi_handle_eventsource(self, environ: Dict[str, Any], parameters: Dict[str, str],
@@ -465,6 +467,13 @@ def wsgi_serve_static(self, path: str, environ: Dict[str, Any], start_response:
             data = resource.data
         start_response('200 OK', headers)
         return [data]
+    
+    def modify_web_page(self, player_connection: PlayerConnection, html_content: str) -> None:
+        """Modify the html before it is sent to the browser."""
+        if not "wizard" in player_connection.player.privileges:
+            html_content = html_content.replace('<input type="file" id="loadCharacterInput" accept=".json, .png, .jpeg, .jpg">', '')
+        return html_content
+
 
 
 class TaleWsgiApp(TaleWsgiAppBase):

tale/tio/mud_browser_io.py

@@ -141,6 +141,11 @@ def wsgi_handle_about(self, environ: Dict[str, Any], parameters: Dict[str, str],
                                    num_players=len(self.driver.all_players),
                                    player_table=player_table_txt)
         return [txt.encode("utf-8")]
+    
+    def modify_web_page(self, player_connection: PlayerConnection, html_content: str) -> None:
+        html_content = super().modify_web_page(player_connection, html_content)
+        html_content = html_content.replace('<input type="button" id="saveButton" value="Save story" onclick="showSaveDialog()" readonly/>', '')
+        return html_content
 
 
 class CustomRequestHandler(WSGIRequestHandler):

tale/web/save_story.js

@@ -0,0 +1,22 @@
+
+function showSaveDialog() {
+    document.getElementById('dialogOverlay').style.display = 'flex';
+}
+
+function closeSaveDialog() {
+    document.getElementById('dialogOverlay').style.display = 'none';
+}
+
+function saveStory() {
+    const filenameInput = document.getElementById('filenameInput');
+    const filename = filenameInput.value.trim().replace(/ /g, '_');
+
+    // Close the dialog
+    closeSaveDialog();
+    var ajax = new XMLHttpRequest();
+    ajax.open("POST", "input", true);
+    ajax.setRequestHeader("Content-type","application/x-www-form-urlencoded; charset=UTF-8");
+    var encoded_cmd = encodeURIComponent('save_story ' + filename);
+    console.log("Saving story: " + encoded_cmd);
+    ajax.send("cmd=" + encoded_cmd);
+}

tale/web/script.js

@@ -76,11 +76,6 @@ function process_text(json)
                 populateNpcDropdown(json["npcs"]);
             }
             setLocationImage(json["location"].toLowerCase().replace(/ /g, '_') + '.jpg');
-            // if (json.hasOwnProperty("location_image") && json["location_image"] !== '') {
-            //    setLocationImage(json["location_image"]);
-            // } else {
-            //     setLocationImage(null);
-            // }
             txtdiv.innerHTML += json["text"];
             if(!document.smoothscrolling_busy) smoothscroll(txtdiv, 0);
         }

tale/web/story.html

@@ -8,8 +8,17 @@
     <script type="application/javascript" src="static/eventsource.min.js"></script>
     <script type="application/javascript" src="static/script.js"></script>
     <script type="application/javascript" src="static/handle_upload.js"></script>
+    <script type="application/javascript" src="static/save_story.js"></script>
 </head>
 <body onload="setup()">
+    <div id="dialogOverlay">
+        <div id="saveDialog">
+            <label for="filenameInput">Enter new name (or leave blank to overwrite current):</label>
+            <input type="text" id="filenameInput">
+            <button onclick="saveStory()">Save</button>
+            <button onclick="closeSaveDialog()">Cancel</button>
+        </div>
+    </div>
     <div id="tale-page">
         <div id="top-container">
             <h1 title="version: {story_version} -- author: {story_author} -- {story_author_email}"><img src="static/logo.png" id="img-logo"> {story_name}</h1>
@@ -35,14 +44,15 @@ <h2>Your browser doesn't have Javascript or it is disabled. You can't use this w
                 <input type="submit" value="&#9166;" onclick="submit_cmd(); return false;" readonly/>
                 <input type="submit" value="&RightArrowBar;" name="autocomplete" id="button-autocomplete" onclick="autocomplete_cmd(); return false;" readonly/>
                 <input type="submit" value="&#128682" name="quit" id="button-quit" onclick="quit_clicked(); return false;" readonly/>
+
             </form>
-            <input type="file" id="fileInput" accept=".json, .png, .jpeg, .jpg">
-            
+            <input type="file" id="loadCharacterInput" accept=".json, .png, .jpeg, .jpg">
+            <input type="button" id="saveButton" value="Save story" onclick="showSaveDialog()" readonly/>
         </div>
     </div>
 </body>
 <script>
-    document.getElementById('fileInput').addEventListener('change', handleFile);        
+    document.getElementById('loadCharacterInput').addEventListener('change', handleFile);        
 </script>
 
 </html>

tale/web/style.css

@@ -187,4 +187,22 @@ p, pre {
 
 #top-container {
     display: flex;
+}
+
+#dialogOverlay {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.5);
+    justify-content: center;
+    align-items: center;
+}
+
+#saveDialog {
+    background: #fff;
+    padding: 20px;
+    border-radius: 8px;
 }

tests/test_browser.py

@@ -1,9 +1,12 @@
 
 
+from os import getcwd
 from wsgiref.simple_server import WSGIServer
 from tale.player import PlayerConnection
-from tale.tio.if_browser_io import HttpIo
+from tale.tio.if_browser_io import HttpIo, TaleWsgiApp
+from tale.tio.mud_browser_io import TaleMudWsgiApp
 from tale.web.web_utils import create_chat_container
+from tests.supportstuff import FakeDriver
 
 
 class TestHttpIo:
@@ -41,4 +44,32 @@ def test_create_chat_container(self):
 
         assert "chat-container" in result
         assert '<div class="user-name" content="Bloated Murklin"></div>' in result
-        assert '<div class="text-field" type="text">Hello World!</div>' in result
+        assert '<div class="text-field" type="text">Hello World!</div>' in result
+
+    def test_remove_load_character_button(self):
+        connection = PlayerConnection()
+        driver = FakeDriver()
+        wsgi_app = TaleWsgiApp(driver=driver, player_connection=connection, use_ssl=False, ssl_certs=None)
+
+        load_button = '<input type="file" id="loadCharacterInput" accept=".json, .png, .jpeg, .jpg">'
+        with open('tale/web/story.html', 'r') as file:
+            contents = file.read()
+            assert load_button in contents
+            result = wsgi_app.modify_web_page(connection, contents)
+        
+        assert load_button not in result
+
+    def test_remove_save_button(self):
+        connection = PlayerConnection()
+        driver = FakeDriver()
+        wsgi_app = TaleMudWsgiApp(driver=driver, use_ssl=False, ssl_certs=None)
+
+        save_button = '<input type="button" id="saveButton" value="Save story" onclick="showSaveDialog()" readonly/>'
+        with open('tale/web/story.html', 'r') as file:
+            contents = file.read()
+            assert save_button in contents
+            result = wsgi_app.modify_web_page(connection, contents)
+        
+        assert save_button not in result
+        
+