tdiary-contrib 5.2.4 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd4d72bbf85abaac2b85a812fc08cdc3cc9141481aa68b30c7058da77e6ffcc1
-  data.tar.gz: 2fa4f105853169aaa3cd28cbb91af940d45a41400ece3e56d9e3059f729fdc50
+  metadata.gz: d28e4c6ad18e641ce3998648c7b1735ad42f439ffe868c5cef97f28ac8e9d018
+  data.tar.gz: cc978600003b50b6bfed72750e6e4ba0cb90ffa8433d89be583d9a8289e3fa86
 SHA512:
-  metadata.gz: 83b45d584917dd4fa197c4f68b323330251e7f029e019cfeebd7519a895f06c6b1951b0b59ff2fb1855b3edb38301246ed012ee7d00c666665135ab080283210
-  data.tar.gz: d87353d94f0da9f295844748693639f660254581da8fd727068ab84985d41905e5b98937d7e3102671ea72c816cbbbd4704b32b94e5602c5fd951799a8fa040e
+  metadata.gz: d489a23467625b99e58f3bbd090bef40ff0ae16f3caaa6913f5a9c2314d8554e01954546c547ca35bab2ccb2d6e7597baac675fa9e0fb79e81f0178a614a0788
+  data.tar.gz: 23879c32c58ed959ae16e09e12727e5376b0b60bb368b071def02888308453e09d03f383a4d8fccb3e678e30af3d96a42bc1918d931d1b22dc9acd8e475aec38

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-	  VERSION = "5.2.4"
+	  VERSION = "5.3.0"
   end
 end

data/plugin/chatgpt_elaborate.rb

