From 7e064e93ba1d753375342364333afd26b4660533 Mon Sep 17 00:00:00 2001 From: SuHyunKKim <kimsteven728@dgu.ac.kr> Date: Sun, 15 Dec 2024 11:56:09 +0900 Subject: [PATCH] docs:[ALL] README.md modify ing --- .idea/modules/server.main.iml | 8 -- README.md | 193 +++++++++++++++++++++++----------- 2 files changed, 132 insertions(+), 69 deletions(-) delete mode 100644 .idea/modules/server.main.iml diff --git a/.idea/modules/server.main.iml b/.idea/modules/server.main.iml deleted file mode 100644 index 0c8f1ab4..00000000 --- a/.idea/modules/server.main.iml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4"> - <component name="AdditionalModuleElements"> - <content url="file://$MODULE_DIR$/../../server/build/generated/sources/annotationProcessor/java/main"> - <sourceFolder url="file://$MODULE_DIR$/../../server/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" /> - </content> - </component> -</module> \ No newline at end of file diff --git a/README.md b/README.md index ca7f762b..c1b4038b 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,28 @@ # πλΉμ μ μ μ£Όλ μ¬νμ νλΌ, νλμ ν¨κ». +---  ## λͺ©μ°¨ -[1. νμ](#π€-νμ)<br> -[2. νλ‘μ νΈ μκ°](#π-νλ‘μ νΈ-μκ°-π)<br> - [2.1. μ£Όμ νλ©΄ ꡬμ±](#π₯οΈ-μ£Όμ-νλ©΄-ꡬμ±)<br> - [2.2. νλ‘μ νΈ κ΅¬μ‘°](#π-νλ‘μ νΈ-ꡬ쑰)<br> - [2.3. κΈ°μ μ€ν](#π οΈ-κΈ°μ -μ€ν)<br> -[3. νμ κ·μΉ](#νμ -κ·μΉ)<br> -[4. μΆκ°μλ£](#μΆκ°μλ£)<br> +--- +[1. νμ](#-π€-νμ) +[2. νλ‘μ νΈ μκ°](#-π-νλ‘μ νΈ-μκ°-π) + [2.1. μ£Όμ νλ©΄ ꡬμ±](#-π₯οΈ-μ£Όμ-νλ©΄-ꡬμ±) + [2.2. νλ‘μ νΈ κ΅¬μ‘°](#-π-νλ‘μ νΈ-ꡬ쑰) + [2.3. κΈ°μ μ€ν](#-π οΈ-κΈ°μ -μ€ν) +[3. νμ κ·μΉ](#νμ -κ·μΉ) +[4. μμ κ°μ΄λ](#μμ-κ°μ΄λ) +[5. μΆκ° μλ£](#μΆκ°μλ£) <br><br> ## π€ νμ - +--- |<img src="https://avatars.githubusercontent.com/u/144208568?v=4" width="150" height="150"/>|<img src="https://avatars.githubusercontent.com/u/155754445?v=4" width="150" height="150"/>|<img src="https://avatars.githubusercontent.com/u/162420581?v=4" width="150" height="150"/>|<img src="https://avatars.githubusercontent.com/u/144078388?v=4" width="150" height="150"/>| |:-:|:-:|:-:|:-:| |κΉμν[@SuHyunKKim](https://github.com/SuHyunKKim) |μκ°μ[@gaaaani](https://github.com/gaaaani)|μ΄νμ’ [@HyunJong00](https://github.com/HyunJong00)|μ‘°μλ¦Ό[@YeRimmm-Cho](https://github.com/YeRimmm-Cho)| |λ°±μλ |λ°±μλ |νλ‘ νΈμλ |νλ‘ νΈμλ | -<br> κ΅¬λΆ | μ±λͺ | νλ² | μμνκ³Ό | μ°κ³μ 곡 ------|-------|-------|-------|------- @@ -28,23 +30,24 @@ νμ | μκ°μ | 2021110261 | ν΅κ³νκ³Ό | μ΅ν©μννΈμ¨μ΄ νμ | μ΄νμ’ | 2019111655 | λ°μ΄μ€νκ²½κ³Όνκ³Ό | μ΅ν©μννΈμ¨μ΄ νμ | μ‘°μλ¦Ό | 2020111500 | νκ³νκ³Ό | μ΅ν©μννΈμ¨μ΄ -<br> -## π νλ‘μ νΈ μκ° π +<br><br> + -### π LLM κΈ°λ° μ μ£Όλ μ¬ν κ³ν μΆμ² μλΉμ€ "νλΌ, νλ" -- LLMκ³Ό RAGλ₯Ό κ²°νμ¬ μ μ£Όλλ₯Ό μ¬ννλ μ¬μ©μλ€μ΄ κ°μΈμ μ·¨ν₯κ³Ό νμμ λ§μΆ μ¬ν κ³νμ μ½κ² μΈμ°κ³ μ€νν μ μλλ‘ λλ νλ«νΌ κ°λ°<br><br> +## π νλ‘μ νΈ μκ° π +--- +### π LLM κΈ°λ° μ μ£Όλ μ¬ν κ³ν μΆμ² μλΉμ€ "νλΌ, νλ" +- LLMκ³Ό RAGλ₯Ό κ²°νμ¬ μ μ£Όλλ₯Ό μ¬ννλ μ¬μ©μλ€μ΄ κ°μΈμ μ·¨ν₯κ³Ό νμμ λ§μΆ μ¬ν κ³νμ μ½κ² μΈμ°κ³ μ€νν μ μλλ‘ λλ νλ«νΌ κ°λ°<br> ### π κ°λ°λͺ©ν - μ¬μ©μ μ€μ¬μ λ§μΆ€ν μ¬ν μΌμ μΆμ² μλΉμ€ μ 곡 - μ¬ν μΌμ κ΄λ¦¬μ νΈμμ± μ 곡 -- μ΅μ λ°μ΄ν°μ LLMμ κ²°ν©μΌλ‘ μ λ’°λ κ°ν<br><br> +- μ΅μ λ°μ΄ν°μ LLMμ κ²°ν©μΌλ‘ μ λ’°λ κ°ν<br> ### π μ£Όμ κΈ°λ₯ - **μ¬μ©μ λ§μΆ€ν μ¬ν μΆμ²** - μ¬μ©μκ° μ λ ₯ν μ¬ν μ 보(μ¬ν κΈ°κ°, λλ°μ, μ νΈ ν λ§ λ±)λ₯Ό λ°νμΌλ‘ νλ₯΄μλκ° λΆμ¬λ LLMμ΄ μ¬ν μΌμ μ μΆμ² - μ€μκ° λνν μΈν°νμ΄μ€λ₯Ό ν΅ν΄ μΆμ²λ°μ μΌμ μμ λ° μνΈμμ© κ°λ₯<br><br> - - **RAG(Retrieval-Augmented Generation) κΈ°λ° μ₯μ λ°μ΄ν° νμ©** - ν¬λ‘€λ§ν λ°μ΄ν°λ₯Ό κΈ°λ°μΌλ‘ ν μ΅μ μ₯μ μ 보 μ 곡 - RAG κΈ°μ μ μ¬μ©νμ¬ λ°μ΄ν°λ² μ΄μ€μμ κ΄λ ¨ μ 보λ₯Ό κ²μνκ³ LLMμ΄ μμ°μ΄λ‘ μ¬ν μΌμ μμ±<br><br> @@ -54,12 +57,10 @@ - **μ¬ν μΌμ μ μ₯ λ° κ΄λ¦¬** - μμ±λ μ¬ν μΌμ μ μ¬μ©μκ° μ μ₯ν μ μλ κΈ°λ₯ μ§μ - - μ μ₯λ μΌμ μ μ¬μ©μκ° μΈμ λ λ€μ νμΈ κ°λ₯ - -<br><br> + - μ μ₯λ μΌμ μ μ¬μ©μκ° μΈμ λ λ€μ νμΈ κ°λ₯<br><br> ## π₯οΈ μ£Όμ νλ©΄ κ΅¬μ± - +--- <table> <tr> <th>μ¬μ©μ μ΄κΈ° μ λ ₯ νλ©΄</th> @@ -89,63 +90,72 @@ <br> +#### βοΈμμ° μμ λ§ν¬ π [**μμ° λμμ λ§ν¬**](https://youtu.be/xXba5srjkrQ) <br><br> +<div align="right"> + +[λͺ©μ°¨λ‘](#λͺ©μ°¨) + +</div> ## π νλ‘μ νΈ κ΅¬μ‘° +--- ### βοΈBack-end ``` 2024-2-SCS4031-jjambbong-3 -βββ .github -βββ .idea -βββ .vscode -βββ frontend +βββ agentPersona # LLM λͺ¨λΈ λλ ν 리 +β βββ tamtam # ν둬ννΈ ν νλ¦Ώ, ai api, μ€ν ν΄λ +β βββ venv # μ΄ λ£¨νΈμ κ°μνκ²½ μμ± +β βββ app4.py # λ©μΈ flask μ΄ν리μΌμ΄μ +β βββ requirements.txt +β βββ .env βββ server β βββ src β β βββ main -β β β βββ java.com.capstone.server -β β β β -β β β βββ python -β β β β βββ app.py -β β β βββ resources -βββ PinecornDB -βββ venv -βββ README.md -βββ requirements.txt -βββ .env - - +β β β βββ java.com.capstone.server # μ€νλ§λΆνΈ λͺ¨λ νμΌ ν΄λ +β β β βββ resources # μ΄ν리μΌμ΄μ properties +β βββ build.gradle # gradle λΉλ νμΌ +βββ data +β βββ testdb.sqlite # νλ‘μ νΈ DB ``` ### βοΈFront-end ``` frontend - β£ node_modules - β£ public - β β£ mockdata - β β£ favicon.ico - β β£ index.html - β β£ logo.svg - β β manifest.json - β£ src - β β£ api # API μ°κ²° μ½λ λͺ¨μ - β β£ assets # μ¬μ© μ΄λ―Έμ§ λ° μμ΄μ½ λͺ¨μ - β β β£ fonts # μ¬μ© ν°νΈ - β β β£ images - β β β logo.svg - β β£ components # μ¬μ¬μ© κ°λ₯ μ»΄ν¬λνΈ λͺ¨μ - β β£ pages # νμ΄μ§ λͺ¨μ - β β£ App.js - β β£ index.js - β β£ setupProxy.js - β β url.txt - β£ .gitignore - β£ package-lock.json - β£ package.json - β yarn.lock +βββ node_modules +βββ public +β βββ mockdata +β βββ favicon.ico +β βββ index.html +β βββ logo.svg +β βββ manifest.json +βββ src +β βββ api # API μ°κ²° μ½λ λͺ¨μ +β βββ assets # μ¬μ© μ΄λ―Έμ§ λ° μμ΄μ½ λͺ¨μ +β β βββ fonts # μ¬μ© ν°νΈ +β β βββ images +β β βββ logo.svg +β βββ components # μ¬μ¬μ© κ°λ₯ μ»΄ν¬λνΈ λͺ¨μ +β βββ pages # νμ΄μ§ λͺ¨μ +β βββ App.js +β βββ index.js +β βββ setupProxy.js +β βββ url.txt +βββ .gitignore +βββ package-lock.json +βββ package.json +βββ yarn.lock ``` -<br><br> +<br> +<div align="right"> + +[λͺ©μ°¨λ‘](#λͺ©μ°¨) + +</div> + ## π οΈ κΈ°μ μ€ν +--- <div style="display:flex; flex-direction:column; align-items:flex-start;"> <!-- Frontend --> <p><strong>Frontend</strong></p> @@ -217,9 +227,14 @@ frontend <img src="https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=github&logoColor=white"> </div> </div> +<br> +<div align="right"> +[λͺ©μ°¨λ‘](#λͺ©μ°¨) +</div> ## νμ κ·μΉ +--- ### πBranch κ·μΉ - λ©μΈ λΈλμΉμ κΈ°λ₯λ³ λΈλμΉλ₯Ό ꡬλΆνμ¬ μ¬μ© - `main`: λ°°ν¬ κ°λ₯ν μνμ μ½λλ§μ κ΄λ¦¬νλ λΈλμΉ @@ -250,8 +265,59 @@ frontend ### πIssue κ·μΉ - ν νλ¦Ώμ μ¬μ©νμ¬ Issueλ₯Ό μμ±: [Issue ν νλ¦Ώ λ°λ‘κ°κΈ°](https://github.com/CSID-DGU/2024-2-SCS4031-jjambbong-3/tree/main/.github/ISSUE_TEMPLATE) - PRμ ν΄λΉνλ μ΄μλ²νΈλ₯Ό μμ±νμ¬ PRκ³Ό μ΄μλ₯Ό μ°κ²° +<br> +<div align="right"> + +[λͺ©μ°¨λ‘](#λͺ©μ°¨) +</div> +## μμ κ°μ΄λ +--- +### Requirements +λ‘컬 νκ²½μμ λΉλνκ³ μ€ννλ €λ©΄ λ€μμ΄ νμν¨: +``` +* Intellij - for Springboot +* Ngrok +* Front, Back .env νμΌ (μμ²μ μ 곡) +``` + +### μ€ν λ°©λ² +- Springboot, flask, react μ΄ 3κ°μ νλ‘μ νΈλ₯Ό μ€νν΄μΌν¨ +- Intellij μμμ 리μνΈμ νλΌμ€ν¬λ₯Ό μν λκ°μ ν°λ―Έλ, μ΄ 2κ°λ₯Ό μ€νν΄μΌν¨ + + +##### 1-1. λ°±μλ κ°μνκ²½ μμ± λ° μ€ν +``` +cd ./agentPersona +python -m venv [κ°μνκ²½μ΄λ¦] +./venv/Scripts/activate +``` +##### 1.2 λΌμ΄λΈλ¬λ¦¬ μ€μΉ +``` +pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu +pip install -r requirements.txt --no-deps +``` +##### 1.3νλΌμ€ν¬ νλ‘μ νΈ μ€ν +``` +python app4.py +``` +##### 2.1 νλ°νΈ νλ‘μ νΈ λΌμ΄λΈλ¬λ¦¬ μ€μΉ +``` +cd ./frontend # νλ‘μ νΈ λ£¨νΈ λλ ν 리 κΈ°μ€ +npm install +``` +##### 2.2 νλ°νΈ νλ‘μ νΈ μ€ν +``` +npm start +``` +##### 3.1 μ€νλ§ νλ‘μ νΈ μ€ν +- server λλ ν 리μ gradle νμΌ λΉλ λ° μ€ν + + + +##### 4. ꡬ체μ μΈ μ€ν λ°©λ² λ§ν¬ +(μμ±μμ ) <div align="right"> @@ -259,12 +325,16 @@ frontend </div> + + ## μΆκ°μλ£ +--- ### νλ‘μ νΈ κ΄λ¦¬ -- νμλ‘ λ°λ‘κ°κΈ°: [λ Έμ νμλ‘ λ°λ‘κ°κΈ°](https://meadow-cast-ab6.notion.site/819004d3d6a94c39b9271febe71a94ee?pvs=4)</br> +- νμλ‘ λ°λ‘κ°κΈ°: [λ Έμ νμλ‘ λ°λ‘κ°κΈ°](https://meadow-cast-ab6.notion.site/15c2184fcc7f8017a4c1d2e5902bbcba?v=15c2184fcc7f81dc94db000c014875ba&pvs=4)</br> - νλ‘μ νΈ μΌμ κ΄λ¦¬: [κ°νΈμ°¨νΈ λ°λ‘κ°κΈ°](https://docs.google.com/spreadsheets/d/1pmHWCLUkOmYGtPjWniW8xUe0MbYlfN0K/edit?gid=1439925983#gid=1439925983) + ### λ°νμλ£ λ° κ³νμμ λ³΄κ³ μ - μνκ³νμ: [μνκ³νμ λ°λ‘보기](https://github.com/SuHyunKKim/2024-2-SCS4031-jjambbong-3/blob/main/Docs/%EC%88%98%ED%96%89%EA%B3%84%ED%9A%8D%EC%84%9C_S3_%EC%A7%AC%EB%BD%95.pdf) - μ΅μ’ λ³΄κ³ μ: [μ΅μ’ λ³΄κ³ μ λ°λ‘보기]( @@ -275,10 +345,11 @@ frontend ### νλ‘μ νΈ μ§ν κ΄λ ¨ μλ£ - κΈ°λ₯λͺ μΈμ: [κΈ°λ₯λͺ μΈμ λ°λ‘κ°κΈ°](https://meadow-cast-ab6.notion.site/15c2184fcc7f8064af2bcdaf2561bf32?pvs=4) +- API λͺ μΈμ: [API λͺ μΈμ λ°λ‘κ°κΈ°](https://meadow-cast-ab6.notion.site/API-4f8a75307f27427297e140102ffc0222?pvs=4) <div align="right"> [λͺ©μ°¨λ‘](#λͺ©μ°¨) -</div> +</div> \ No newline at end of file