Merge pull request #209 from solaoi/main

v0.9.28

Author: solaoi

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Mac Environment (please complete the following information):**
+ - OS: [e.g. Sequoia 15.3.1, Sonoma 14.7.4]
+ - CPU: [e.g. Intel, M1, M2, M3, M4]
+ - Memory [e.g. 24GB]
+ - StorageUsage  [e.g. 256GB/1TB]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "lycoris",
   "private": true,
-  "version": "0.9.27",
+  "version": "0.9.28",
   "type": "module",
   "license": "MIT",
   "engines": {

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "lycoris"
-version = "0.9.27"
+version = "0.9.28"
 description = "Lycoris is an offline voice memo"
 authors = ["solaoi"]
 license = "MIT"

src-tauri/Cargo.toml

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Lycoris",
-    "version": "0.9.27"
+    "version": "0.9.28"
   },
   "tauri": {
     "allowlist": {

src-tauri/tauri.conf.json

@@ -12,9 +12,9 @@ const SettingModel = (): JSX.Element => {
     }
 
     return (
-        <div className="flex items-center mb-2">
-            <p className="w-[12rem]">利用モデル</p>
-            <div className="flex flex-col w-full">
+        <div className="flex items-center">
+            <p className="mr-4">利用モデル</p>
+            <div>
                 <select className="select select-bordered focus:outline-none text-xs w-fit" name="setting-model" onChange={change} >
                     {settingModels?.map((model, i) => (
                         <option key={"setting-model" + i} value={model} selected={model === settingKey}>{model}</option>

src/components/molecules/SettingModel.tsx

@@ -101,7 +101,7 @@ const SpeechHistory = (props: SpeechHistoryProps): JSX.Element => {
                                             {c.action_type === "chat" &&
                                                 <>
                                                     <div className="chat chat-start">
-                                                        <div className="flex chat-bubble bg-white text-slate-500 shadow-sm">
+                                                        <div className="flex chat-bubble bg-white text-slate-500 shadow-sm w-full">
                                                             <MyMarkdown content={c.content} title={`${selectedNote?.note_title.trim()}_action-start_${i}`} />
                                                         </div>
                                                     </div>
@@ -164,12 +164,12 @@ const SpeechHistory = (props: SpeechHistoryProps): JSX.Element => {
                                             {c.action_type === "tool" &&
                                                 <>
                                                     <div className="chat chat-start">
-                                                        <div className="flex chat-bubble bg-white text-slate-500 shadow-sm">
+                                                        <div className="flex chat-bubble bg-white text-slate-500 shadow-sm w-full">
                                                             <MyMarkdown content={c.content} title={`${selectedNote?.note_title.trim()}_action-start_${i}`} />
                                                         </div>
                                                     </div>
                                                     <div className="chat chat-end">
-                                                        <div className="flex chat-bubble bg-white text-slate-500 py-5 w-full relative shadow-sm">
+                                                        <div className="flex chat-bubble bg-white text-slate-500 py-5 w-full shadow-sm">
                                                             {c.content_2 ?
                                                                 <ToolCard
                                                                     id={c.id!}

src/components/molecules/SpeechHistory.tsx

@@ -1,10 +1,8 @@
 import { clipboard, invoke } from "@tauri-apps/api";
-import { useRef, useState } from "react";
-import { useRecoilState } from "recoil";
+import { useEffect, useRef, useState } from "react";
 import { toast } from "react-toastify";
 
 import DB from "../../lib/sqlite";
-import { showExecutedToolsState } from "../../store/atoms/showExecutedToolsState";
 import { ArrowPath } from "../atoms/ArrowPath";
 import { Check } from "../atoms/Check";
 import { CheckBadge } from "../atoms/CheckBadge";
@@ -28,7 +26,10 @@ const ToolCard = ({ id, tool_results, note_id, note_title, clear, updateToolResu
     const [dialogName, setDialogName] = useState<string>("");
     const [dialogMethod, setDialogMethod] = useState<string>("");
     const [dialogDescription, setDialogDescription] = useState<string>("");
-    const [showExecuted, setShowExecuted] = useRecoilState(showExecutedToolsState);
+    const [showExecutedTool, setShowExecutedTool] = useState(false);
+    useEffect(() => {
+        setShowExecutedTool(false);
+    }, [id]);
     const obj = (() => {
         try {
             return JSON.parse(tool_results) as { "is_required_user_permission": boolean, "content": string | null, "cmds": { "call_id": string, "args": Object, "name": string, "method": string, "description": string, "result": string | null }[] }
@@ -90,14 +91,14 @@ const ToolCard = ({ id, tool_results, note_id, note_title, clear, updateToolResu
                     <div>
                         {hasExecutedTools &&
                             <button className="mt-4 mb-2 cursor-pointer flex items-center"
-                                onClick={() => setShowExecuted(!showExecuted)}>
-                                {showExecuted ?
+                                onClick={() => setShowExecutedTool(!showExecutedTool)}>
+                                {showExecutedTool ?
                                     <ChevronDown /> :
                                     <ChevronRight />
                                 }
                                 <span>実行済みのツール（{executedTools}）</span>
                             </button>}
-                        {showExecuted && (
+                        {showExecutedTool && (
                             cmds.filter(cmd => cmd.result !== null).reverse().map(({ call_id, args, name, method, description, result }) => {
                                 return (
                                     <div key={call_id} className="cursor-default h-full py-3 px-6 border border-neutral-300 rounded-md shadow mb-2">
@@ -152,14 +153,14 @@ const ToolCard = ({ id, tool_results, note_id, note_title, clear, updateToolResu
                     <div>
                         {hasExecutedTools &&
                             <button className="mt-4 mb-2 cursor-pointer flex items-center"
-                                onClick={() => setShowExecuted(!showExecuted)}>
-                                {showExecuted ?
+                                onClick={() => setShowExecutedTool(!showExecutedTool)}>
+                                {showExecutedTool ?
                                     <ChevronDown /> :
                                     <ChevronRight />
                                 }
                                 <span>実行済みのツール（{executedTools}）</span>
                             </button>}
-                        {showExecuted && (
+                        {showExecutedTool && (
                             cmds.filter(cmd => cmd.result !== null).reverse().map(({ call_id, args, name, method, description, result }) => {
                                 return (
                                     <div key={call_id} className="cursor-default h-full py-3 px-6 border border-neutral-300 rounded-md shadow mb-2">

src/components/molecules/ToolCard.tsx

@@ -6,6 +6,7 @@ import { AppWindow } from '../molecules/AppWindow'
 import { ActionSet } from '../molecules/ActionSet'
 import { settingKeyState } from '../../store/atoms/settingKeyState'
 import { actionState } from '../../store/atoms/actionState'
+import { SettingModel } from '../molecules/SettingModel'
 
 type NoteFooterProps = {
     titleRef: React.RefObject<HTMLInputElement>
@@ -24,6 +25,8 @@ const NoteFooter = (props: NoteFooterProps): JSX.Element => {
     const selectedNote = useRecoilValue(selectedNoteState)
     const setHistories = useSetRecoilState(speechHistoryState(selectedNote!.note_id))
     const targetAction = useRecoilValue(actionState)
+    const settingKey = useRecoilValue(settingKeyState("settingModel"))
+    const dialogRef = useRef<HTMLDialogElement>(null)
     const update = (type: "memo" | "action", action_type?: "chat" | "suggest" | "tool") => {
         if (type === "memo") {
             if (inputValue === "") {
@@ -206,6 +209,38 @@ const NoteFooter = (props: NoteFooterProps): JSX.Element => {
             {!isMemo &&
                 <div className={"flex flex-col items-center w-52" + (isMemo ? " hidden" : "")}>
                     <ActionSet />
+                    {targetAction === "チャット" &&
+                        <div className="flex items-center absolute right-2 bottom-2 bg-base-100 border border-base-200 rounded-lg px-3 py-[2px] text-black/60 text-xs hover:shadow-inner shadow-sm">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" className="size-3">
+                                <path d="M6.5 2.25a.75.75 0 0 0-1.5 0v3a.75.75 0 0 0 1.5 0V4.5h6.75a.75.75 0 0 0 0-1.5H6.5v-.75ZM11 6.5a.75.75 0 0 0-1.5 0v3a.75.75 0 0 0 1.5 0v-.75h2.25a.75.75 0 0 0 0-1.5H11V6.5ZM5.75 10a.75.75 0 0 1 .75.75v.75h6.75a.75.75 0 0 1 0 1.5H6.5v.75a.75.75 0 0 1-1.5 0v-3a.75.75 0 0 1 .75-.75ZM2.75 7.25H8.5v1.5H2.75a.75.75 0 0 1 0-1.5ZM4 3H2.75a.75.75 0 0 0 0 1.5H4V3ZM2.75 11.5H4V13H2.75a.75.75 0 0 1 0-1.5Z" />
+                            </svg>
+                            <button className="ml-1" onClick={((e) => {
+                                e.stopPropagation();
+                                dialogRef.current?.showModal();
+                            })}>{settingKey}</button>
+                            <dialog
+                                ref={dialogRef}
+                                className="modal cursor-default"
+                                onClick={e => {
+                                    e.stopPropagation();
+                                    if (e.target === dialogRef.current) {
+                                        dialogRef.current?.close();
+                                    }
+                                }}
+                            >
+                                <div className="modal-box w-[320px]">
+                                    <h3 className="font-bold text-lg">チャット利用モデルの変更</h3>
+                                    <div className="mt-6 flex justify-end">
+                                        <SettingModel />
+                                    </div>
+                                    <div className="modal-action">
+                                        <form method="dialog">
+                                            <button className="btn">OK</button>
+                                        </form>
+                                    </div>
+                                </div>
+                            </dialog>
+                        </div>}
                 </div>
             }
         </div>