generated movie on gallery

Author: bmoussaud

src/azurerambi/app.py

@@ -198,6 +198,7 @@ def movie_generate():
                 generated_movie['id'] = f"{genre_index}_{movie1_id}_{movie2_id}_{random.randint(10000, 99999)}"
 
             logger.info("Generated movie: %s", json.dumps(generated_movie, indent=2))
+            
         except requests.RequestException as e:
             logger.error("Error in calling movie_generate service: %s", e)
             generated_movie = {

src/azurerambi/dump_logs.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# This script dumps the logs from the movie_gallery_svc container app
+# Usage: ./dump_logs.sh
+# Ensure you have the Azure CLI installed and logged in
+set -ex
+CONTAINERAPPS_ENVIRONMENT="azure-rambi"
+RESOURCE_GROUP="rg-dev-rambi"
+LOG_ANALYTICS_WORKSPACE_CLIENT_ID=$(az containerapp env show --name $CONTAINERAPPS_ENVIRONMENT --resource-group $RESOURCE_GROUP --query properties.appLogsConfiguration.logAnalyticsConfiguration.customerId --out tsv)
+ az monitor log-analytics query   --workspace $LOG_ANALYTICS_WORKSPACE_CLIENT_ID \
+  --analytics-query "ContainerAppConsoleLogs_CL | where ContainerAppName_s == 'gui-svc'  | project ContainerAppName_s, Log_s, TimeGenerated | sort by TimeGenerated | take  30" \
+  --out json > logs.json
+cat logs.json | jq

src/movie_gallery_svc/entities.py

@@ -1,45 +1,66 @@
 import json
-import uuid
-import logging
-from typing import List
+from typing import Optional
 from pydantic import BaseModel
 
 class MovieRequest(BaseModel):
     """Request model for adding a new movie."""
     title: str
     description: str
 
-class Movie(dict):
-    """Movie model for storing movie details."""
-    def __init__(self, movie_id : str, title : str, description : str):
-        dict.__init__(self, movie_id=movie_id, title=title, description=description)
-   
-    def __repr__(self):
-        return f"MovieGallery(movie_id={self['movie_id']}, title={self['title']}, description={self['description']})"
-
-    def getattr(self, key):
-        """Get attribute value by key."""
-        if key not in self:
-            raise KeyError(f"Key '{key}' not found in Movie.")
-        return self[key]
-
-    def setattr(self, key, value):
-        """Set attribute value by key."""
-        if key not in self:
-            raise KeyError(f"Key '{key}' not found in Movie.")
-        if not isinstance(value, str):
-            raise TypeError(f"Value for '{key}' must be a string.")
-        self[key] = value
-
-    def __str__(self):
-        return f"Movie(movie_id={self['movie_id']}, title={self['title']}, description={self['description']})"
+class Movie(BaseModel):
+    """Enhanced Movie model with all required fields"""
+    id: str
+    title: str
+    plot: str
+    poster_url: Optional[str] = None
+    poster_description: Optional[str] = None
+
+    def to_dict(self) -> dict:
+        """Convert Movie instance to dictionary"""
+        return self.model_dump()
+
+    @classmethod
+    def from_dict(cls, data: dict) -> 'Movie':
+        """Create Movie instance from dictionary"""
+        return cls(**data)
+
+    def __str__(self) -> str:
+        """Return a string representation of the Movie instance"""
+        return f"Movie(id={self.id}, title={self.title}, plot={self.plot}, poster_url={self.poster_url}, poster_description={self.poster_description})"
+
+class MoviePayload(BaseModel):
+    """Data class for movie generation payload"""
+    movie1: Movie
+    movie2: Movie
+    genre: str
+
+    def __repr__(self) -> str:
+        """Return a string representation of the MoviePayload instance"""
+        return f"MoviePayload(movie1={self.movie1}, movie2={self.movie2}, genre={self.genre})"
+    
+
+class GeneratedMovie(Movie):
+    """Model for generated movie data extending the base Movie class"""
+    prompt: str
+    payload: MoviePayload
+
+    class Config:
+        """Pydantic model configuration"""
+        json_encoders = {
+            # Add custom encoders if needed
+        }
+
+    @classmethod
+    def from_json(cls, json_str: str) -> 'GeneratedMovie':
+        """Create a GeneratedMovie instance from a JSON string"""
+        data = json.loads(json_str)
+        return cls(**data)
+
+    def to_json(self) -> str:
+        """Convert the GeneratedMovie instance to a JSON string"""
+        return self.model_dump_json()
+    
+    def __str__(self) -> str:
+        """Return a string representation of the GeneratedMovie instance"""
+        return f"GeneratedMovie(id={self.id}, title={self.title}, plot={self.plot}, poster_url={self.poster_url}, poster_description={self.poster_description}, payload={self.payload})"
 
-    @staticmethod
-    def from_bytes(json_bytes : bytes) -> 'Movie':
-        """Convert bytes to Movie object."""
-        item = json.loads(json_bytes.decode('utf-8'))
-        return Movie(
-            item["movie_id"],
-            item["title"],
-            item["description"]
-        )

src/movie_gallery_svc/main.py

@@ -3,15 +3,16 @@
 import json
 import logging
 import uvicorn
+import traceback
 
 from store import MovieStore
-from entities import MovieRequest, Movie
+from entities import GeneratedMovie, MovieRequest, Movie
 
 from fastapi import FastAPI, Response, status
 from fastapi.responses import HTMLResponse
 from dapr.clients import DaprClient
 from dapr.ext.fastapi import DaprApp
-import traceback
+
 
 logging.basicConfig(level=logging.INFO)
 
@@ -38,33 +39,55 @@ def root():
     """
 
 @app.post("/movies", status_code = status.HTTP_201_CREATED)
-def add_movie(movie: MovieRequest):
+def add_movie(movie: GeneratedMovie) -> GeneratedMovie:
     """Endpoint to add a new movie."""
     try:
-        logging.info("Adding new movie")
+        logging.info("Adding new movie %s", movie)
         store=MovieStore(DaprClient())
-        movie=Movie(
-            uuid.uuid4().hex,
-            movie.title,
-            movie.description)
-        logging.info("Saving new movie %s", movie)
-        new_request=store.upsert(movie)
-        return Response(content = json.dumps(new_request), media_type = "application/json")
+        inserted_generated_movie=store.upsert(movie)
+        return inserted_generated_movie
     except Exception as e:
         logging.error('Add_Movie Error: %s', e)
         logging.error('Call stack: %s', traceback.format_exc())
         return Response(content = json.dumps({'method':'add_movie','error':e}), media_type = "application/json")
 
-@app.get("/movies")
-def list_movies():
+@app.get("/movies/{movie_id}", response_model=GeneratedMovie)
+def get_movie(movie_id: str) -> GeneratedMovie:
+    """Endpoint to get a movie by ID."""
+    logging.info("Getting movie with ID: %s", movie_id)
+    try:
+        store = MovieStore(DaprClient())
+        movie = store.try_find_by_id(movie_id)
+        if movie:
+            return movie
+        else:
+            return Response(content=json.dumps({}), media_type="application/json", status_code=status.HTTP_404_NOT_FOUND)
+    except Exception as e:
+        logging.error('Get_Movie Error: %s', e)
+        logging.error('Call stack: %s', traceback.format_exc())
+        return Response(content=json.dumps({'method':'get_movie','error':e}), media_type="application/json")
+    
+
+@app.get("/movies", response_model=list[GeneratedMovie])
+def list_movies() -> list[GeneratedMovie]:
     """Endpoint to list all movies."""
     logging.info("Listing all movies")
     try:
         logging.info('initializing Dapr client')
         dapr_client = DaprClient()
         logging.info('initializing MovieStore')
         movies = MovieStore(dapr_client).find_all()
-        return Response(content=json.dumps(movies), media_type="application/json")
+        # remove prompt from the movie
+        for movie in movies:
+            if isinstance(movie, GeneratedMovie):
+                movie.prompt = None
+                #movie.payload = None
+        # convert to JSON
+        d_movies = [movie.to_json() for movie in movies]
+        logging.info('Movies JSON: %s', d_movies)
+        # return as JSON
+        logging.info('Returning movies as JSON')
+        return movies
     except Exception as e:
         logging.error('RuntimeError: %s', e)
         return Response(content=json.dumps([]), media_type="application/json", status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)

src/movie_gallery_svc/sample.json

@@ -0,0 +1,25 @@
+{
+    "id": "629_346698_Animation_76281",
+    "title": "The Usual Barbies",
+    "plot": "In the enchanting realm of Barbie Land, a close-knit group of Barbie friends—each with their own unique talents and personalities—embarks on a charming adventure to solve the mystery of the missing glitter that keeps their world vibrant. When the colors of their beloved Dreamhouse start to fade, the usual suspects band together to uncover the source of the dimming magic. Along their journey, they encounter playful puzzles, make new friends, and discover that teamwork and creativity are the keys to restoring their colorful paradise. As they navigate through whimsical landscapes, the Barbies learn valuable lessons about trust, perseverance, and the beauty of embracing each other's differences, ultimately bringing back the sparkle that makes their world shine.",
+    "poster_url": null,
+    "poster_description": "The poster showcases a lively lineup of five animated characters standing side by side against a backdrop of a bright, colorful sky filled with whimsical clouds and shimmering stars. Each Barbie is dressed in distinct, vibrant outfits that highlight their unique personalities and styles. Behind them stretches a fantastical cityscape with sparkling buildings and lush gardens, hinting at the magical world they inhabit. The characters are smiling and exuding a sense of camaraderie and excitement, ready for their adventure. The overall design is playful and enchanting, with a harmonious blend of pinks, blues, and yellows that create an inviting and magical atmosphere, perfectly capturing the spirit of their quest and the joyful essence of Barbie Land.",
+    "prompt": "### Movie 1\n\n* Title: The Usual Suspects\n* Plot: Held in an L.A. interrogation room, Verbal Kint attempts to convince the feds that a mythic crime lord, Keyser Soze, not only exists, but was also responsible for drawing him and his four partners into a multi-million dollar heist that ended with an explosion in San Pedro harbor – leaving few survivors. Verbal lures his interrogators with an incredible story of the crime lord's almost supernatural prowess.\n* Poster description: \"The poster for \\\"The Usual Suspects\\\" features five men standing in a lineup, against a background that resembles a police height chart. Each person is dressed in a different style, reflecting varied personalities. The height chart behind them lists measurements from 3'0\\\" to 6'6\\\". Beneath the lineup, in bold red lettering stamped across a black background, is the title \\\"THE USUAL SUSPECTS,\\\" designed to resemble a stamp, suggesting themes of crime and investigation. The overall design evokes a sense of mystery and intrigue, central to the film's narrative.\"\n\n### Movie 2\n\n* Title: Barbie\n* Plot: Barbie and Ken are having the time of their lives in the colorful and seemingly perfect world of Barbie Land. However, when they get a chance to go to the real world, they soon discover the joys and perils of living among humans.\n* Poster description: \"The 'Barbie' movie poster features vibrant colors and a playful design. It showcases a bright blue sky as the background, setting a cheerful and sunny mood. At the top of the poster, the word \\\"Barbie\\\" is prominently displayed in large, bold, white script against a vivid pink backdrop, which draws immediate attention and hints at the iconic brand. Below, a vintage-style pink convertible is shown, capturing the quintessentially glamorous and fun essence of Barbie. The vehicle is detailed with sleek white accents, complementing its classic and stylish appearance. Two figures are seated in the convertible, exuding a sense of excitement and adventure. The figure on the left is dressed in a pink checkered outfit and accessorizes with white sunglasses and a pearl necklace and bracelet, adding to the classic Barbie aesthetic. The figure on the right wears an open-collared, pink and green striped shirt, linked to the casual and lively spirit of summer fun. The overall composition of the poster emphasizes color and style, capturing the whimsical and fashionable world associated with Barbie.\"\n\n### Additional Information\n\n* Target Genre: Animation \n\n\n\n",
+    "payload": {
+        "movie1": {
+            "id": "629",
+            "title": "The Usual Suspects",
+            "plot": "Held in an L.A. interrogation room, Verbal Kint attempts to convince the feds that a mythic crime lord, Keyser Soze, not only exists, but was also responsible for drawing him and his four partners into a multi-million dollar heist that ended with an explosion in San Pedro harbor – leaving few survivors. Verbal lures his interrogators with an incredible story of the crime lord's almost supernatural prowess.",
+            "poster_url": "https://image.tmdb.org/t/p/original//rWbsxdwF9qQzpTPCLmDfVnVqTK1.jpg",
+            "poster_description": "\"The poster for \\\"The Usual Suspects\\\" features five men standing in a lineup, against a background that resembles a police height chart. Each person is dressed in a different style, reflecting varied personalities. The height chart behind them lists measurements from 3'0\\\" to 6'6\\\". Beneath the lineup, in bold red lettering stamped across a black background, is the title \\\"THE USUAL SUSPECTS,\\\" designed to resemble a stamp, suggesting themes of crime and investigation. The overall design evokes a sense of mystery and intrigue, central to the film's narrative.\""
+        },
+        "movie2": {
+            "id": "346698",
+            "title": "Barbie",
+            "plot": "Barbie and Ken are having the time of their lives in the colorful and seemingly perfect world of Barbie Land. However, when they get a chance to go to the real world, they soon discover the joys and perils of living among humans.",
+            "poster_url": "https://image.tmdb.org/t/p/original//iuFNMS8U5cb6xfzi51Dbkovj7vM.jpg",
+            "poster_description": "\"The 'Barbie' movie poster features vibrant colors and a playful design. It showcases a bright blue sky as the background, setting a cheerful and sunny mood. At the top of the poster, the word \\\"Barbie\\\" is prominently displayed in large, bold, white script against a vivid pink backdrop, which draws immediate attention and hints at the iconic brand. Below, a vintage-style pink convertible is shown, capturing the quintessentially glamorous and fun essence of Barbie. The vehicle is detailed with sleek white accents, complementing its classic and stylish appearance. Two figures are seated in the convertible, exuding a sense of excitement and adventure. The figure on the left is dressed in a pink checkered outfit and accessorizes with white sunglasses and a pearl necklace and bracelet, adding to the classic Barbie aesthetic. The figure on the right wears an open-collared, pink and green striped shirt, linked to the casual and lively spirit of summer fun. The overall composition of the poster emphasizes color and style, capturing the whimsical and fashionable world associated with Barbie.\""
+        },
+        "genre": "Animation"
+    }
+}

src/movie_gallery_svc/store.py

@@ -2,7 +2,7 @@
 import logging
 import json
 import traceback
-from entities import Movie
+from entities import GeneratedMovie, Movie
 from dapr.clients import DaprClient
 
 logging.basicConfig(level=logging.INFO)
@@ -14,18 +14,19 @@ def __init__(self, dapr_client : DaprClient):
         self.dapr_client = dapr_client
         self.state_store_name = 'movie-gallery-svc-statetore'
 
-    def upsert(self, movie: Movie) -> Movie:
+    def upsert(self, movie: GeneratedMovie) -> GeneratedMovie:
         """Add a movie to the store."""
         logging.info("Adding movie: %s", movie)
-        logging.info("JSON %s", json.dumps(movie))
-        logging.info("saving movie to store %s using this key %s", self.state_store_name, movie['movie_id'])
+        logging.info("JSON %s", movie.to_json())
+        movie_id = movie.id
+        logging.info("Saving movie to store %s using this key %s", self.state_store_name, movie_id)
         self.dapr_client.save_state(
             store_name=self.state_store_name,
-            key=movie['movie_id'],
-            value=json.dumps(movie)
+            key=movie_id,
+            value=movie.to_json()
         )
-        logging.info("Movie %s added to store", movie['movie_id'])
-        return self.try_find_by_id(movie['movie_id'])
+        logging.info("Movie %s added to store", movie_id)
+        return self.try_find_by_id(movie_id)
 
     def try_find_by_id(self, movie_id : str) -> Movie:
         """Find a movie by its ID."""
@@ -36,7 +37,8 @@ def try_find_by_id(self, movie_id : str) -> Movie:
                 key=movie_id
             )
             if response.data:
-                movie = Movie.from_bytes(response.data)
+                logging.info("Movie found in store data: %s", response.data)
+                movie = GeneratedMovie.from_json(response.data)
                 logging.info("Movie found: %s", movie)
                 return movie
             else:
@@ -69,8 +71,8 @@ def find_all(self) -> list[Movie]:
                     query=query,
                     states_metadata=states_metadata
                 )
-            movies = [Movie.from_bytes(item.value) for item in response.results]
-            logging.info("Movies found: %s", movies)
+            movies = [GeneratedMovie.from_json(item.value) for item in response.results]
+            logging.info("GeneratedMovies found: %d", len(movies))
             return movies
         except Exception as e:
             logging.error("Error finding all movies: %s", e)

src/movie_generator_svc/main.py

@@ -88,6 +88,7 @@ class GenAIMovie(Movie):
     prompt: str = None
     payload: MoviePayload = None
 
+
 class GenAiMovieService:
     """ Class to manage the access to OpenAI API to generate a new movie """
 
@@ -204,6 +205,7 @@ def generate_movie(self, movie1: Movie, movie2: Movie, genre: str) -> GenAIMovie
         generated_movie.poster_url = None
         generated_movie.payload = MoviePayload(movie1=movie1, movie2=movie2, genre=genre)
         generated_movie.id = f"{movie1.id}_{movie2.id}_{genre}_{random.randint(10000, 99999)}"
+       
         logger.info("Generated movie: %s", generated_movie)
         return generated_movie