diff --git a/.env.example b/.env.example index 8819bff..b698d24 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,6 @@ OPENAI_API_KEY= MATHPIX_APP_ID= MATHPIX_APP_KEY= -Mongo_URI= \ No newline at end of file +MongoDB_USERNAME= +MongoDB_PASSWORD= +MONGODB_CLUSTER_NAME= \ No newline at end of file diff --git a/README.md b/README.md index e9e5775..b076ac0 100644 --- a/README.md +++ b/README.md @@ -83,4 +83,139 @@ py .\check_api_key.py --payload_dir="./test/regression/regression_testxxx/payloa "mongo_uri": "mongodb+srv://{user_name}:{password}@cluster0.ill5gnu.mongodb.net", "db_name": "oridosai", "collection_name": "apis" -} \ No newline at end of file +} + +### AWS EC2 + +- Launch Instance +![Alt text](./images/image.png) + +- Instance Setting +![Alt text](./images/image-1.png) + +![Alt text](./images/image-2.png) + +![Alt text](./images/image-3.png) + +![Alt text](./images/image-4.png) + +![Alt text](./images/image-5.png) + +- Elastic IP Setting +![Alt text](./images/image-7.png) + +![Alt text](./images/image-8.png) + +![Alt text](./images/image-9.png) + +![Alt text](./images/image-10.png) + +![Alt text](./images/image-11.png) + +- Security Group Setting +![Alt text](./images/image-12.png) + +![Alt text](./images/image-13.png) + +![Alt text](./images/image-14.png) + +![Alt text](./images/image-15.png) + +- Connect to Instance +![Alt text](./images/image-16.png) + +![Alt text](./images/image-17.png) + +### Project Setting +``` +sudo su +apt update + +apt install apt-transport-https ca-certificates curl software-properties-common +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable" +apt-cache policy docker-ce +apt install docker-ce + +apt install docker-compose + +apt install make + +apt install nginx + +cd /var/www + +git clone https://github.com/oridosai/img2txt-fine-tuning-api.git + +cd img2txt-fine-tuning-api + +chmod -R 777 /var/www/img2txt-fine-tuning-api + +nano .env + +Please copy your local env data at this file and save. + +OPENAI_API_KEY= +MATHPIX_APP_ID= +MATHPIX_APP_KEY= +MONGODB_USERNAME= +MONGODB_PASSWORD= +MONGODB_CLUSTER_NAME= + +docker-compose up -d +``` + +### done +host your elastic ip + +http://{your elastic ip}:5000/create_api +POST +``` +{ + "user": "", + "title": "", + "description": "", + "data_id": "" +} +``` + +http://{your elastic ip}:5000/delete_api +POST +``` +{ + "api_key": "", + "user": "", + "data_id": "" +} +``` + +http://{your elastic ip}:5000/check_api +POST +``` +{ + "api_key": "", + "user": "", + "data_id": "" +} +``` + +http://{your elastic ip}:5000/finetuning +POST +``` +{ + "api_key": "", + "user": "", + "data_id": "" +} +``` + +http://{your elastic ip}:5000/conversation +POST +``` +{ + "api_key": "", + "user": "", + "data_id": "", + "question": "hi" +} +``` diff --git a/chatting.py b/chatting.py index 39b7563..6ab5a74 100644 --- a/chatting.py +++ b/chatting.py @@ -2,7 +2,6 @@ import gc import argparse from pathlib import Path -from urllib.parse import quote_plus from src.utils.read_json import read_json from src.chatting.ChattingClass import ChattingClass @@ -16,18 +15,8 @@ def chatting(args): # Payload payload_data = read_json(args.payload_dir) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/check_api_key.py b/check_api_key.py index e39430f..20db07c 100644 --- a/check_api_key.py +++ b/check_api_key.py @@ -3,7 +3,6 @@ import gc import argparse from pathlib import Path -from urllib.parse import quote_plus from src.utils.read_json import read_json from src.mongodb.MongoDBClass import MongoDBClass @@ -17,18 +16,8 @@ def check_api_key(args): # Payload payload_data = read_json(args.payload_dir) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/create_api_key.py b/create_api_key.py index c3492ca..94ee4e8 100644 --- a/create_api_key.py +++ b/create_api_key.py @@ -4,7 +4,6 @@ import argparse from pathlib import Path from datetime import datetime -from urllib.parse import quote_plus from src.utils.read_json import read_json from src.mongodb.MongoDBClass import MongoDBClass @@ -19,18 +18,8 @@ def create_api_key(args): # Payload payload_data = read_json(args.payload_dir) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/delete_api_key.py b/delete_api_key.py index d864611..a392088 100644 --- a/delete_api_key.py +++ b/delete_api_key.py @@ -3,7 +3,6 @@ import gc import argparse from pathlib import Path -from urllib.parse import quote_plus from src.utils.read_json import read_json from src.mongodb.MongoDBClass import MongoDBClass @@ -16,18 +15,8 @@ def delete_api_key(args): # Payload payload_data = read_json(args.payload_dir) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/images/image-1.png b/images/image-1.png new file mode 100644 index 0000000..eb566aa Binary files /dev/null and b/images/image-1.png differ diff --git a/images/image-10.png b/images/image-10.png new file mode 100644 index 0000000..517cccc Binary files /dev/null and b/images/image-10.png differ diff --git a/images/image-11.png b/images/image-11.png new file mode 100644 index 0000000..cbe6ab2 Binary files /dev/null and b/images/image-11.png differ diff --git a/images/image-12.png b/images/image-12.png new file mode 100644 index 0000000..5c55c9b Binary files /dev/null and b/images/image-12.png differ diff --git a/images/image-13.png b/images/image-13.png new file mode 100644 index 0000000..1b4ac2f Binary files /dev/null and b/images/image-13.png differ diff --git a/images/image-14.png b/images/image-14.png new file mode 100644 index 0000000..881d270 Binary files /dev/null and b/images/image-14.png differ diff --git a/images/image-15.png b/images/image-15.png new file mode 100644 index 0000000..5ad197b Binary files /dev/null and b/images/image-15.png differ diff --git a/images/image-16.png b/images/image-16.png new file mode 100644 index 0000000..f05c5f9 Binary files /dev/null and b/images/image-16.png differ diff --git a/images/image-17.png b/images/image-17.png new file mode 100644 index 0000000..b66a8c7 Binary files /dev/null and b/images/image-17.png differ diff --git a/images/image-2.png b/images/image-2.png new file mode 100644 index 0000000..ed0fbe6 Binary files /dev/null and b/images/image-2.png differ diff --git a/images/image-3.png b/images/image-3.png new file mode 100644 index 0000000..976dc17 Binary files /dev/null and b/images/image-3.png differ diff --git a/images/image-4.png b/images/image-4.png new file mode 100644 index 0000000..f10de4c Binary files /dev/null and b/images/image-4.png differ diff --git a/images/image-5.png b/images/image-5.png new file mode 100644 index 0000000..c83758f Binary files /dev/null and b/images/image-5.png differ diff --git a/images/image-6.png b/images/image-6.png new file mode 100644 index 0000000..5654ecb Binary files /dev/null and b/images/image-6.png differ diff --git a/images/image-7.png b/images/image-7.png new file mode 100644 index 0000000..924a6ee Binary files /dev/null and b/images/image-7.png differ diff --git a/images/image-8.png b/images/image-8.png new file mode 100644 index 0000000..e38dfd3 Binary files /dev/null and b/images/image-8.png differ diff --git a/images/image-9.png b/images/image-9.png new file mode 100644 index 0000000..b898e1e Binary files /dev/null and b/images/image-9.png differ diff --git a/images/image.png b/images/image.png new file mode 100644 index 0000000..eb45e53 Binary files /dev/null and b/images/image.png differ diff --git a/main.py b/main.py index 15b96c3..bae6518 100644 --- a/main.py +++ b/main.py @@ -4,7 +4,6 @@ import time import argparse from pathlib import Path -from urllib.parse import quote_plus import concurrent.futures from datetime import datetime import json @@ -24,18 +23,8 @@ def total_process(args): payload_data = read_json(args.payload_dir) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/src/mongodb/MongoDBClass.py b/src/mongodb/MongoDBClass.py index 7ca7264..ccbcf50 100644 --- a/src/mongodb/MongoDBClass.py +++ b/src/mongodb/MongoDBClass.py @@ -1,13 +1,8 @@ -import re import os -import datetime -import jwt -import json -import pytz from dotenv import load_dotenv -from bson.objectid import ObjectId -from bson.json_util import dumps from pymongo import MongoClient +from pymongo.errors import ServerSelectionTimeoutError +from urllib.parse import quote_plus from src.models.api_model import APIModel @@ -15,67 +10,108 @@ class MongoDBClass(): def __init__(self, db_name, collection_name, mongo_uri=""): self.db_name = db_name self.collection_name = collection_name - self.set_mongo_uri(mongo_uri) + self.set_mongo_uri() - def set_mongo_uri(self, mongo_uri): - if mongo_uri: - self.mongo_uri = mongo_uri - else: - load_dotenv() - self.mongo_uri = os.getenv("Mongo_URI") + def set_mongo_uri(self): + load_dotenv() + mongodb_username = os.getenv("MONGODB_USERNAME") + mongodb_password = os.getenv("MONGODB_PASSWORD") + mongodb_cluster_name = os.getenv("MONGODB_CLUSTER_NAME") + # Escape the mongodb_username and mongodb_password + mongodb_escaped_username = quote_plus(mongodb_username) + mongodb_escaped_password = quote_plus(mongodb_password) + + # Construct the MongoDB Atlas URI + mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net" + + self.mongo_uri = mongo_uri - if self.mongo_uri is not None: - os.environ["Mongo_URI"] = self.mongo_uri - return True - else: - # Handle the absence of the environment variable - # You might want to log an error, raise an exception, or provide a default value - # For example, setting a default value - os.environ["Mongo_URI"] = mongo_uri - return False def mongo_connect(self): - # mongo config - client = MongoClient(self.mongo_uri) - if client is None: - # no connection, exit early - print("MongoDB Server Connection Error") - return {"result": False ,"message": "MongoDB Server Connection Error."} - else: + try: + # mongo config + print(self.mongo_uri) + + client = MongoClient(self.mongo_uri) + # Test the connection by accessing a database (e.g., admin) + client.admin.command('ismaster') + print("MongoDB Server Connected.") - # confirm oridosai db exist - dblist = client.list_database_names() - if self.db_name in dblist: - print(f"The {self.db_name} database exists.") - # confirm apis collection exist - oridosai_db = client[self.db_name] - collist = oridosai_db.list_collection_names() - if self.collection_name in collist: - print(f"The {self.collection_name} collection exists.") - user_col = oridosai_db[self.collection_name] - return {"result": True, "message": user_col} - else: - print(f"The {self.collection_name} collection not exists.") - return {"result": False ,"message": f"The {self.collection_name} collection not exists."} + # Access the database + db = client[self.db_name] + + # Check if the database exists + db_list = client.list_database_names() + if self.db_name in db_list: + print(f"The {self.db_name} database exists.") else: print(f"The {self.db_name} database does not exist.") - # create the database - client[self.db_name].create_collection(self.collection_name) - print(f"The {self.db_name} database has been created with {self.collection_name} collection.") - - # confirm apis collection exist - oridosai_db = client[self.db_name] - collist = oridosai_db.list_collection_names() - if self.collection_name in collist: - print(f"The {self.collection_name} collection exists.") - user_col = oridosai_db[self.collection_name] - return {"result": True, "message": user_col} - else: - print(f"The {self.collection_name} collection not exists.") - return {"result": False ,"message": f"The {self.collection_name} collection not exists."} + print(f"Creating {self.db_name} database.") + db = client[self.db_name] + + # Access the collection + collection_list = db.list_collection_names() + if self.collection_name in collection_list: + print(f"The {self.collection_name} collection exists.") + collection = db[self.collection_name] + else: + print(f"The {self.collection_name} collection does not exist.") + print(f"Creating {self.collection_name} collection.") + collection = db[self.collection_name] + + return {"result": True, "message": collection} + + except ServerSelectionTimeoutError as err: + print("MongoDB Server Connection Error:", err) + return {"result": False, "message": "MongoDB Server Connection Error: " + str(err)} + except Exception as e: + print("An error occurred:", e) + return {"result": False, "message": "An error occurred: " + str(e)} + + # def mongo_connect(self): + # # mongo config + # client = MongoClient(self.mongo_uri) + # if client is None: + # # no connection, exit early + # print("MongoDB Server Connection Error") + # return {"result": False ,"message": "MongoDB Server Connection Error."} + # else: + # print("MongoDB Server Connected.") + # # confirm oridosai db exist + # dblist = client.list_database_names() + # print(dblist) + # if self.db_name in dblist: + # print(f"The {self.db_name} database exists.") + + # # confirm apis collection exist + # oridosai_db = client[self.db_name] + # collist = oridosai_db.list_collection_names() + # if self.collection_name in collist: + # print(f"The {self.collection_name} collection exists.") + # user_col = oridosai_db[self.collection_name] + # return {"result": True, "message": user_col} + # else: + # print(f"The {self.collection_name} collection not exists.") + # return {"result": False ,"message": f"The {self.collection_name} collection not exists."} + # else: + # print(f"The {self.db_name} database does not exist.") + # # create the database + # client[self.db_name].create_collection(self.collection_name) + # print(f"The {self.db_name} database has been created with {self.collection_name} collection.") + + # # confirm apis collection exist + # oridosai_db = client[self.db_name] + # collist = oridosai_db.list_collection_names() + # if self.collection_name in collist: + # print(f"The {self.collection_name} collection exists.") + # user_col = oridosai_db[self.collection_name] + # return {"result": True, "message": user_col} + # else: + # print(f"The {self.collection_name} collection not exists.") + # return {"result": False ,"message": f"The {self.collection_name} collection not exists."} - # return {"result": True, "message": f"The {self.db_name} database has been created with {self.collection_name} collection."} + # # return {"result": True, "message": f"The {self.db_name} database has been created with {self.collection_name} collection."} def create_api(self, data:APIModel): # Connect to MongoDB diff --git a/src/test_all.py b/src/test_all.py index 81e0087..18895cb 100644 --- a/src/test_all.py +++ b/src/test_all.py @@ -1,4 +1,3 @@ -import os import time import pytest diff --git a/src/utils/chatting.py b/src/utils/chatting.py index ab758a4..de1827c 100644 --- a/src/utils/chatting.py +++ b/src/utils/chatting.py @@ -1,6 +1,5 @@ import gc from pathlib import Path -from urllib.parse import quote_plus from src.utils.read_json import read_json from src.chatting.ChattingClass import ChattingClass @@ -14,18 +13,8 @@ def chatting(args): # Payload payload_data = read_json(args['payload_dir']) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/src/utils/check_api_key.py b/src/utils/check_api_key.py index 543136a..17a1590 100644 --- a/src/utils/check_api_key.py +++ b/src/utils/check_api_key.py @@ -1,6 +1,5 @@ import gc from pathlib import Path -from urllib.parse import quote_plus from src.utils.read_json import read_json from src.mongodb.MongoDBClass import MongoDBClass @@ -14,18 +13,8 @@ def check_api_key(args): # Payload payload_data = read_json(args['payload_dir']) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/src/utils/create_api.py b/src/utils/create_api.py index 67b49a7..e49e77f 100644 --- a/src/utils/create_api.py +++ b/src/utils/create_api.py @@ -1,7 +1,6 @@ import gc from pathlib import Path from datetime import datetime -from urllib.parse import quote_plus from src.utils.read_json import read_json from src.mongodb.MongoDBClass import MongoDBClass @@ -16,18 +15,8 @@ def create_api_key(args): # Payload payload_data = read_json(args['payload_dir']) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/src/utils/delete_api_key.py b/src/utils/delete_api_key.py index 0509dc0..9472a9f 100644 --- a/src/utils/delete_api_key.py +++ b/src/utils/delete_api_key.py @@ -1,6 +1,5 @@ import gc from pathlib import Path -from urllib.parse import quote_plus from src.utils.read_json import read_json from src.mongodb.MongoDBClass import MongoDBClass @@ -13,18 +12,8 @@ def delete_api_key(args): # Payload payload_data = read_json(args['payload_dir']) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/src/utils/total_process.py b/src/utils/total_process.py index 284ef6f..478ff2c 100644 --- a/src/utils/total_process.py +++ b/src/utils/total_process.py @@ -2,9 +2,7 @@ import os import gc import time -import argparse from pathlib import Path -from urllib.parse import quote_plus import concurrent.futures from datetime import datetime import json @@ -24,18 +22,8 @@ def total_process(args): payload_data = read_json(args['payload_dir']) - # Your MongoDB Atlas connection details - mongodb_username = payload_data["mongodb_username"] - mongodb_password = payload_data["mongodb_password"] - mongodb_cluster_name = payload_data["mongodb_cluster_name"] - mongodb_database_name = payload_data["mongodb_database_name"] - - # Escape the mongodb_username and mongodb_password - mongodb_escaped_username = quote_plus(mongodb_username) - mongodb_escaped_password = quote_plus(mongodb_password) - # Construct the MongoDB Atlas URI - mongo_uri = f"mongodb+srv://{mongodb_escaped_username}:{mongodb_escaped_password}@{mongodb_cluster_name}.mongodb.net/{mongodb_database_name}" + mongo_uri = payload_data["mongo_uri"] # Call class instance mongodb = MongoDBClass( diff --git a/test/regression/regression_test003/payload/mongodb_payload.json b/test/regression/regression_test003/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test003/payload/mongodb_payload.json +++ b/test/regression/regression_test003/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test003/payload/payload.json b/test/regression/regression_test003/payload/payload.json index 889709c..67d4c7c 100644 --- a/test/regression/regression_test003/payload/payload.json +++ b/test/regression/regression_test003/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "ft:gpt-3.5-turbo-0613:personal::8Yk6D8wc", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test004/payload/mongodb_payload.json b/test/regression/regression_test004/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test004/payload/mongodb_payload.json +++ b/test/regression/regression_test004/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test004/payload/payload.json b/test/regression/regression_test004/payload/payload.json index 4109d88..cc0b157 100644 --- a/test/regression/regression_test004/payload/payload.json +++ b/test/regression/regression_test004/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "ft:gpt-3.5-turbo-0613:personal::8YkcUEuT", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test005/payload/mongodb_payload.json b/test/regression/regression_test005/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test005/payload/mongodb_payload.json +++ b/test/regression/regression_test005/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test005/payload/payload.json b/test/regression/regression_test005/payload/payload.json index 0708b72..1b99f86 100644 --- a/test/regression/regression_test005/payload/payload.json +++ b/test/regression/regression_test005/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "ft:gpt-3.5-turbo-0613:personal::8YkrFBD6", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test006/payload/mongodb_payload.json b/test/regression/regression_test006/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test006/payload/mongodb_payload.json +++ b/test/regression/regression_test006/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test006/payload/payload.json b/test/regression/regression_test006/payload/payload.json index b9526a5..d1a591a 100644 --- a/test/regression/regression_test006/payload/payload.json +++ b/test/regression/regression_test006/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "ft:gpt-3.5-turbo-0613:personal::8Yl91t6J", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test007/payload/mongodb_payload.json b/test/regression/regression_test007/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test007/payload/mongodb_payload.json +++ b/test/regression/regression_test007/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test007/payload/payload.json b/test/regression/regression_test007/payload/payload.json index c502f06..6441034 100644 --- a/test/regression/regression_test007/payload/payload.json +++ b/test/regression/regression_test007/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "ft:gpt-3.5-turbo-0613:personal::8Yh1901T", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test008/payload/mongodb_payload.json b/test/regression/regression_test008/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test008/payload/mongodb_payload.json +++ b/test/regression/regression_test008/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test008/payload/payload.json b/test/regression/regression_test008/payload/payload.json index f27d82e..e0a3655 100644 --- a/test/regression/regression_test008/payload/payload.json +++ b/test/regression/regression_test008/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "ft:gpt-3.5-turbo-0613:personal::8YlS9jjv", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test009/payload/mongodb_payload.json b/test/regression/regression_test009/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test009/payload/mongodb_payload.json +++ b/test/regression/regression_test009/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test009/payload/payload.json b/test/regression/regression_test009/payload/payload.json index 19f72ab..2d6b9a4 100644 --- a/test/regression/regression_test009/payload/payload.json +++ b/test/regression/regression_test009/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test010/payload/mongodb_payload.json b/test/regression/regression_test010/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test010/payload/mongodb_payload.json +++ b/test/regression/regression_test010/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test010/payload/payload.json b/test/regression/regression_test010/payload/payload.json index 7da5966..766f0e9 100644 --- a/test/regression/regression_test010/payload/payload.json +++ b/test/regression/regression_test010/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test011/payload/mongodb_payload.json b/test/regression/regression_test011/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test011/payload/mongodb_payload.json +++ b/test/regression/regression_test011/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test011/payload/payload.json b/test/regression/regression_test011/payload/payload.json index 1051617..776ca07 100644 --- a/test/regression/regression_test011/payload/payload.json +++ b/test/regression/regression_test011/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test012/payload/mongodb_payload.json b/test/regression/regression_test012/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test012/payload/mongodb_payload.json +++ b/test/regression/regression_test012/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test012/payload/payload.json b/test/regression/regression_test012/payload/payload.json index b48ecdc..4346006 100644 --- a/test/regression/regression_test012/payload/payload.json +++ b/test/regression/regression_test012/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file diff --git a/test/regression/regression_test013/payload/mongodb_payload.json b/test/regression/regression_test013/payload/mongodb_payload.json index 67a399d..dbae6ab 100644 --- a/test/regression/regression_test013/payload/mongodb_payload.json +++ b/test/regression/regression_test013/payload/mongodb_payload.json @@ -1,8 +1,5 @@ { - "mongodb_username": "mongodb_username", - "mongodb_password": "mongodb_password", - "mongodb_cluster_name": "mongodb_cluster_name", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } diff --git a/test/regression/regression_test013/payload/payload.json b/test/regression/regression_test013/payload/payload.json index 1bbd092..76e461a 100644 --- a/test/regression/regression_test013/payload/payload.json +++ b/test/regression/regression_test013/payload/payload.json @@ -17,10 +17,7 @@ "model_id": "ft:gpt-3.5-turbo-0613:personal::8ZmyxMfe", "temperature": 0.3, "max_retries": 5, - "mongodb_username": "scarlett1130", - "mongodb_password": "4zv2NnaSbKIWMRPv", - "mongodb_cluster_name": "cluster0.ill5gnu", - "mongodb_database_name": "", + "mongo_uri": null, "db_name": "oridosai", "collection_name": "apis" } \ No newline at end of file