media-tagging 1.2.0.dev2__tar.gz → 1.2.0.dev4__tar.gz

{media_tagging-1.2.0.dev2 → media_tagging-1.2.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-tagging
-Version: 1.2.0.dev2
+Version: 1.2.0.dev4
 Summary: Performs tagging of image and videos based on various taggers
 Author-email: "Google Inc. (gTech gPS CSE team)" <no-reply@google.com>
 License: Apache 2.0
@@ -23,20 +23,18 @@ Requires-Dist: pandas
 Requires-Dist: pydantic
 Requires-Dist: SQLalchemy>=2.0.0
 Requires-Dist: tenacity
-Requires-Dist: pandas
+Requires-Dist: google-genai==1.13.0
 Provides-Extra: google-cloud-vision
 Requires-Dist: google-cloud-vision==3.9.0; extra == "google-cloud-vision"
 Provides-Extra: google-cloud-videointelligence
 Requires-Dist: google-cloud-videointelligence==2.15.0; extra == "google-cloud-videointelligence"
 Provides-Extra: google-cloud
 Requires-Dist: media-tagging[google-cloud-videointelligence,google-cloud-vision]; extra == "google-cloud"
-Provides-Extra: gemini
-Requires-Dist: google-genai==1.13.0; extra == "gemini"
 Provides-Extra: server
 Requires-Dist: fastapi==0.111.0; extra == "server"
 Requires-Dist: pydantic-settings; extra == "server"
 Provides-Extra: all
-Requires-Dist: media-tagging[gemini,google-cloud,server]; extra == "all"
+Requires-Dist: media-tagging[google-cloud,server]; extra == "all"
 Dynamic: license-file
 
 # Media Tagger

{media_tagging-1.2.0.dev2 → media_tagging-1.2.0.dev4}/media_tagging/__init__.py

@@ -14,15 +14,17 @@
 
 # pylint: disable=C0330, g-bad-import-order, g-multiple-import
 
-"""Simplifies imports from inner modules."""
+"""Media tagging perform tagging and description operation of various media."""
 
 from media_tagging.media_tagging_service import (
   MediaTaggingRequest,
+  MediaTaggingResponse,
   MediaTaggingService,
 )
 
 __all__ = [
   'MediaTaggingService',
   'MediaTaggingRequest',
+  'MediaTaggingResponse',
 ]
-__version__ = '1.2.0.dev2'
+__version__ = '1.2.0.dev4'

{media_tagging-1.2.0.dev2 → media_tagging-1.2.0.dev4}/media_tagging/media_tagging_service.py

@@ -34,6 +34,16 @@ logger = logging.getLogger('media-tagger')
 
 
 class MediaTaggingRequest(pydantic.BaseModel):
+  """Contains parameters to perform media tagging.
+
+  Attributes:
+    tagger_type: Tagger to be used.
+    media_type: Type of media to tag.
+    media_paths: Paths or URLs where media are located.
+    tagging_options: Tagging specific parameters.
+    parallel_threshold: Maximum number of parallel tagging operations.
+  """
+
   model_config = pydantic.ConfigDict(extra='ignore')
 
   tagger_type: Literal['google-cloud', 'gemini']
@@ -79,6 +89,16 @@ class MediaFetchingRequest(pydantic.BaseModel):
   tagger_type: str = 'loader'
 
 
+class MediaTaggingResponse(pydantic.BaseModel):
+  results: list[tagging_result.TaggingResult]
+
+  def to_garf_report(self):
+    return tagging_result.to_garf_report(self.results)
+
+  def to_pandas(self):
+    return tagging_result.to_pandas(self.results)
+
+
 def discover_taggers(
   existing_taggers: Sequence[str],
 ) -> dict[str, base_tagger.BaseTagger]:
@@ -129,7 +149,7 @@ class MediaTaggingService:
   def tag_media(
     self,
     tagging_request: MediaTaggingRequest,
-  ) -> list[tagging_result.TaggingResult]:
+  ) -> MediaTaggingResponse:
     """Tags media based on requested tagger.
 
     Args:
@@ -143,7 +163,7 @@ class MediaTaggingService:
   def describe_media(
     self,
     tagging_request: MediaTaggingRequest,
-  ) -> list[tagging_result.TaggingResult]:
+  ) -> MediaTaggingResponse:
     """Tags media based on requested tagger.
 
     Args:
@@ -158,7 +178,7 @@ class MediaTaggingService:
     self,
     action: Literal['tag', 'describe'],
     tagging_request: MediaTaggingRequest,
