MERGE development INTO master

Changelog.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.1.10
+### Added
+  - Updates HistoryController constructor to include a user_id as request alternative. (2023-12-30)
+
 ## 1.1.9
 ### Added
   - Had to update the PINECONE_KEY to PINECONE_API_KEY (2023-12-28)

promptengineers/fastapi/controllers/history.py

@@ -8,13 +8,14 @@
 class HistoryController(IController):
 	def __init__(
 		self,
+		user_id: str = None,
 		request = None,
 		user_repo: IUserRepo = None,
 		db_name: str = None,
 		col_name: str = None
 	):
 		self.request = request
-		self.user_id = getattr(request.state, "user_id", None)
+		self.user_id = user_id or getattr(request.state, "user_id", None)
 		self.user_repo = user_repo or UserRepo()
 		self.history_service = MongoService(
 			host=self.user_repo.find_token(self.user_id, 'MONGO_CONNECTION'),
@@ -36,8 +37,12 @@ async def index(self, page: int = 1, limit: int = 10):
 	##############################################################
 	### Create Chat History
 	##############################################################
-	async def create(self, body, keys: set[str] = {'setting', 'messages', 'tags', 'title'}):
-		body = await self.request.json()
+	async def create(
+			self, 
+			body, 
+			keys: set[str] = {'setting', 'messages', 'tags', 'title'}
+		):
+		body = await self.request.json() if self.request else body
 		body = dict((k, body[k]) for k in keys if k in body)
 		body['user_id'] = ObjectId(self.user_id)
 		if body.get('setting', False):
@@ -48,18 +53,22 @@ async def create(self, body, keys: set[str] = {'setting', 'messages', 'tags', 't
 	##############################################################
 	### Show Chat History
 	##############################################################
-	async def show(self, id: str):
+	async def show(self, id: str = None, query = None):
 		result = await self.history_service.read_one(
-			{'_id': ObjectId(id), 'user_id': ObjectId(self.user_id)}
+			query or {'_id': ObjectId(id), 'user_id': ObjectId(self.user_id)}
 		)
 		return result
 
-
 	##############################################################
 	### Update Chat History
 	##############################################################
-	async def update(self, id: str, body: any, keys: set[str] = {'setting', 'messages', 'tags', 'title'}):
-		body = await self.request.json()
+	async def update(
+			self, 
+			id: str, 
+			body: any, 
+			keys: set[str] = {'setting', 'messages', 'tags', 'title'}
+		):
+		body = await self.request.json() if self.request else body
 		body = dict((k, body[k]) for k in keys if k in body)
 		if body.get('setting', False):
 			body['setting'] = ObjectId(body['setting'])