refinements and multiple platform

Dockerfile

@@ -15,6 +15,7 @@ RUN useradd -m -u 1000 user
 # Switch to the "user" user
 USER user
 
+
 # Set the working directory in the container
 WORKDIR /app
 

app/app.py

@@ -36,7 +36,7 @@ async def rerank_items(input_data: Input) -> Output:
     # who is the user?
     user = input_data.session.user_id
     date = input_data.session.current_time
-    platform = input_data.session.platform
+    platform = input_data.session.platform.value
     items = input_data.items
     # TODO consider sampling them?
 
@@ -51,6 +51,7 @@ async def rerank_items(input_data: Input) -> Output:
     # if user already exists -> has boosting records
     if user_in_db:
         # has been boosted today?
+        print(user_in_db)
         if user_in_db.is_boosted_today():
             # return only reranked items, no insertion
             return Output(reranked_ids=reranked_ids, new_items=[])
@@ -79,14 +80,11 @@ async def rerank_items(input_data: Input) -> Output:
     
     # user doesn't exist
     else:
-        print(first_topic)
-        print(platform)
         if first_topic != "non-civic":
             fetched_boost = boost_db.get_random_boost(topic=first_topic,
                                                     platform=platform,
                                                     blacklist_ids=[])
-            print(fetched_boost)
-            print(type(fetched_boost))
+
             user_db.add_user(user_id=user, 
                              user=User(user_id=user, last_boost=date, boosts=[fetched_boost]))
             

app/modules/database.py

@@ -60,14 +60,14 @@ class User:
         self.boosts.append(boost)
 
     def is_boosted_today(self):
-        self.is_boosted_today = compare_date_with_today(self.last_boost)
+        return compare_date_with_today(self.last_boost)
 
     def update_boosted_today(self, status):
         """Update the boosted_today status."""
         self.boosted_today = status
 
-    def __repr__(self):
-        return f"User(boosts={self.boosts}, boosted_today={self.boosted_today})"
+    #def __repr__(self):
+    #    return f"User(boosts={self.boosts}, boosted_today={self.boosted_today})"
 
 class UserDatabase:
     def __init__(self):

app/modules/models/api.py

@@ -2,6 +2,13 @@
 from pydantic import BaseModel, Field
 from typing import List, Optional
 from uuid import UUID
+from datetime import datetime
+from typing import Literal, Optional, Union
+
+from pydantic import BaseModel, Field, HttpUrl
+from pydantic.types import NonNegativeInt
+from enum import Enum
+
 
 
 class Engagement(BaseModel):
@@ -11,21 +18,27 @@ class Engagement(BaseModel):
     award: int
 
 class Item(BaseModel):
-    id: UUID
-    post_id: Optional[UUID] = None
-    parent_id: Optional[UUID] = None
-    title: Optional[str] = None
-    text: Optional[str] = None
-    author_name_hash: str
-    type: str
-    created_at: str
-    engagements: Engagement
+    id: UUID = Field(..., example=UUID("3fa85f64-5717-4562-b3fc-2c963f66afa6"))
+    #post_id: Optional[UUID] = None
+    #parent_id: Optional[UUID] = None
+    #title: Optional[str] = None
+    text: str = Field(..., example="I never liked politicians anyway, they don't care much about citizens")
+    #author_name_hash: str
+    #type: str
+    #created_at: str
+    #engagements: Engagement
+
+class Platform(Enum):
+    TWITTER = "twitter"
+    FACEBOOK = "facebook"
+    REDDIT = "reddit"
 
 class Session(BaseModel):
-    user_id: UUID
+    user_id: UUID = Field(..., example=UUID("4fa85f64-5717-4562-b3fc-2c963f66afd6"))
     user_name_hash: str
-    platform: str
-    current_time: str
+    platform: Platform = Field(..., example=Platform.TWITTER)
+    current_time: datetime = Field(..., example="2024-04-09T19:29:38.072017Z")
+
 
 class Input(BaseModel):
     session: Session
@@ -38,3 +51,114 @@ class NewItem(BaseModel):
 class Output(BaseModel):
     ranked_ids: List[UUID]
     new_items: List[Optional[NewItem]]
+
+
+class TwitterEngagements(BaseModel):
+    """Engagement counts from Twitter"""
+
+    retweet: NonNegativeInt
+    like: NonNegativeInt
+    comment: NonNegativeInt
+    share: NonNegativeInt
+
+
+class RedditEngagements(BaseModel):
+    """Engagement counts from Reddit"""
+
+    upvote: NonNegativeInt
+    downvote: NonNegativeInt
+    comment: NonNegativeInt
+    award: NonNegativeInt
+
+
+class FacebookEngagements(BaseModel):
+    """Engagement counts from Facebook"""
+
+    like: NonNegativeInt
+    love: NonNegativeInt
+    care: NonNegativeInt
+    haha: NonNegativeInt
+    wow: NonNegativeInt
+    sad: NonNegativeInt
+    angry: NonNegativeInt
+    comment: NonNegativeInt
+    share: NonNegativeInt
+
+
+class ContentItem(BaseModel):
+    """A content item to be ranked"""
+
+    id: str = Field(
+        description="A unique ID describing a specific piece of content. We will do our best to make an ID for a given item persist between requests, but that property is not guaranteed."
+    )
+
+    post_id: Optional[str] = Field(
+        description="The ID of the post to which this comment belongs. Useful for linking comments to their post when comments are shown in a feed. Currently this UX only exists on Facebook.",
+        default=None,
+    )
+
+    parent_id: Optional[str] = Field(
+        description="For threaded comments, this identifies the comment to which this one is a reply. Blank for top-level comments.",
+        default=None,
+    )
+
+    title: Optional[str] = Field(
+        description="The post title, only available on reddit posts.", default=None
+    )
+
+    text: str = Field(
+        description="The text of the content item. Assume UTF-8, and that leading and trailing whitespace have been trimmed."
+    )
+
+    author_name_hash: str = Field(
+        description="A hash of the author's name (salted). Use this to determine which posts are by the same author. When the post is by the current user, this should match `session.user_name_hash`."
+    )
+
+    type: Literal["post", "comment"] = Field(
+        description="Whether the content item is a `post` or `comment`. On Twitter, tweets will be identified as `comment` when they are replies displayed on the page for a single tweet."
+    )
+
+    embedded_urls: Optional[list[HttpUrl]] = Field(
+        description="A list of URLs that are embedded in the content item. This could be links to images, videos, or other content. They may or may not also appear in the text of the item."
+    )
+
+    created_at: datetime = Field(
+        description="The time that the item was created in UTC, in `YYYY-MM-DD hh:mm:ss` format, at the highest resolution available (which may be as low as the hour)."
+    )
+
+    engagements: Union[TwitterEngagements, RedditEngagements, FacebookEngagements] = (
+        Field(description="Engagement counts for the content item.")
+    )
+
+
+class Session(BaseModel):
+    """Data that is scoped to the user's browsing session (generally a single page view)"""
+
+    user_id: str = Field(
+        description="A unique id for this study participant. Will remain fixed for the duration of the experiment."
+    )
+    user_name_hash: str = Field(
+        description="A (salted) hash of the user's username. We'll do our best to make it match the `item.author_name_hash` on posts authored by the current user."
+    )
+    cohort: str = Field(
+        description="The cohort to which the user has been assigned. You can safely ignore this. It is used by the PRC request router."
+    )
+    platform: Literal["twitter", "reddit", "facebook"] = Field(
+        description="The platform on which the user is viewing content."
+    )
+    current_time: datetime = Field(
+        description="The current time according to the user's browser, in UTC, in `YYYY-MM-DD hh:mm:ss` format."
+    )
+
+
+class RankingRequest(BaseModel):
+    """A complete ranking request"""
+
+    session: Session = Field(
+        description="Data that is scoped to the user's browsing session"
+    )
+    #survey: Optional[SurveyResponse] = Field(
+    #    description="Responses to PRC survey. Added by the request router.",
+    #    default=None,
+    #)
+    items: list[ContentItem] = Field(description="The content items to be ranked.")

app/modules/utils.py

@@ -10,15 +10,16 @@ def load_csv_to_dict(filename):
         data_list = list(dict_reader)
     return data_list
 
-def get_stringified_date(date):
-    """
-    Gets a date like 2024-04-09T19:29:38.072017Z and returns the day
-    """
-    return str(datetime.strptime(date, "%Y-%m-%dT%H:%M:%S.%fZ").date())
+#def get_stringified_date(date):
+#    """
+#    Gets a date like 2024-04-09T19:29:38.072017Z and returns the day
+#    """
+#    return str(datetime.strptime(date, "%Y-%m-%dT%H:%M:%S.%fZ").date())
 
-def compare_date_with_today(date_str):
+def compare_date_with_today(input_date:datetime):
     # Parse the input date string
-    input_date = datetime.strptime(date_str, "%Y-%m-%dT%H:%M:%S.%fZ")
+    
+    #input_date = datetime.strptime(date_str, "%Y-%m-%dT%H:%M:%S.%fZ")
 
     # Get today's date (without time component)
     today_date = datetime.now().date()