-  ) -> list[tagging_result.TaggingResult]:
+  ) -> MediaTaggingResponse:
     """Gets media information based on tagger and output type.
 
     Args:
@@ -198,10 +218,10 @@ class MediaTaggingService:
         ):
           untagged_media.add(media_path)
     if not untagged_media:
-      return tagged_media
+      return MediaTaggingResponse(results=tagged_media)
 
     if not tagging_request.parallel_threshold:
-      return (
+      results = (
         self._process_media_sequentially(
           action,
           concrete_tagger,
@@ -211,6 +231,7 @@ class MediaTaggingService:
         )
         + tagged_media
       )
+      return MediaTaggingResponse(results=results)
     with futures.ThreadPoolExecutor(
       max_workers=tagging_request.parallel_threshold
     ) as executor:
@@ -231,7 +252,8 @@ class MediaTaggingService:
           for future in futures.as_completed(future_to_media_path)
         ]
       )
-      return list(untagged_media) + tagged_media
+      results = list(untagged_media) + tagged_media
+      return MediaTaggingResponse(results=results)
 
   def _process_media_sequentially(
     self,

{media_tagging-1.2.0.dev2 → media_tagging-1.2.0.dev4}/media_tagging/tagging_result.py

@@ -22,8 +22,9 @@ import json
 from collections.abc import Sequence
 from typing import Any, Literal
 
-import garf_core
+import pandas as pd
 import pydantic
+from garf_core import report
 
 from media_tagging import exceptions
 
@@ -149,9 +150,9 @@ class TaggingResultsFileInput:
   score_name: str
 
 
-def convert_tagging_results_to_garf_report(
+def to_garf_report(
   tagging_results: Sequence[TaggingResult],
-) -> garf_core.report.GarfReport:
+) -> report.GarfReport:
   """Converts results of tagging to GarfReport for further writing."""
   results = []
   column_names = [
@@ -173,4 +174,11 @@ def convert_tagging_results_to_garf_report(
     else:
       parsed_result.append({tag.name: tag.score for tag in result.content})
     results.append(parsed_result)
-  return garf_core.report.GarfReport(results=results, column_names=column_names)
+  return report.GarfReport(results=results, column_names=column_names)
+
+
+def to_pandas(
+  tagging_results: Sequence[TaggingResult],
+) -> pd.DataFrame:
+  """Converts results of tagging to pandas DataFrame."""
+  return to_garf_report(tagging_results).to_pandas()

{media_tagging-1.2.0.dev2 → media_tagging-1.2.0.dev4}/media_tagging.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-tagging
-Version: 1.2.0.dev2
+Version: 1.2.0.dev4
 Summary: Performs tagging of image and videos based on various taggers
 Author-email: "Google Inc. (gTech gPS CSE team)" <no-reply@google.com>
 License: Apache 2.0
@@ -23,20 +23,18 @@ Requires-Dist: pandas
 Requires-Dist: pydantic
 Requires-Dist: SQLalchemy>=2.0.0
 Requires-Dist: tenacity
-Requires-Dist: pandas
+Requires-Dist: google-genai==1.13.0
 Provides-Extra: google-cloud-vision
 Requires-Dist: google-cloud-vision==3.9.0; extra == "google-cloud-vision"
 Provides-Extra: google-cloud-videointelligence
 Requires-Dist: google-cloud-videointelligence==2.15.0; extra == "google-cloud-videointelligence"
 Provides-Extra: google-cloud
 Requires-Dist: media-tagging[google-cloud-videointelligence,google-cloud-vision]; extra == "google-cloud"
-Provides-Extra: gemini
-Requires-Dist: google-genai==1.13.0; extra == "gemini"
 Provides-Extra: server
 Requires-Dist: fastapi==0.111.0; extra == "server"
 Requires-Dist: pydantic-settings; extra == "server"
 Provides-Extra: all
-Requires-Dist: media-tagging[gemini,google-cloud,server]; extra == "all"
+Requires-Dist: media-tagging[google-cloud,server]; extra == "all"
 Dynamic: license-file
 
 # Media Tagger

{media_tagging-1.2.0.dev2 → media_tagging-1.2.0.dev4}/media_tagging.egg-info/requires.txt

@@ -6,13 +6,10 @@ pandas
 pydantic
 SQLalchemy>=2.0.0
 tenacity
-pandas
+google-genai==1.13.0
 
 [all]
-media-tagging[gemini,google-cloud,server]
-
-[gemini]
-google-genai==1.13.0
+media-tagging[google-cloud,server]
 
 [google-cloud]
 media-tagging[google-cloud-videointelligence,google-cloud-vision]

{media_tagging-1.2.0.dev2 → media_tagging-1.2.0.dev4}/pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
     "pydantic",
     "SQLalchemy>=2.0.0",
     "tenacity",
-    "pandas",
+    "google-genai==1.13.0",
 ]
 authors = [
   {name = "Google Inc. (gTech gPS CSE team)", email = "no-reply@google.com"},
@@ -48,15 +48,12 @@ google-cloud-videointelligence=[
 google-cloud=[
   "media-tagging[google-cloud-vision,google-cloud-videointelligence]",
 ]
-gemini=[
-  "google-genai==1.13.0",
-]
 server = [
   "fastapi==0.111.0",
   "pydantic-settings",
 ]
 all = [
-  "media-tagging[google-cloud,gemini,server]"
+  "media-tagging[google-cloud,server]"
 ]
 
 [project.entry-points.creative_assistant]