Fix defaults for serp_search_type and serp_search_location

GooeyAI · Sep 13, 2024 · 25abd67 · 25abd67
1 parent a38ad6a
commit 25abd67
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/daras_ai_v2/serp_search_locations.py b/daras_ai_v2/serp_search_locations.py
@@ -43,7 +43,7 @@ def serp_search_location_selectbox(key="serp_search_location"):
         options=[e.api_value for e in SerpSearchLocations],
         format_func=lambda e: f"{SerpSearchLocations.from_api(e).label} ({e})",
         key=key,
-        value=SerpSearchLocations.UNITED_STATES.name,
+        value=SerpSearchLocations.UNITED_STATES.api_value,
     )
 
 
@@ -58,10 +58,6 @@ class SerpSearchType(GooeyEnum):
     def label(self):
         return self.value
 
-    @property
-    def api_value(self):
-        return self.name
-
 
 class SerpSearchLocation(typing.NamedTuple):
     api_value: str

diff --git a/recipes/GoogleGPT.py b/recipes/GoogleGPT.py
@@ -56,8 +56,8 @@ class GoogleGPTPage(BasePage):
         keywords="outdoor rugs,8x10 rugs,rug sizes,checkered rugs,5x7 rugs",
         title="Ruggable",
         company_url="https://ruggable.com",
-        serp_search_type=SerpSearchType.search,
-        serp_search_location=SerpSearchLocations.UNITED_STATES.name,
+        serp_search_type=SerpSearchType.search.name,
+        serp_search_location=SerpSearchLocations.UNITED_STATES.api_value,
         enable_html=False,
         selected_model=LargeLanguageModels.text_davinci_003.name,
         sampling_temperature=0.8,

diff --git a/recipes/GoogleImageGen.py b/recipes/GoogleImageGen.py
@@ -47,8 +47,8 @@ class GoogleImageGenPage(BasePage):
         sd_2_upscaling=False,
         seed=42,
         image_guidance_scale=1.2,
-        serp_search_type=SerpSearchType.search,
-        serp_search_location=SerpSearchLocations.UNITED_STATES.name,
+        serp_search_type=SerpSearchType.search.name,
+        serp_search_location=SerpSearchLocations.UNITED_STATES.api_value,
     )
 
     class RequestModel(GoogleSearchLocationMixin, BasePage.RequestModel):

diff --git a/recipes/RelatedQnA.py b/recipes/RelatedQnA.py
@@ -34,8 +34,8 @@ class RelatedQnAPage(BasePage):
         max_context_words=200,
         scroll_jump=5,
         dense_weight=1.0,
-        serp_search_type=SerpSearchType.search,
-        serp_search_location=SerpSearchLocations.UNITED_STATES.name,
+        serp_search_type=SerpSearchType.search.name,
+        serp_search_location=SerpSearchLocations.UNITED_STATES.api_value,
     )
 
     class RequestModel(GoogleGPTPage.RequestModel):

diff --git a/recipes/RelatedQnADoc.py b/recipes/RelatedQnADoc.py
@@ -31,8 +31,8 @@ class RelatedQnADocPage(BasePage):
     sane_defaults = dict(
         citation_style=CitationStyles.number.name,
         dense_weight=1.0,
-        serp_search_type=SerpSearchType.search,
-        serp_search_location=SerpSearchLocations.UNITED_STATES.name,
+        serp_search_type=SerpSearchType.search.name,
+        serp_search_location=SerpSearchLocations.UNITED_STATES.api_value,
     )
 
     class RequestModel(GoogleSearchMixin, DocSearchPage.RequestModel):

diff --git a/recipes/SEOSummary.py b/recipes/SEOSummary.py
@@ -74,8 +74,8 @@ def preview_description(self, state: dict) -> str:
         keywords="outdoor rugs,8x10 rugs,rug sizes,checkered rugs,5x7 rugs",
         title="Ruggable",
         company_url="https://ruggable.com",
-        serp_search_type=SerpSearchType.search,
-        serp_search_location=SerpSearchLocations.UNITED_STATES.name,
+        serp_search_type=SerpSearchType.search.name,
+        serp_search_location=SerpSearchLocations.UNITED_STATES.api_value,
         enable_html=False,
         selected_model=LargeLanguageModels.text_davinci_003.name,
         sampling_temperature=0.8,