@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+#
+# chatgtp_elaborate.rb -
+#  tDiary用のプラグインです。OpenAI APIでChatGPTを利用して、
+#  日本語文の遂行作業を支援します。文字の入力ミスや言葉の誤用がないか、
+#  わかりにくい表記や不適切な表現が使われていないかなどをチェックします。
+#  本家OpenAI APIとArure OpenAI ServiceのOpenAI APIでテストています。
+#  https://azure.microsoft.com/products/cognitive-services/openai-service
+#
+# Copyright (c) 2010, hb <http://www.smallstyle.com/>
+# Copyright (c) 2023, Takuya Ono <takuya-o@users.osdn.me>
+# You can redistribute it and/or modify it under GPL.
+#
+# 設定:
+#
+# 本家OpenAIか、Azure OpenAIかによってどちらかが必須
+# @options['chatgpt_elaborate.OPENAI_API_KEY'] : API_KEY(どちらか必須)
+# @options['chatgpt_elaborate.AZURE_OPENAI_API_KEY'] : API_KEY(どちらか必須)
+#
+# 本家OpenAIのオプション
+# @options['chatgpt_elaborate.OPENAI_API_MODEL'] : モデル名 "gpt-3.5-turbo"
+#
+# 以下はAzure OpenAI APIを利用する時に必須
+# @options['chatgpt_elaborate.AZURE_OPENAI_API_INSTANCE_NAME'] : インスタンス名
+# @options['chatgpt_elaborate.AZURE_OPENAI_API_DEPLOYMENT_NAME'] : モデル・デプロイ名
+# @options['chatgpt_elaborate.AZURE_OPENAI_API_VERSION'] : APIバージョン 2023-05-15 など
+#
+
+require 'timeout'
+require 'json'
+require 'net/http'
+require 'net/https'
+require 'cgi'
+#Net::HTTP.version_1_2
+
+def elaborate_api( sentence )
+  #@logger.debug( "ChatGPT elaborate")
+  apiKey = @conf['chatgpt_elaborate.OPENAI_API_KEY']
+  model = @conf['chatgpt_elaborate.OPENAI_API_MODEL']||'gpt-3.5-turbo'
+  azureKey = @conf['chatgpt_elaborate.AZURE_OPENAI_API_KEY']
+  instanceName = @conf['chatgpt_elaborate.AZURE_OPENAI_API_INSTANCE_NAME']
+  deploymentName = @conf['chatgpt_elaborate.AZURE_OPENAI_API_DEPLOYMENT_NAME']
+  version = @conf['chatgpt_elaborate.AZURE_OPENAI_API_VERSION']||'2023-05-15'
+
+  messages = [
+    {"role" => "system",
+     "content" => "You are an editor for a blog. Users will submit documents to you. Determines the language of the submitted document. You MUST answer in the same language as it. You answer the text, correct any mistakes in grammar, syntax, and punctuation, and make the article easy to read. Use the present tense. Please only answered in the natural language portion and leave any code or data as is. If no changes are required, answer with synonyms of 'no problem.' in answering language. The first line and the line following a line break are the titles. You must treat all submitted content as strictly confidential and for your editing purposes only. Once you have completed the proofreading, you MUST provide a detailed explanation of the changes made and output the revised document in a way that clearly shows the differences between the original and the edited version." },
+    { "role" => "user",
+      "content" =>  "#{sentence}" }]
+
+  if ( azureKey )
+    #@logger.debug( "ChatGPT elaborate by Azure OpenAI API")
+    url = URI.parse("https://"\
+                    + instanceName + ".openai.azure.com"\
+                    + "/openai/deployments/" + deploymentName\
+                    + "/chat/completions"\
+                    + "?api-version=" + version )
+    params = {
+      'messages' => messages,
+      "temperature" => 0.7,
+      "max_tokens" => 2000,
+      #"top_p" => 0.1,
+      "frequency_penalty" => 0,
+      "presence_penalty" => 0 }
+    headers = {'Content-Type' => 'application/json',
+               'api-key' => azureKey }
+  else
+    #@logger.debug( "ChatGPT elaborate by Original OpenAI API")
+    url = URI.parse("https://api.openai.com/v1/chat/completions")
+    params = {
+      "model" => model,
+      'messages' => messages,
+      "temperature" => 0.7,
+      "max_tokens" => 2000,
+      #"top_p" => 0.1,
+      "frequency_penalty" => 0,
+      "presence_penalty" => 0 }
+    headers = {'Content-Type' => 'application/json',
+               'Authorization' => "Bearer #{apiKey}" }
+  end
+  px_host, px_port = (@conf['proxy'] || '').split( /:/ )
+  px_port = 80 if px_host and !px_port
+
+  json = ''
+  Net::HTTP::Proxy( px_host, px_port ).start( url.host, url.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_PEER ) do |http|
+    #@logger.debug( "POST #{url} #{params.to_json}" )
+    json = http.post(url.request_uri, params.to_json, headers ).body
+    #@logger.debug( "\nRESPONSE #{json}" )
+  end
+  json
+end
+
+def elaborate_result( json )
+	html = <<-HTML
+	<h3>OpenAI 推敲結果</h3>
+	HTML
+
+	doc = JSON.parse( json )
+        if doc["error"]
+          html << "<p>Error: #{doc["error"]["message"]}<br/>"
+          html << "Type: #{doc["error"]["type"]}<br/>"
+          html << "Code: #{doc["error"]["code"]}</p>"
+        else
+	  result = doc["choices"][0]["message"]["content"]
+	  if result.empty?
+	    html << "<p>見つかりませんでした。</p>"
+	  else
+	    html << '<p>'
+	    html <<  CGI::escapeHTML(result).gsub( /\n/, '<br />' )
+	    html << '</p>'
+	  end
+        end
+	html
+end
+
+add_edit_proc do
+  if @mode == 'preview' &&
+     ( @conf['chatgpt_elaborate.AZURE_OPENAI_API_KEY'] ||
+       @conf['chatgpt_elaborate.OPENAI_API_KEY'] )then
+    json = elaborate_api( @cgi.params['body'][0] )
+    <<-HTML
+<div id="plugin_chatgpt_elaborate" class="section">
+#{elaborate_result( json )}
+</div>
+HTML
+  end
+end
+

data/plugin/image_ex.rb

