iTTsShuu 1 долоо хоног өмнө
parent
commit
b23a990eb6

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 19
曹航/2/chatbot.ipynb


+ 31 - 150
曹航/3/agent_test1.ipynb

@@ -2,15 +2,8 @@
  "cells": [
   {
    "cell_type": "code",
-<<<<<<< HEAD
-<<<<<<< HEAD
+
    "execution_count": 1,
-=======
-   "execution_count": 8,
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
-   "execution_count": 1,
->>>>>>> d788ac0 (agno练习+转账agent)
    "id": "8f58232e",
    "metadata": {},
    "outputs": [],
@@ -54,15 +47,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       "model_id": "a917f0961fca4339bce6bb54a2e494c9",
-=======
-       "model_id": "b8dba8b1142d4e78b13a51496be46d95",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
        "model_id": "a917f0961fca4339bce6bb54a2e494c9",
->>>>>>> d788ac0 (agno练习+转账agent)
        "version_major": 2,
        "version_minor": 0
       },
@@ -126,30 +111,15 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-<<<<<<< HEAD
-   "execution_count": 3,
-=======
-   "execution_count": null,
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+
    "execution_count": 3,
->>>>>>> d788ac0 (agno练习+转账agent)
    "id": "389236b4",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       "model_id": "c557671b95194a308e03957184726d5f",
-=======
-       "model_id": "b1683a2f5e664bd58207674eae611741",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
        "model_id": "c557671b95194a308e03957184726d5f",
->>>>>>> d788ac0 (agno练习+转账agent)
        "version_major": 2,
        "version_minor": 0
       },
@@ -424,30 +394,19 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-<<<<<<< HEAD
-   "execution_count": 4,
-=======
-   "execution_count": 10,
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+
+   
    "execution_count": 4,
->>>>>>> d788ac0 (agno练习+转账agent)
+   
    "id": "595e81bb",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
+       
        "model_id": "15d791b433274c4ab422b583169426f5",
-=======
-       "model_id": "d30e05211dbc466caa6cfbe96855dd52",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
-       "model_id": "15d791b433274c4ab422b583169426f5",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -471,15 +430,9 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       "model_id": "17467c587eec477fb111cb58cb20dc82",
-=======
-       "model_id": "c1da05284d4b4438a77e421352c5274e",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+       
        "model_id": "17467c587eec477fb111cb58cb20dc82",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -503,15 +456,9 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       "model_id": "d0c6a7cada684caa82ac98fd745f4990",
-=======
-       "model_id": "8c0296dac7464ca48c8ffbf97485c3fa",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+       
        "model_id": "d0c6a7cada684caa82ac98fd745f4990",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -535,15 +482,9 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
+       
        "model_id": "328410a4e1f144c2b19d0d286c247e0c",
-=======
-       "model_id": "dde342ffffe6412bb7dd7de7a5e10063",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
-       "model_id": "328410a4e1f144c2b19d0d286c247e0c",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -567,15 +508,9 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       "model_id": "486e315eeb5e4130967fdcd53cdf5e1d",
-=======
-       "model_id": "f7d74a23df1b4396bcfb012cd1f88b03",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+       
        "model_id": "486e315eeb5e4130967fdcd53cdf5e1d",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -633,30 +568,18 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-<<<<<<< HEAD
-   "execution_count": null,
-=======
-   "execution_count": 14,
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+   
    "execution_count": null,
->>>>>>> d788ac0 (agno练习+转账agent)
+   
    "id": "54fce47a",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
+       
        "model_id": "3bdc3e79f1444be680451ae5566bd84a",
-=======
-       "model_id": "a813b71508b3424eac865edc9902a814",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
-       "model_id": "3bdc3e79f1444be680451ae5566bd84a",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -680,15 +603,9 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       "model_id": "9402012548f345c8899a30bb3c07a0a0",
-=======
-       "model_id": "8c38d9d97ddf4afe8a771cc80bb8264c",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+       
        "model_id": "9402012548f345c8899a30bb3c07a0a0",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -712,15 +629,9 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       "model_id": "6723870b70ec488c8c311ff3749060ef",
-=======
-       "model_id": "c94473f3849348acaa1f3e6680cb81da",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+       
        "model_id": "6723870b70ec488c8c311ff3749060ef",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -744,15 +655,9 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
+       
        "model_id": "880b75df788f47fcb02dceacf699b090",
-=======
-       "model_id": "5c2cf0fb836d4dce9d70341053947065",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
-       "model_id": "880b75df788f47fcb02dceacf699b090",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -776,15 +681,9 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-       "model_id": "59643333ac1549dc97188ae1fdea365d",
-=======
-       "model_id": "d4081a2d82bb45df9682265dd5d0388c",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+       
        "model_id": "59643333ac1549dc97188ae1fdea365d",
->>>>>>> d788ac0 (agno练习+转账agent)
+       
        "version_major": 2,
        "version_minor": 0
       },
@@ -815,15 +714,9 @@
     "agent.user_id=\"user_shuu\"\n",
     "agent.search_previous_sessions_history=True\n",
     "agent.num_history_sessions=5\n",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "agent.storage=SqliteStorage(table_name=\"agent_history\",db_file=\"temp/agent_history.db\")\n",
-=======
-    "# agent.storage=SqliteStorage(table_name=\"agent_history\",db_file=\"temp/agent_history.db\")\n",
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
+    
     "agent.storage=SqliteStorage(table_name=\"agent_history\",db_file=\"temp/agent_history.db\")\n",
->>>>>>> d788ac0 (agno练习+转账agent)
+    
     "\n",
     "#session设置\n",
     "session_1_id = \"session_1_id\"\n",
@@ -840,20 +733,8 @@
     "    \"What did I discuss in my previous conversations?\", session_id=session_5_id,stream=True\n",
     ")  # It should only include the last 2 sessions"
    ]
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-  },
-  {
-   "cell_type": "markdown",
-   "id": "7b06e0e2",
-   "metadata": {},
-   "source": [
-    "**Agent state**"
-   ]
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
-=======
->>>>>>> d788ac0 (agno练习+转账agent)
+
+   
   }
  ],
  "metadata": {

+ 0 - 12
曹航/caohang.ipynb

@@ -118,21 +118,10 @@
     "    #返回得分最高的n个响应\n",
     "    #best_of=2,\n",
     "\n",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    "\n",
->>>>>>> 6c34b0b (test1)
-=======
->>>>>>> bad0e67 (多轮对话+agno agent学习实践)
     ")\n",
     "#print(completion.choices[0].message.logprobs[\"content\"])\n",
     "print(completion.choices[0].message.content)\n",
     "# print(completion.choices[1].message.content)\n",
-<<<<<<< HEAD
-    "# print(completion.choices[2].message.content)"
-   ]
-=======
     "# print(completion.choices[2].message.content)\n",
     "\n",
     "\n",
@@ -148,7 +137,6 @@
    "metadata": {},
    "outputs": [],
    "source": []
->>>>>>> 6c34b0b (test1)
   }
  ],
  "metadata": {

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно