Merge pull request #140 from kc3hack/yone/develop

ABfry · web-flow · commit cfe3f2194f0d · 2025-02-23T03:31:33.000+09:00
システムプロンプト修正　拗音(ゃゅょ)は1音として扱わない
diff --git a/backend/.env.example b/backend/.env.example
@@ -14,4 +14,6 @@ S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_BUCKET_NAME=
 
-OUR_ID=
+CURRENTS_API_KEY=
+NEWS_POST_API_KEY=
+OUR_ID=
diff --git a/backend/src/config/env.ts b/backend/src/config/env.ts
@@ -8,6 +8,9 @@ const envSchema = z.object({
   FRONTEND_URL: z.string().url(),
   PORT: z.coerce.number().optional(),
   GEMINI_API_KEY: z.string(),
+  CURRENTS_API_KEY: z.string(),
+  NEWS_POST_API_KEY: z.string(),
+  NEWS_USER_ID: z.string(),
   RDB_HOST: z.string(),
   RDB_USER: z.string(),
   RDB_PASSWORD: z.string(),
diff --git a/backend/src/controllers/Sample/sampleNewsTankaHandler.ts b/backend/src/controllers/Sample/sampleNewsTankaHandler.ts
@@ -0,0 +1,23 @@
+import { z, type RouteHandler } from '@hono/zod-openapi';
+import type { Context } from 'hono';
+import { sampleNewsTankaSchema } from '../../schema/Sample/sampleNewsTankaSchema.js';
+import type { sampleNewsTankaRoute } from '../../routes/Sample/sampleNewsTankaRoute.js';
+import postNews from '../../lib/postNews.js';
+
+type sampleNewsTankaSchema = z.infer<typeof sampleNewsTankaSchema>;
+
+const sampleNewsTankaHandler: RouteHandler<typeof sampleNewsTankaRoute, {}> = async (
+  c: Context
+) => {
+  const { apiKey } = await c.req.json<sampleNewsTankaSchema>();
+
+  /* --- 色々処理 --- */
+
+  const response = await postNews(apiKey);
+  console.log(response);
+
+  // レスポンス
+  return c.json(response, 200);
+};
+
+export default sampleNewsTankaHandler;
diff --git a/backend/src/lib/gemini.ts b/backend/src/lib/gemini.ts
@@ -106,7 +106,7 @@ const generateTanka = async (originalText: string): Promise<any> => {
       1.  **五七五七七の形式厳守:**  **読み（yomi0～yomi4）をカタカナに変換した上で**、五七五七七の音数になるように調整してください。字余りや字足らずは許されません。
           *   **特にアルファベットや記号は、カタカナ読みに変換した上で音数を数えてください。** 例：「AI」→「エーアイ」（4音）
           *   どうしても正確な音数に変換できない場合は、近い音に置き換える、または、前後の句で調整するなど、**短歌全体として五七五七七になるように工夫してください。**
-          * 長音(ー)、促音(っ)、拗音(ゃゅょ)は1音として扱う。
+          *   長音(ー)、促音(っ)は1音として扱いますが、拗音(ゃゅょ)は1音として扱いません。
       2.  **面白さとユニークさの追求:**
           *   **原投稿の要素を活かす:** 投稿内容のキーワード、感情、状況などを取り入れつつ、予想外の展開や表現につなげてください。
           *   **言葉遊び:** 同音異義語、掛詞、比喩などを積極的に活用し、言葉の面白さを引き出してください。
diff --git a/backend/src/lib/getNews.ts b/backend/src/lib/getNews.ts
@@ -0,0 +1,59 @@
+import type { Context } from 'hono';
+import { env } from '../config/env.js';
+
+const printLine = (): void => {
+  console.log('--------------------------------');
+};
+
+const getNews = async () => {
+  try {
+    const response = await fetch(
+      `https://api.currentsapi.services/v1/latest-news?language=ja&apiKey=${env.CURRENTS_API_KEY}`
+    );
+
+    // HTTPエラーが発生した場合
+    if (!response.ok) {
+      throw new Error(`HTTPエラー: ${response.status}`);
+    }
+
+    const data = await response.json();
+
+    console.log(data);
+
+    // ニュースの取得に失敗した場合
+    if (data.status !== 'ok') {
+      throw new Error('ニュースの取得に失敗しました。');
+    }
+
+    const newsArray = data.news;
+
+    let news;
+    for (let i = 0; i < newsArray.length; i++) {
+      const newsTemp = newsArray[i];
+      if (newsTemp.title !== '' && newsTemp.description !== '' && newsTemp.url !== '') {
+        news = newsTemp;
+        break;
+      }
+    }
+
+    if (!news) {
+      throw new Error('表示できるニュースがありません。');
+    }
+    return {
+      isSuccess: true,
+      news: {
+        title: news.title,
+        description: news.description,
+        url: news.url,
+      },
+    };
+  } catch (error: any) {
+    console.error(error);
+    return {
+      isSuccess: false,
+      message: error.message,
+    };
+  }
+};
+
+export default getNews;
diff --git a/backend/src/lib/postNews.ts b/backend/src/lib/postNews.ts
@@ -0,0 +1,95 @@
+import type { Context } from 'hono';
+import { env } from '../config/env.js';
+import getNews from './getNews.js';
+import generateTanka from './gemini.js';
+import createPostHandler from '../controllers/Post/createPostHandler.js';
+
+const printLine = (): void => {
+  console.log('--------------------------------');
+};
+
+const postNews = async (requestApiKey: string) => {
+  if (requestApiKey !== env.NEWS_POST_API_KEY) {
+    return {
+      isSuccess: false,
+      tanka: {
+        line0: 'APIキーが間違っています',
+        line1: '',
+        line2: '',
+        line3: '',
+        line4: '',
+      },
+    };
+  }
+
+  const newsResponse = await getNews();
+
+  // ニュースの取得に失敗した場合
+  if (!newsResponse.isSuccess || !newsResponse.news) {
+    return {
+      isSuccess: false,
+      tanka: {
+        line0: 'ニュースの取得に失敗しました',
+        line1: '',
+        line2: '',
+        line3: '',
+        line4: '',
+      },
+    };
+  }
+
+  const news = newsResponse.news;
+
+  // 投稿の原文
+  const originalText = `${news.title}\n${news.description}\n${news.url}`;
+
+  console.log('originalText', originalText);
+
+  try {
+    const formData = new FormData();
+    formData.append('original', originalText);
+    formData.append('user_icon', `https://avatars.githubusercontent.com/u/${env.NEWS_USER_ID}?v=4`);
+    formData.append('user_name', '風聞');
+
+    const postResponse = await fetch(`http://localhost:8080/post`, {
+      method: 'POST',
+      body: formData,
+    });
+
+    console.log('postResponse', postResponse);
+
+    if (!postResponse.ok) {
+      return {
+        isSuccess: false,
+        tanka: {
+          line0: '',
+          line1: '',
+          line2: '',
+          line3: '',
+          line4: '',
+        },
+      };
+    }
+
+    const json = await postResponse.json();
+
+    return {
+      isSuccess: true,
+      tanka: json.tanka,
+    };
+  } catch (error) {
+    console.error(error);
+    return {
+      isSuccess: false,
+      tanka: {
+        line0: '投稿に失敗しました',
+        line1: '',
+        line2: '',
+        line3: '',
+        line4: '',
+      },
+    };
+  }
+};
+
+export default postNews;
diff --git a/backend/src/routes/Sample/sampleNewsTankaRoute.ts b/backend/src/routes/Sample/sampleNewsTankaRoute.ts
@@ -0,0 +1,41 @@
+import { z } from '@hono/zod-openapi';
+import { createRoute } from '@hono/zod-openapi';
+import {
+  sampleNewsTankaResponseSchema,
+  sampleNewsTankaSchema,
+} from '../../schema/Sample/sampleNewsTankaSchema.js';
+import { errorResponseSchema } from '../../middleware/errorHandler.js';
+
+type sampleNewsTankaSchema = z.infer<typeof sampleNewsTankaSchema>;
+
+export const sampleNewsTankaRoute = createRoute({
+  method: 'post',
+  path: '/sample/news',
+  tags: ['sample'],
+  request: {
+    body: {
+      required: true,
+      content: {
+        'application/json': {
+          schema: sampleNewsTankaSchema,
+        },
+      },
+    },
+  },
+  responses: {
+    200: {
+      content: {
+        'application/json': {
+          schema: sampleNewsTankaResponseSchema,
+        },
+      },
+      description: 'Successful response',
+    },
+  },
+});
+
+export type SampleNewsTankaRouteResponse200 = z.infer<
+  (typeof sampleNewsTankaRoute.responses)['200']['content']['application/json']['schema']
+>;
+
+export type SampleNewsTankaRouteResponseError = z.infer<typeof errorResponseSchema>;
diff --git a/backend/src/routes/route.ts b/backend/src/routes/route.ts
@@ -29,6 +29,8 @@ import { sampleS3DownloadRoute } from './sampleS3Route.js';
 import sampleS3DownloadHandler from '../controllers/sampleS3DownloadHandler.js';
 import { sampleGeminiRoute } from './Sample/sampleGeminiRoute.js';
 import sampleGeminiHandler from '../controllers/Sample/sampleGeminiHandler.js';
+import { sampleNewsTankaRoute } from './Sample/sampleNewsTankaRoute.js';
+import sampleNewsTankaHandler from '../controllers/Sample/sampleNewsTankaHandler.js';
 
 const router = new OpenAPIHono();
 
@@ -47,5 +49,6 @@ export default router
   .openapi(isOurAccountRoute, isOurAccountHandler)
   .openapi(sampleS3UploadRoute, sampleS3UploadHandler)
   .openapi(sampleS3DownloadRoute, sampleS3DownloadHandler)
-  .openapi(sampleGeminiRoute, sampleGeminiHandler);
+  .openapi(sampleGeminiRoute, sampleGeminiHandler)
+  .openapi(sampleNewsTankaRoute, sampleNewsTankaHandler);
 // .openapi(helloRoute, helloWorldHandler); //こういう感じで足していく
diff --git a/backend/src/schema/Sample/sampleNewsTankaSchema.ts b/backend/src/schema/Sample/sampleNewsTankaSchema.ts
@@ -0,0 +1,33 @@
+import { z } from '@hono/zod-openapi';
+
+export const sampleNewsTankaSchema = z.object({
+  apiKey: z.string().openapi({
+    example: 'abc123',
+    description: 'APIキー',
+  }),
+});
+
+export const sampleNewsTankaResponseSchema = z.object({
+  isSuccess: z.boolean().openapi({
+    example: true,
+    description: '短歌の生成に成功したかどうか',
+  }),
+  tanka: z
+    .object({
+      line0: z.string(),
+      line1: z.string(),
+      line2: z.string(),
+      line3: z.string(),
+      line4: z.string(),
+    })
+    .openapi({
+      example: {
+        line0: '巷説の',
+        line1: '風の便りと',
+        line2: '聞きなして',
+        line3: '都の噂を',
+        line4: '語り継がんか',
+      },
+      description: 'ニュースを取得し、短歌にした結果',
+    }),
+});
