modify users, use cf db

.gitignore

@@ -1,2 +1,3 @@
 __pycache__/
-.env
+.env
+.DS_Store

app.py

@@ -1,21 +1,32 @@
 # uvicorn app:app --host 0.0.0.0 --port 7860 --reload
 
+from pathlib import Path
+from global_state import set
+
+# 获取当前文件的父目录的绝对路径，即：project_root
+parent_dir = Path(__file__).resolve().parent
+set('project_root', parent_dir)
+
+print('\n\n\n======================')
+
 from fastapi import FastAPI, HTTPException, Response, Depends
+from fastapi.responses import HTMLResponse
 # from starlette.requests import Request
 
 from routers.webtools_v1 import router as webtools_router
 from routers.users_v1 import router as users_router
 from routers.openai_v1 import router as openai_router
 
-from db import Db
+# from db import Db
 
 from dotenv import load_dotenv
 import os
 
-
-# 加载.env文件
+print('\n\n\n======================')
+# 当在本地使用.env 文件时加载.env文件
 load_dotenv()
 
+# 获取环境变量，本地使用 load_dotenv 和 hf 里直接使用环境变量配置时，都可使用下面的语句 
 DB_PATH = os.getenv("DB_PATH")
 
 # 依赖注入，获取 DB_PATH
@@ -43,7 +54,7 @@ CREATE TABLE api_keys (
     dest_api_key TEXT NOT NULL
 );
 """
-    Db('api_keys.db').execute_query(sql)
+    # Db('api_keys.db').execute_query(sql)
 
 # def create_user_api_key(user_id, api_key, type, status, idx, dest_api_key):
 #     sql = f"""
@@ -53,7 +64,22 @@ CREATE TABLE api_keys (
 
 # create_user_api_key('i_am_tanbushi', 'llm', '1', '0', 'dest_api_key')
 
-@app.get("/cur_path")
-def cur_path():
+@app.get("/list_files")
+def list_files():
     # return "cur_path"
-    return {"cur_path": os.getcwd()}
+    directory = os.getcwd()
+
+    # 遍历目录树
+    retstr="第一行\n第二行\n第三行\n"
+    # retstr = retstr + '1' + "\n"
+    # retstr = retstr + '2' + "\n"
+    # retstr = retstr + '3' + "\n"
+    print(retstr)
+    # for dirpath, dirnames, filenames in os.walk(directory):
+    #     for filename in filenames:
+    #         retstr = retstr + os.path.join(dirpath, filename) +'\\n'
+    #         print(os.path.join(dirpath, filename))
+
+    return HTMLResponse(f"<pre>{retstr}</pre>")
+    return HTMLResponse(content=f"<pre>{retstr}</pre>", media_type="text/html")
+    return retstr

db.py

@@ -1,64 +0,0 @@
-import sqlite3
-import json
-
-class Db():
-    def __init__(self, db_path):
-        self.db_path = db_path
-        # print(self.db_path)
-
-    def list_query(self, query):
-        conn = sqlite3.connect(self.db_path)
-        cursor = conn.cursor()
-        cursor.execute(query)
-        conn.commit()
-
-        rows = cursor.fetchall()
-        # print('results')
-        # print(results)
-        cursor.close()
-        conn.close()
-
-        json_rows = []
-        # 为每一行结果创建一个字典，并添加到列表中
-        for row in rows:
-            # 使用cursor.description获取列名和相关信息
-            columns = dict(zip([col[0] for col in cursor.description], row))
-            json_rows.append(columns)
-
-        return json_rows
-    
-    def insert_query(self, query):
-        conn = sqlite3.connect(self.db_path)
-        cursor = conn.cursor()
-        cursor.execute(query)
-        conn.commit()
-        rowcount = cursor.rowcount
-        
-        return f"插入的行数: {rowcount}"
-    
-    def update_query(self, query):
-        conn = sqlite3.connect(self.db_path)
-        cursor = conn.cursor()
-        cursor.execute(query)
-        conn.commit()
-        rowcount = cursor.rowcount
-        
-        return f"影响的行数: {rowcount}"
-# from fastapi import FastAPI
-
-# # 依赖注入，获取 FastAPI 应用实例
-# def get_app() -> FastAPI:
-#     return FastAPI()
-
-# def execute_query(query):
-
-
-
-
-# CREATE TABLE api_keys (
-#     api_key TEXT NOT NULL,
-#     type TEXT NOT NULL,
-#     status INTEGER NOT NULL,
-#     idx INTEGER NOT NULL,
-#     PRIMARY KEY (api_key, type, status, idx)
-# );

db/cloudflare.py

@@ -0,0 +1,32 @@
+import requests, os
+from dotenv import load_dotenv
+
+class Cloudflare():
+    def __init__(self):
+        load_dotenv()
+        self.CF_ACCOOUNT_ID=os.getenv("CF_ACCOOUNT_ID")
+        self.DATABASE_ID=os.getenv("DATABASE_ID")
+        self.X_Auth_Key=os.getenv("X_Auth_Key")
+        self.X_Auth_Email=os.getenv("X_Auth_Email")
+
+        # print('Cloudflare init')
+        # print('self.CF_ACCOOUNT_ID',self.CF_ACCOOUNT_ID)
+        # print('self.DATABASE_ID',self.DATABASE_ID)
+        # print('self.X_Auth_Key',self.X_Auth_Key)
+        # print('self.X_Auth_Email',self.X_Auth_Email)
+   
+    def execute_query(self, query):
+        url = f"https://api.cloudflare.com/client/v4/accounts/{self.CF_ACCOOUNT_ID}/d1/database/{self.DATABASE_ID}/query"
+        headers = {
+            "X-Auth-Key": f"{self.X_Auth_Key}",
+            "X-Auth-Email": f"{self.X_Auth_Email}"
+        }
+        input = {
+            "params": [],
+            "sql": query
+        }
+        response = requests.post(url, headers=headers, json=input)
+        resp_json = response.json()
+        print(resp_json)
+        return resp_json
+    

db/tbs_db.py

@@ -0,0 +1,23 @@
+from  utils.load_module import load_module
+    
+class TbsDb():
+
+    def __init__(self, db_module_filename, class_name):
+        self.db_module = load_module(db_module_filename, class_name)
+
+    def get_list(self, query):
+        response = self.execute_query(query)
+        if response['success']==False:
+            return response
+        return response['result'][0]
+        # return self.execute_query(query)
+    
+    def add_item(self, query):
+        return self.execute_query(query)
+    
+    def get_item(self, query):
+        return self.execute_query(query)
+    
+    def execute_query(self, query):
+        return self.db_module.execute_query(query)
+        

global_state.py

@@ -0,0 +1,9 @@
+# global_state.py
+_state = {}
+
+def set(key, value):
+    _state[key] = value
+
+def get(key):
+    return _state.get(key)
+

routers/openai_v1.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Request, HTTPException
-from db import Db
+# from db import Db
 from dotenv import load_dotenv
 import os, json
 from langchain_core.output_parsers import StrOutputParser

routers/users_v1.py

@@ -1,48 +1,42 @@
-from fastapi import APIRouter, Request, FastAPI, Depends
-from dotenv import load_dotenv
-import os
+from fastapi import APIRouter
+from pydantic import BaseModel
 import uuid
-from db import Db
 
-router = APIRouter()
-
-# 加载.env文件
-load_dotenv()
+from global_state import get
+from db.tbs_db import TbsDb
 
-DB_PATH = os.getenv("DB_PATH")
+router = APIRouter()
 
-# 依赖注入，获取 DB_PATH
-def get_db_path():
-    return DB_PATH
+db_module_filename = f"{get('project_root')}/db/cloudflare.py"
 
 @router.get("/users")
-async def read_users(db_path: str = Depends(get_db_path)):
-    # print('\n\n\n\n\n')
-    # print(db_path)
-    result = Db(db_path).list_query("SELECT * FROM users")
-    return result
+async def read_users():
+    query = "SELECT * FROM users"
+    response = TbsDb(db_module_filename, "Cloudflare").get_list(query)
+    return response
+
+class User(BaseModel):
+    username: str
+    password: str
+    email: str
+    nikename: str = None
 
 @router.post("/users")
-async def create_user(request: Request, b_path: str = Depends(get_db_path)):
-    request_json = await request.json()
-    username = request_json.get('username')
-    password = request_json.get('password')
-    email = request_json.get('email')
-    nikename = request_json.get('nikename')
+async def create_user(user: User):
+    username = user.username
+    password = user.password
+    email = user.email
+    nikename = user.nikename
     if nikename==None:
         nikename = ''
-    # print(nikename)
+
     api_key = f'airs-{uuid.uuid4()}'
-    # result = api_key
-    # print(api_key)
-    result = Db(b_path).insert_query(f"INSERT INTO users (username, password, email, nikename, api_key) VALUES ('{username}', '{password}', '{email}', '{nikename}', '{api_key}')")
-    return result
+    query = f"INSERT INTO users (username, password, email, nikename, api_key) VALUES ('{username}', '{password}', '{email}', '{nikename}', '{api_key}')"
+    response = TbsDb(db_module_filename, "Cloudflare").add_item(query)
+    return response
 
 @router.get("/users/{id}")
-async def read_user(request: Request, id:int, db_path: str = Depends(get_db_path)):
-    result = Db(db_path).list_query(f"SELECT * FROM users where id={id}")
-    if len(result)>0:
-        return result[0]
-    else:
-        return None
-
+async def read_user(id:int):
+    query = f"SELECT * FROM users where id={id}"
+    response = TbsDb(db_module_filename, "Cloudflare").get_item(query)
+    return response

routers/webtools_v1.py

@@ -1,5 +1,5 @@
 from fastapi import FastAPI, APIRouter, Response, Depends
-# from captcha.image import ImageCaptcha
+from captcha.image import ImageCaptcha
 from io import BytesIO
 
 router = APIRouter()

sql.md

@@ -1,88 +0,0 @@
-当然，以下是完整的SQL语句，用于创建`api_names`、`api_keys`表，以及可选的`api_usage`表。这些表将支持存储API名称、API-KEY信息，并可选地记录API的使用情况。
-
-### SQL 创建表的语句
-
-```sql
--- 创建 users 表
-DROP TABLE IF EXISTS "users";
-CREATE TABLE "users" (
-  "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-  "username" TEXT NOT NULL,
-  "password" TEXT NOT NULL,
-  "email" TEXT NOT NULL,
-  "nikename" TEXT,
-  "created_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
-  "updated_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE ("username" ASC),
-  UNIQUE ("email" ASC)
-);
-
--- 创建api_groups表
-CREATE TABLE api_groups (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  group_name TEXT NOT NULL UNIQUE,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-
--- 创建api_names表
-CREATE TABLE api_names (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  api_name TEXT NOT NULL UNIQUE,
-  api_group_id INTEGER,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (api_group_id) REFERENCES api_groups(id) ON DELETE SET NULL
-);
-
--- 创建api_keys表
-CREATE TABLE api_keys (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  api_group_id INTEGER NOT NULL,
-  api_key TEXT NOT NULL,
-  category TEXT NOT NULL,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (api_group_id) REFERENCES api_groups(id) ON DELETE CASCADE
-);
-
--- 创建user_api_keys表
-CREATE TABLE user_api_keys (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  user_api_key TEXT NOT NULL,
-  user_id INTEGER,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-
--- 创建api_usage表（如果需要）
-CREATE TABLE api_usage (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  user_api_key_id INTEGER,
-  api_key_id INTEGER,
-  request_count INTEGER DEFAULT 0,
-  last_used DATETIME DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (user_api_key_id) REFERENCES user_api_keys(id),
-  FOREIGN KEY (api_key_id) REFERENCES api_keys(id)
-);
-```
-
-### 说明
-
-- **`api_names` 表**：存储唯一的API名称。
-- **`api_keys` 表**：存储每个API名称对应的多个API-KEY，包括分类信息。`api_names_id`作为外键，关联到`api_names`表。
-- **`user_api_keys` 表**：存储用户的API-KEY。
-- **`api_usage` 表**（可选）：记录API的使用情况，包括请求次数和最后使用时间。这个表可以用来监控API的使用情况，帮助管理API-KEY的使用限额。
-
-这些SQL语句假设你使用的是MySQL数据库。如果你使用的是其他类型的数据库（如PostgreSQL、SQLite等），可能需要对SQL语句进行适当的调整。如果有任何问题或需要进一步的帮助，请随时告诉我。
-
-
-
-### 通过 api_name 查询 api_key 的 SQL 语句
-```sql
-SELECT ak.api_key
-FROM api_keys ak
-JOIN api_groups ag ON ak.api_group_id = ag.id
-JOIN api_names an ON an.api_group_id = ag.id
-WHERE an.api_name = 'your_api_name';
-```

test_db.py

@@ -1,22 +0,0 @@
-# PC上数据库的位置为：/mnt/f/微云同步目录/1913864316/dev/projects/api-mapper
-
-from db import Db
-from dotenv import load_dotenv
-import os
-
-# 加载.env文件
-load_dotenv()
-
-db = Db(os.getenv("DB_PATH"))
-
-results = db.execute_query("""
-SELECT an.api_name, ak.api_key
-FROM api_keys ak
-JOIN api_groups ag ON ak.api_group_id = ag.id
-JOIN api_names an ON an.api_group_id = ag.id
-WHERE an.api_name = 'glm-4-flash';
-""")
-
-
-for row in results:
-    print(row)

test_mysql.py

@@ -1,24 +0,0 @@
-import mysql.connector
-
-# 配置数据库连接参数
-config = {
-    'user': 'tanbushi',       # 替换为你的MySQL用户名
-    'password': 'Tangeqin1968',   # 替换为你的MySQL密码
-    'host': 'db4free.net',          # 数据库主机地址，本地默认是localhost
-    'database': 'apimapper',   # 你要连接的数据库名
-    'raise_on_warnings': True
-}
-
-# 建立连接
-try:
-    cnx = mysql.connector.connect(**config)
-    print("Connection established")
-except mysql.connector.Error as err:
-    print("Error:", err)
-
-cursor = cnx.cursor()
-query = ("SELECT COUNT(*) FROM users")  # 替换为你的表名和查询
-cursor.execute(query)
-count = cursor.fetchone()[0]
-print(f"表中的记录数: {count}")
-cursor.close()

users.sql

@@ -1,41 +0,0 @@
-/*
- Navicat Premium Dump SQL
-
- Source Server         : api_keys
- Source Server Type    : SQLite
- Source Server Version : 3045000 (3.45.0)
- Source Schema         : main
-
- Target Server Type    : SQLite
- Target Server Version : 3045000 (3.45.0)
- File Encoding         : 65001
-
- Date: 03/11/2024 20:45:36
-*/
-
-PRAGMA foreign_keys = false;
-
--- ----------------------------
--- Table structure for users
--- ----------------------------
-DROP TABLE IF EXISTS "users";
-CREATE TABLE "users" (
-  "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-  "username" TEXT NOT NULL,
-  "password" TEXT NOT NULL,
-  "email" TEXT NOT NULL,
-  "nikename" TEXT,
-  "api_key" TEXT,
-  "config" TEXT,
-  "created_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
-  "updated_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE ("username" ASC),
-  UNIQUE ("email" ASC)
-);
-
--- ----------------------------
--- Auto increment value for users
--- ----------------------------
-UPDATE "sqlite_sequence" SET seq = 5 WHERE name = 'users';
-
-PRAGMA foreign_keys = true;

utils/load_module.py

@@ -0,0 +1,16 @@
+import importlib.util
+
+def load_module(module_filename, class_name):
+    # 使用 spec_from_file_location 获取模块规范
+    spec = importlib.util.spec_from_file_location("db_module", module_filename)
+    # 如果 spec 是 None，说明无法加载模块
+    if spec is None:
+        raise ImportError(f"Cannot find module at {module_filename}")
+    # 使用 module_from_spec 创建一个新的模块对象
+    module = importlib.util.module_from_spec(spec)
+    # 执行模块
+    spec.loader.exec_module(module)
+    MyClass = getattr(module, class_name, None)
+    if MyClass is None:
+        raise ImportError(f"Cannot find class '{class_name}' in module '{module_filename}'")
+    return MyClass()