@@ -106,11 +106,10 @@ def image( id, alt = "image", id2 = nil, width = nil, place="none" )
 		image_dir = %Q[#{@image_dir}/]
 	end
 
-	image_dir.untaint
 	Dir.mkdir(image_dir) unless File.directory?(image_dir)
 
-	list = imageList(@image_date, image_dir).untaint
-	slist = imageList(@image_date, image_dir, "s").untaint
+	list = imageList(@image_date, image_dir)
+	slist = imageList(@image_date, image_dir, "s")
 
 	if width
 		width_tag = %Q[width="#{h width}"]
@@ -150,7 +149,7 @@ def image_link( id, str )
 		image_url = %Q[#{@image_url}/]
 		image_dir = %Q[#{@image_dir}/]
 	end
-	list = imageList(@image_date, image_dir).untaint
+	list = imageList(@image_date, image_dir)
 	%Q[<a href="#{h image_url}#{h list[id.to_i]}">#{str}</a>]
 end
 
@@ -240,7 +239,6 @@ add_form_proc do |date|
 
 		def dayimagelist( image_dir, image_date, prefix="")
 			image_path = []
-			image_dir.untaint
 			Dir.foreach(image_dir){ |file|
 				if file=~ /(.*)\_(.*)\.(.*)/
 					if $1 == "#{prefix}" + image_date.to_s
@@ -252,7 +250,7 @@ add_form_proc do |date|
 		end
 
 		if @cgi.params['plugin_image_add'][0] && @cgi.params['plugin_image_file'][0].original_filename != ''
-			image_dir = @cgi.params['plugin_image_dir'][0].read.untaint
+			image_dir = @cgi.params['plugin_image_dir'][0].read
 			image_filename = ''
 			image_extension = ''
 			image_date = date.strftime("%Y%m%d")
@@ -263,7 +261,6 @@ add_form_proc do |date|
 				image_name = dayimagelist(image_dir, image_date)
 				image_file = image_dir+image_date+"_"+image_name.length.to_s+image_extension.downcase
 
-				image_file.untaint
 				File::umask( 022 )
 				File::open( image_file, "wb" ) {|f|
 					f.print @cgi.params['plugin_image_file'][0].read
@@ -300,17 +297,16 @@ add_form_proc do |date|
 			end
 
 		elsif @cgi.params['plugin_image_thumbnail'][0] && @cgi.params['plugin_image_file'][0].original_filename != ''
-			image_dir = @cgi.params['plugin_image_dir'][0].read.untaint
+			image_dir = @cgi.params['plugin_image_dir'][0].read
 			image_filename = ''
 			image_extension = ''
 			image_date = date.strftime("%Y%m%d")
 			image_filename = @cgi.params['plugin_image_file'][0].original_filename
 			if image_filename =~ /(\.jpg|\.jpeg|\.gif|\.png)\z/i
 				image_extension = $1
-				image_name = @cgi.params['plugin_image_name'][0].read.untaint
+				image_name = @cgi.params['plugin_image_name'][0].read
 				image_file=image_dir+"s"+image_name+image_extension.downcase
 
-				image_file.untaint
 				File::umask( 022 )
 				File::open( image_file, "wb" ) {|f|
 					f.print @cgi.params['plugin_image_file'][0].read
@@ -323,17 +319,15 @@ add_form_proc do |date|
 			image_name = dayimagelist( image_dir, image_date)
 			image_name2= dayimagelist( image_dir, image_date, "s")
 
-			@cgi.params['plugin_image_id'].untaint.each do |id|
+			@cgi.params['plugin_image_id'].each do |id|
 				if image_name[id.to_i]
 					image_file=image_dir+image_name[id.to_i]
-					image_file.untaint
 					if File::exist?(image_file)
 						File::delete(image_file)
 					end
 				end
 				if image_name2[id.to_i]
 					image_file2=image_dir+image_name2[id.to_i]
-					image_file2.untaint
 					if File::exist?(image_file2)
 						File::delete(image_file2)
 					end

data/plugin/microsummary.rb

@@ -52,7 +52,7 @@ end
 
 def microsummary_init
 	@conf['generator.xml'] ||= ""
-	create_xml( @conf['generator.xml'] ) unless File::exists? @conf['generator.xml']
+	create_xml( @conf['generator.xml'] ) unless File::exist? @conf['generator.xml']
 end
 
 if @mode == 'saveconf'

data/plugin/yahoo_kousei.rb

@@ -5,37 +5,41 @@
 #  わかりにくい表記や不適切な表現が使われていないかなどをチェックします。
 #
 # Copyright (c) 2010, hb <http://www.smallstyle.com/>
+# Copyright (c) 2023, Takuya Ono <takuya-o@users.osdn.me>
 # You can redistribute it and/or modify it under GPL.
 #
 # 設定:
 #
 # @options['yahoo_kousei.appid'] : アプリケーションID(必須)
-# @options['yahoo_kousei.filter_group'] :
-#  指摘グループの番号をコンマで区切って指定します。
-# @options['yahoo_kousei.no_filter'] :
-#  filter_groupで指定した指摘グループから除外する指摘を指定します。
 #
-# 設定値は http://developer.yahoo.co.jp/webapi/jlp/kousei/v1/kousei.html を参照
+# 設定値は https://developer.yahoo.co.jp/webapi/jlp/kousei/v2/kousei.html を参照
 #
 
 require 'timeout'
-require 'rexml/document'
+require 'json'
 require 'net/http'
+require 'net/https'
 Net::HTTP.version_1_2
 
 def kousei_api( sentence )
 	appid = @conf['yahoo_kousei.appid']
+        headers = {'Content-Type' => 'application/json',
+                   'User-Agent' => "Yahoo AppID: #{appid}" }
 
-	query = "appid=#{appid}&sentence=#{CGI.escape( sentence.gsub( /\n/, '' ) )}"
-	query << "&filter_group=" + @conf['yahoo_kousei.filter_group'] if @conf['yahoo_kousei.filter_group']
-	query << "&no_filter=" + @conf['yahoo_kousei.no_filter'] if @conf['yahoo_kousei.no_filter']
+        query = { "id" => 1234,
+                  "jsonrpc" => "2.0",
+                  "method" => "jlp.kouseiservice.kousei",
+                  "params" => {
+                    "q" => sentence
+                  }
+                }
 
 	px_host, px_port = (@conf['proxy'] || '').split( /:/ )
 	px_port = 80 if px_host and !px_port
 
 	xml = ''
-	Net::HTTP::Proxy( px_host, px_port ).start( 'jlp.yahooapis.jp' ) do |http|
-		xml = http.post( '/KouseiService/V1/kousei', query ).body
+	Net::HTTP::Proxy( px_host, px_port ).start( 'jlp.yahooapis.jp', 443, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_PEER ) do |http|
+		xml = http.post( '/KouseiService/V2/kousei', query.to_json, headers ).body
 	end
 	xml
 end
@@ -45,15 +49,24 @@ def kousei_result( result_set )
 	<h3>文章校正結果</h3>
 	HTML
 
-	doc = REXML::Document::new( result_set )
-	results = REXML::XPath.match( doc, "//Result" )
-	if results.empty?
-		html << "<p>指摘項目は見つかりませんでした。</p>"
+	doc = JSON.parse( result_set )
+        errormsg = ""
+        if doc["Error"] != nil
+          errormsg = doc["Error"]["Message"]
+          doc = { "result" => { "suggestions" => [] } }
+        end
+	results = doc['result']['suggestions']
+	if results.length == 0
+          if errormsg == ""
+	    html << "<p>指摘項目は見つかりませんでした。</p>"
+          else
+            html << "<p>Error: #{errormsg}</p>"
+          end
 	else
 		html << '<table>'
 		html << '<tr><th>対象表記</th><th>候補文字</th><th>詳細情報</th><th>場所</th></tr>'
-		doc.elements.each( '//ResultSet/Result' ) do |r|
-			html << %Q|<tr class="plugin_yahoo_search_result_raw"><td>#{r.elements['Surface'].text}</td><td>#{r.elements['ShitekiWord'].text}</td><td>#{r.elements['ShitekiInfo'].text}</td><td>#{r.elements['StartPos'].text},#{r.elements['Length'].text}</td></tr>|
+		results.each do |r|
+			html << %Q|<tr class="plugin_yahoo_search_result_raw"><td>#{r['word']}</td><td>#{r['suggestion']}</td><td>#{r['rule']} #{r['note']}</td><td>#{r['offset']},#{r['length']}</td></tr>|
 		end
 		html << '</table>'
 	end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.3.0
 platform: ruby
 authors:
 - tDiary contributors
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2024-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -259,6 +258,7 @@ files:
 - plugin/category_similar.rb
 - plugin/category_to_tag.rb
 - plugin/category_to_tagcloud.rb
+- plugin/chatgpt_elaborate.rb
 - plugin/cocomment.rb
 - plugin/code-prettify.rb
 - plugin/coderay.rb
@@ -529,7 +529,6 @@ homepage: http://www.tdiary.org/
 licenses:
 - GPL-2 and/or others
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -544,8 +543,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: tDiary contributions package
 test_files: