obsidian_fetch 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be242fb83e36e23491358f1109b2cf71b0b849d685aadc5752483733d8d92b3b
-  data.tar.gz: f960f0a39c9a008e35a27f4d420440583232907c8f2114be8df84de12f66a67d
+  metadata.gz: 5f1f3795373c330483a11d7c66fdb4bf44b7312a6f4065e7aefd230e9a4fe245
+  data.tar.gz: 8cd7c19f1780e3c9f89ca537f26ec5ad711073b7cd8e7ba07ed6a4d015b0b9e4
 SHA512:
-  metadata.gz: '00738a009acd96f5545035d30a5c4fc96987c90d014abd62c2b159c09a4c3e2ee64bbc85ea454242f1c86b0124deafa06f2d1fba010fb0445a1e5a55434357f5'
-  data.tar.gz: bde26b406b1cad4f1554b17970ed8d79ab816cbd2735ff8542e82ebc53d3934b95d9f4ad5a03216141af0a0b125ed82d106a22008eb2ea7d6816b7acae1954eb
+  metadata.gz: 0ea95a17289bd2ec4f5d940a947abea3c458febdec89ffb7695e58d2ad4ea5cb3f281194552e56ec6ebc4c67557cf6ca12aafeab9c5aad0e2373a3b7a484ff7d
+  data.tar.gz: 0a089431af584dba6faeafe73b8d86f41ee2dc42bcdd5ef640e56dd65421fb539eaf8107ed4cea5421bbda397103268b234f27c043546a366a4ed9137952f776

data/README.md

@@ -14,6 +14,7 @@ Additionally, the new server has the following features:
 - When the LLM tries to retrieve link information and searches with brackets like `[[link name]]`, it automatically removes characters that cannot be used in links.
 - When reading a file, if there are links pointing to the opened file, it displays them.
 	- Especially in network-style note tools like Obsidian, following such links to load related notes can be very powerful.
+- Support for aliases.
 
 ## Installation
 

data/exe/obsidian_fetch

@@ -24,7 +24,7 @@ tool 'read' do
     name = args[:name]
     # 名前が文字列でない場合
     next 'Name must be a string' unless name.is_a?(String)
-    ObsidianFetch::tool_read(vault, name)
+    vault.tool_read(name)
   end
 end
 
@@ -39,7 +39,7 @@ tool 'read_multiple' do
     # 名前が文字列の配列でない場合
     next 'Name must be an array of strings' unless names.is_a?(Array) && names.all? { |name| name.is_a?(String) }
     names.map do |name|
-      ObsidianFetch::tool_read(vault, name)
+      vault.tool_read(name)
     end.join("\n\n---\n\n")
   end
 end
@@ -53,7 +53,7 @@ tool 'list' do
     name = args[:name]
     # 名前が文字列でない場合
     next 'Name must be a string' unless name.is_a?(String)
-    ObsidianFetch::tool_list(vault, name)
+    vault.tool_list(name)
   end
 end
 
@@ -67,7 +67,7 @@ tool 'list_multiple' do
     # 名前が文字列の配列でない場合
     next 'Name must be an array of strings' unless names.is_a?(Array) && names.all? { |name| name.is_a?(String) }
     names.map do |name|
-      ObsidianFetch::tool_list(vault, name)
+      vault.tool_list(name)
     end.join("\n\n---\n\n")
   end
 end

data/lib/obsidian_fetch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ObsidianFetch
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

data/lib/obsidian_fetch.rb

@@ -127,73 +127,83 @@ module ObsidianFetch
         file_pathes.uniq!
       end
     end
-  end
 
-  def self.tool_read vault, name
-    name = Vault.normalize_note_name(name)
-    file_pathes = vault.notes[name]
-    # 名前のノートが存在しない場合
-    if file_pathes.nil?
-      return "Note not found: #{name}" if vault.links_by_file_name[name].nil?
-      file_pathes = vault.links_by_file_name[name]
-      return <<~EOS
-        Note not found: #{name}
-        However, I found other notes linked to this note.
-        #{file_pathes.map { |file_path| "- #{file_path}" }.join("\n")}
-      EOS
-    end
-  
-    # 複数のファイルがある場合は、---とファイル名で区切って返す
-    file_pathes.map do |file_path|
-      content = open(file_path) { |f| f.read.force_encoding('UTF-8') }
-      link_notes = if vault.links_by_file_path[file_path].nil?
-        ""
-      else
-        <<~EOS
-          This note is linked by the following notes:
-          #{(vault.links_by_file_path[file_path] || []).shuffle.map { |file_path| "- #{File.basename(file_path, '.md')}" }.join("\n")}
+    public
+
+    def tool_read name
+      name = Vault.normalize_note_name(name)
+      file_pathes = @notes[name]
+      # 名前のノートが存在しない場合
+      if file_pathes.nil?
+        return "Note not found: #{name}" if @links_by_file_name[name].nil?
+        file_pathes = @links_by_file_name[name]
+        return <<~EOS
+          Note not found: #{name}
+          However, I found other notes linked to this note.
+          #{file_pathes.map { |file_path| "- #{file_path}" }.join("\n")}
         EOS
       end
-      preface = <<~EOS
-        The contents of the note '#{name}' is as follows.
-        #{link_notes}
-        ---
-  
-      EOS
-      preface + content
-    end.join("\n\n---\n\n")
-  end
-  
-  MAX_LIST_SIZE = 20
-  def self.tool_list vault, name
-    name = Vault.normalize_note_name(name)
-    split_name = name.split(/[\s　]+/)
-    matched_notes = vault.notes.select do |note_name, _file_pathes|
-      split_name.map {|name_part| note_name.include?(name_part) }.all?
-    end
-    # 名前で検索したが見つからない場合
-    if matched_notes.empty?
-      has_found_link = vault.links_by_file_name[name] && !vault.links_by_file_name[name].empty?
-      return <<~EOS unless has_found_link
-        Note not found: #{name}
-        Search again with a substring or a string with a different notation.
-      EOS
-      return <<~EOS
-        Note not found: #{name}
-        However, I found other notes linked to this note.
-        #{vault.links_by_file_name[name].shuffle.map { |file_path| "- #{File.basename(file_path, '.md')}" }.join("\n")}
-      EOS
+    
+      # 複数のファイルがある場合は、---とファイル名で区切って返す
+      file_pathes.map do |file_path|
+        content = open(file_path) { |f| f.read.force_encoding('UTF-8') }
+        link_notes = if @links_by_file_path[file_path].nil?
+          ""
+        else
+          <<~EOS
+            This note is linked by the following notes:
+            #{(@links_by_file_path[file_path] || []).shuffle.map { |file_path| "- #{File.basename(file_path, '.md')}" }.join("\n")}
+          EOS
+        end
+        preface = <<~EOS
+          The contents of the note '#{name}' is as follows.
+          #{link_notes}
+          ---
+    
+        EOS
+        preface + content
+      end.join("\n\n---\n\n")
     end
-    # マッチした名前の数が多すぎる場合は、ランダムにMAX_LIST_SIZE個選ぶ
-    preface = "Notes matching '#{name}' are as follows.\n"
-    if matched_notes.size > MAX_LIST_SIZE
-      matched_notes = matched_notes.to_a.sample(MAX_LIST_SIZE).to_h
-      preface = "Too many notes matched. I will show you only #{MAX_LIST_SIZE} of them.\n" + preface
+    
+    MAX_LIST_SIZE = 20
+    def tool_list name
+      name = Vault.normalize_note_name(name)
+      split_name = name.split(/[\s　]+/)
+      # 空白文字で検索された場合は失敗した旨を返す
+      # 仮に全ノートからランダムなMAX_LIST_SIZEを返してしまうと、LLMが誤って呼び出した場合に偽の関連性を持ってしまうため
+      if split_name.empty?
+        return <<~EOS
+          It cannot be listed in a blank string.
+        EOS
+      end
+      matched_notes = @notes.select do |note_name, _file_pathes|
+        split_name.map {|name_part| note_name.include?(name_part) }.all?
+      end
+      # 名前で検索したが見つからない場合
+      if matched_notes.empty?
+        has_found_link = @links_by_file_name[name] && !@links_by_file_name[name].empty?
+        return <<~EOS unless has_found_link
+          Note not found: #{name}
+          Search again with a substring or a string with a different notation.
+        EOS
+        return <<~EOS
+          Note not found: #{name}
+          However, I found other notes linked to this note.
+          #{@links_by_file_name[name].shuffle.map { |file_path| "- #{File.basename(file_path, '.md')}" }.join("\n")}
+        EOS
+      end
+      # マッチした名前の数が多すぎる場合は、ランダムにMAX_LIST_SIZE個選ぶ
+      preface = "Notes matching '#{name}' are as follows.\n"
+      if matched_notes.size > MAX_LIST_SIZE
+        matched_notes = matched_notes.to_a.sample(MAX_LIST_SIZE).to_h
+        preface = "Too many notes matched. I will show you only #{MAX_LIST_SIZE} of them.\n" + preface
+      end
+      # マッチした名前のリストで返す
+      list = matched_notes.keys.shuffle.map do |note_name|
+        "- #{note_name}"
+      end.join("\n")
+      preface + list
     end
-    # マッチした名前のリストで返す
-    list = matched_notes.keys.shuffle.map do |note_name|
-      "- #{note_name}"
-    end.join("\n")
-    preface + list
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obsidian_fetch
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - sou7
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-26 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mcp-rb