vcz

controllers/gpt_enginner20240706063303

@@ -0,0 +1 @@
+Subproject commit 84519cd758b3fb209789549c47433233cb0dbaff

controllers/gpt_enginner20240706064239

@@ -0,0 +1 @@
+Subproject commit b2ab1d65cc1b9610e5319c7cc374820bf08b79d3

controllers/gpt_enginner20240706064439

@@ -0,0 +1 @@
+Subproject commit 3ef7a2dfd43bd1bc9a24bf3b8d4d1c3e84be83ef

controllers/gpt_enginner20240706064718

@@ -0,0 +1 @@
+Subproject commit b831caf9d51113e4f802f67f4402439201405356

controllers/gpt_enginner20240706064852

@@ -0,0 +1 @@
+Subproject commit cf85ad3836b5171d43c05f5fc77a70cebd5503f9

mysite/interpreter/google_chat.py

@@ -32,21 +32,21 @@ def send_google_chat_card(webhook_url, title, subtitle, link_text, link_url,imag
                                 "buttons": [
                                     {
                                         "textButton": {
-                                            "text": "チャットボット設定シートを開く ",
+                                            "text": "ラインチャットを開く",
                                             "onClick": {
                                                 "openLink": {
-                                                    "url": link_url
+                                                    "url": "https://chat.line.biz/U2df77fd63804c72346b4e50c0096572e/chat/Ua13ef47afc077917275658a44019e072"
                                                 }
                                             }
                                         }
                                     }
                                 ]
-                            }, 
-                            {
+                            },  
+                                                        {
                                 "buttons": [
                                     {
                                         "textButton": {
-                                            "text": "ラインチャットを開く",
+                                            "text": "LINEからチャットで[question]質問項目[answer]こたえ　と登録すると答えるようになります（運用用）",
                                             "onClick": {
                                                 "openLink": {
                                                     "url": "https://chat.line.biz/U2df77fd63804c72346b4e50c0096572e/chat/Ua13ef47afc077917275658a44019e072"
@@ -55,21 +55,21 @@ def send_google_chat_card(webhook_url, title, subtitle, link_text, link_url,imag
                                         }
                                     }
                                 ]
-                            },   
+                            }, 
                             {
                                 "buttons": [
                                     {
                                         "textButton": {
-                                            "text": "データがヒットしない場合登録",
+                                            "text": "Q&Aを登録する",
                                             "onClick": {
                                                 "openLink": {
-                                                    "url": "https://kenken999-php.hf.space/zendesk__dataszz_list.php?qs=500%E5%86%86"
+                                                    "url": "https://kenken999-php.hf.space/main_list.php?page=mainpage"
                                                 }
                                             }
                                         }
                                     }
                                 ]
-                            },                             
+                            },                                          
                         ]
                     }
                 ]

routers/webhook.py

@@ -24,7 +24,7 @@ from command.n8n import post_data,post_data_line
 import time
 import traceback
 logger = logging.getLogger(__name__)
-
+##
 #router = APIRouter()
 router = APIRouter()
 #@router.get("/route/webhooks")
@@ -47,7 +47,7 @@ async def webhook(request: Request):
     n8nurl = os.getenv("n8nhook")
 
     thread_name=""
-    #return
+    ###return
     #url = github(token,foldername)
     try:
 
@@ -97,13 +97,16 @@ async def webhook(request: Request):
                 
                 subtitle = f"""<b>ユーザーID</b> {user_id}\r\n <b>質問内容</b>\r\n{message_id} {text}"""
 
-
+                ##
                 subtitle = f"""
-                <b>ユーザーID:</b>{user_id}
-                <b>質問内容:</b> {text}
+                <b>ユーザーID:</b>
+                    {user_id}
+                <b>質問内容:</b> 
+                    {text}
                 
-                <b>送信タイプ:</b> {event_type}
-                <b>ラインへ返信token /line_replay でチャットから返信<b>{reply_token}
+                <b>ラインへ返信token</b> 
+                {reply_token}
+                GoogleChatから返信 /line_replay でチャットから返信
                 """    
                 #<b>Webhook Event ID:</b> {webhook_event_id}<br>
                 #<b>Delivery Context:</b> {json.dumps(delivery_context)}<br>
@@ -124,13 +127,15 @@ async def webhook(request: Request):
                 ### n8n WorkFlowStart
                 #########################################################################
                 line_signature = received_headers.get("x-line-signature")
-                #for debug
+                ####$for debug
                 headers = {
                     "Content-Type": "application/json",
                     "X-Line-Signature": line_signature,
                     "Authorization": f"Bearer {os.getenv('ChannelAccessToken')}",
+                    "user_id":user_id,
                 }
                 #/webhook-test/d2d0af6e-5c42-45b6-a923-3bd2d8520e3f
+                #d2d0af6e-5c42-45b6-a923-3bd2d8520e3d
                 post_data("https://kenken999-nodex-n8n.hf.space/webhook-test/d2d0af6e-5c42-45b6-a923-3bd2d8520e3f",text,thread_name,headers)
                 #http://localhost:7860/webhook-test/d2d0af6e-5c42-45b6-a923-3bd2d8520e3f
                 post_data_line("https://kenken999-nodex-n8n.hf.space/webhook-test/d2d0af6e-5c42-45b6-a923-3bd2d8520e3d",body,headers)
@@ -170,25 +175,29 @@ async def webhook(request: Request):
     
                 ######################################################################### 
                 ## excute create program
