Remove references to staging table in PostgresSearcher and PostgresModels

Author: chatrtham

src/fastapi_app/postgres_models.py

@@ -11,7 +11,7 @@ class Base(DeclarativeBase, MappedAsDataclass):
 
 
 class Package(Base):
-    __tablename__ = "packages_all_staging"
+    __tablename__ = "packages_all"
     package_name: Mapped[str] = mapped_column()
     package_picture: Mapped[str] = mapped_column()
     url: Mapped[str] = mapped_column(primary_key=True)
@@ -54,7 +54,7 @@ class Package(Base):
 
     def to_dict(self):
         return asdict(self)
-    
+
     def to_str_for_broad_rag(self):
         return f"""
     package_name: {self.package_name}

src/fastapi_app/postgres_searcher.py

@@ -31,7 +31,7 @@ async def simple_sql_search(self, filters: list[dict]) -> list[Package]:
         """
         filter_clause_where, _ = self.build_filter_clause(filters, use_or=True)
         sql = f"""
-        SELECT url FROM packages_all_staging
+        SELECT url FROM packages_all
         {filter_clause_where}
         LIMIT 10
         """

src/fastapi_app/seed_hd_data.py

@@ -41,13 +41,13 @@ def convert_to_str(value):
 
 
 async def seed_data(engine):
-    logger.info("Checking if the packages_all_staging table exists...")
+    logger.info("Checking if the packages_all table exists...")
     async with engine.begin() as conn:
         result = await conn.execute(
             text(
                 """
                 SELECT EXISTS 
-                (SELECT 1 FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'packages_all_staging')
+                (SELECT 1 FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'packages_all')
                 """  # noqa
             )
         )
@@ -102,7 +102,6 @@ async def seed_data(engine):
 
                 item_data = {key: value for key, value in record.items() if key in Package.__table__.columns}
 
-
                 for key, value in item_data.items():
                     if key not in [
                         "price",

src/frontend/src/components/Answer/Answer.tsx

@@ -37,7 +37,7 @@ export const Answer = ({
 
     return (
         <Stack className={`${styles.answerContainer} ${isSelected && styles.selected}`} verticalAlign="space-between">
-            <Stack.Package>
+            <Stack.Item>
                 <Stack horizontal horizontalAlign="space-between">
                     <AnswerIcon />
                     <div>
@@ -59,14 +59,14 @@ export const Answer = ({
                         />
                     </div>
                 </Stack>
-            </Stack.Package>
+            </Stack.Item>
 
-            <Stack.Package grow>
+            <Stack.Item grow>
                 <div className={styles.answerText} dangerouslySetInnerHTML={{ __html: sanitizedAnswerHtml }}></div>
-            </Stack.Package>
+            </Stack.Item>
 
             {!!parsedAnswer.citations.length && (
-                <Stack.Package>
+                <Stack.Item>
                     <Stack horizontal wrap tokens={{ childrenGap: 5 }}>
                         <span className={styles.citationLearnMore}>Citations:</span>
                         {parsedAnswer.citations.map((x, i) => {
@@ -77,11 +77,11 @@ export const Answer = ({
                             );
                         })}
                     </Stack>
-                </Stack.Package>
+                </Stack.Item>
             )}
 
             {!!followupQuestions?.length && showFollowupQuestions && onFollowupQuestionClicked && (
-                <Stack.Package>
+                <Stack.Item>
                     <Stack horizontal wrap className={`${!!parsedAnswer.citations.length ? styles.followupQuestionsList : ""}`} tokens={{ childrenGap: 6 }}>
                         <span className={styles.followupQuestionLearnMore}>Follow-up questions:</span>
                         {followupQuestions.map((x, i) => {
@@ -92,7 +92,7 @@ export const Answer = ({
                             );
                         })}
                     </Stack>
-                </Stack.Package>
+                </Stack.Item>
             )}
         </Stack>
     );

src/frontend/src/components/Answer/AnswerError.tsx

@@ -13,9 +13,9 @@ export const AnswerError = ({ error, onRetry }: Props) => {
         <Stack className={styles.answerContainer} verticalAlign="space-between">
             <ErrorCircle24Regular aria-hidden="true" aria-label="Error icon" primaryFill="red" />
 
-            <Stack.Package grow>
+            <Stack.Item grow>
                 <p className={styles.answerText}>{error}</p>
-            </Stack.Package>
+            </Stack.Item>
 
             <PrimaryButton className={styles.retryButton} onClick={onRetry} text="Retry" />
         </Stack>

src/frontend/src/components/Answer/AnswerLoading.tsx

@@ -14,12 +14,12 @@ export const AnswerLoading = () => {
         <animated.div style={{ ...animatedStyles }}>
             <Stack className={styles.answerContainer} verticalAlign="space-between">
                 <AnswerIcon />
-                <Stack.Package grow>
+                <Stack.Item grow>
                     <p className={styles.answerText}>
                         Generating answer
                         <span className={styles.loadingdots} />
                     </p>
-                </Stack.Package>
+                </Stack.Item>
             </Stack>
         </animated.div>
     );

src/frontend/src/components/SupportingContent/SupportingContentParser.ts

@@ -5,10 +5,10 @@ type ParsedSupportingContentItem = {
     content: string;
 };
 
-export function parseSupportingContentItem(package: string): ParsedSupportingContentItem {
-    // Assumes the package starts with the file name followed by : and the content.
+export function parseSupportingContentItem(item: string): ParsedSupportingContentItem {
+    // Assumes the item starts with the file name followed by : and the content.
     // Example: "sdp_corporate.pdf: this is the content that follows".
-    const parts = package.split(": ");
+    const parts = item.split(": ");
     const title = parts[0];
     const content = DOMPurify.sanitize(parts.slice(1).join(": "));
 

src/requirements.txt

@@ -24,7 +24,7 @@ email_validator==2.1.1
 environs==11.0.0
 fastapi==0.111.0
 fastapi-cli==0.0.4
--e git+https://github.com/chatrtham/rag-postgres-openai-python.git@c63d4e04d0043c99fc0eafd55a2116f2f4e36b5a#egg=fastapi_app&subdirectory=src
+-e git+https://github.com/chatrtham/rag-postgres-openai-python.git@7f1578f2d48381331570f68cc13167c3290ee097#egg=fastapi_app&subdirectory=src
 filelock==3.14.0
 fixedint==0.1.6
 frozenlist==1.4.1