-                res_no_process = no_process_file(prompt_for_create_system+res, "gpt_enginner"+ yyyymmddhis,thread_name)
+                if DEBUG==1:
+                    res_no_process = no_process_file(prompt_for_create_system+res, "gpt_enginner"+ yyyymmddhis,thread_name)
                 # execute open interpreter
                 #########################################################################
-                full_response,history = chat_with_interpreter_no_stream(prompt_for_create_system+"\r\n"+res)
+                if DEBUG==1:
+                    full_response,history = chat_with_interpreter_no_stream(prompt_for_create_system+"\r\n"+res)
                 if DEBUG==1:
                     thread_name = send_google_chat_card_thread(webhook_url, f"自動設定開始 {res}", str(full_response), link_text, link_url,thread_name)
-                #########################################################################
+                ####################################################################
                 #ダイヤ金額計算
                 from babyagi.classesa.diamond import calculate
-                title = f""" ダイヤ予測計算の実行 類似５件表示 {text} 
-                id,price,carat, cut, color, clarity, depth, diamondprice.table, x, y, z 類似度"""
-                res_calculate = calculate(text)
-                subtitle = res_calculate
-                link_text = "データを確認する"
-                link_url = "https://kenken999-php.hf.space/diamondprice_list.php"
-                #########################################################################
-                test_set_lide(subtitle, text)
-                
                 if DEBUG==1:
+                    title = f""" ダイヤ予測計算の実行 類似５件表示 {text} 
+                    id,price,carat, cut, color, clarity, depth, diamondprice.table, x, y, z 類似度"""
+                    #ベクトルインデックス
+                    res_calculate = calculate(text)
+                    subtitle = res_calculate
+                    link_text = "データを確認する"
+                    link_url = "https://kenken999-php.hf.space/diamondprice_list.php"
+                    #########################################################################
+                    #test_set_lide(subtitle, text)
+                
+                    #if DEBUG==0:
                     thread_name = send_google_chat_card_thread(webhook_url, title, subtitle, link_text, link_url,thread_name)
                 #########################################################################
                 from babyagi.babyagi import completion
@@ -196,9 +205,9 @@ async def webhook(request: Request):
                 text = text.replace("\r\n","")
                 # コマンドを構築
                 command = f"""make runbabyagi "{text}に対して、より良いチャットボットでのQAプランデータ設定の提案を日本語で作成してください" {thread_name}"""
-
-                with open('/home/user/app/babyagi/prompt.txt', 'w') as file:
-                    file.write(f"""{text}の質問 についてチャットボットでよりよく対応するプランを日本語で作成して""")
+                if DEBUG==1:
+                    with open('/home/user/app/babyagi/prompt.txt', 'w') as file:
+                        file.write(f"""{text}の質問 についてチャットボットでよりよく対応するプランを日本語で作成して""")
                     
                 ######################################################################
                 if DEBUG==1:
@@ -230,6 +239,7 @@ async def webhook(request: Request):
         #                "Authorization": f"Bearer {os.getenv('ChannelAccessToken')}",
         #             }
         #r#esponse = requests.post(os.getenv("WEBHOOK_URL"), headers=headers, data=body)
+        
         if not line_signature:
             raise HTTPException(status_code=400, detail="X-Line-Signature header is missing.")
 
@@ -279,7 +289,9 @@ async def webhook(request: Request):
         #test_set_lide(subtitle, text)
         logger.error(res)
         #send error to google chat
-        send_google_chat_card_thread(webhook_url, title, subtitle, link_text, link_url,thread_name)            
+        ###
+        #send_google_chat_card_thread(webhook_url, title, subtitle, link_text, link_url,thread_name)            
+        
         logger.error("Error: %s", str(e))
         #raise するとシステムとまるのでアンコメント
         #raise HTTPException(status_code=500, detail=str(e))

workspace/buysystem/buysystem/asgi.py

@@ -0,0 +1,16 @@
+"""
+ASGI config for buysystem project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/5.0/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'buysystem.settings')
+
+application = get_asgi_application()

workspace/buysystem/buysystem/settings.py

@@ -0,0 +1,123 @@
+"""
+Django settings for buysystem project.
+
+Generated by 'django-admin startproject' using Django 5.0.4.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/5.0/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/5.0/ref/settings/
+"""
+
+from pathlib import Path
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'django-insecure-w&_ve_ax*9b7^f3vms=$lg)n=yu_pgil8u%c&@#$ixs!^fi3+y'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'buysystem.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'buysystem.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/5.0/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/5.0/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/5.0/howto/static-files/
+
+STATIC_URL = 'static/'
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

workspace/buysystem/buysystem/urls.py

@@ -0,0 +1,22 @@
+"""
+URL configuration for buysystem project.
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/5.0/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+from django.contrib import admin
+from django.urls import path
+
+urlpatterns = [
+    path('admin/', admin.site.urls),
+]

workspace/buysystem/buysystem/wsgi.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for buysystem project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/5.0/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'buysystem.settings')
+
+application = get_wsgi_application()

workspace/buysystem/buysystem_app/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

workspace/buysystem/buysystem_app/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BuysystemAppConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'buysystem_app'

workspace/buysystem/buysystem_app/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

workspace/buysystem/buysystem_app/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

workspace/buysystem/buysystem_app/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

workspace/buysystem/manage.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    """Run administrative tasks."""
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'buysystem.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()