linting fix

bots/models.py

@@ -894,9 +894,11 @@ def to_df_format(
                 "Sent": message.created_at.astimezone(tz)
                 .replace(tzinfo=None)
                 .strftime("%b %d, %Y %I:%M %p"),
-                "Feedback": message.feedbacks.first().get_display_text()
-                if message.feedbacks.first()
-                else None,  # only show first feedback as per Sean's request
+                "Feedback": (
+                    message.feedbacks.first().get_display_text()
+                    if message.feedbacks.first()
+                    else None
+                ),  # only show first feedback as per Sean's request
                 "Analysis JSON": message.analysis_result,
             }
             rows.append(row)

daras_ai_v2/bot_integration_widgets.py

@@ -19,9 +19,9 @@ def general_integration_settings(bi: BotIntegration):
         st.session_state[f"_bi_user_language_{bi.id}"] = BotIntegration._meta.get_field(
             "user_language"
         ).default
-        st.session_state[
-            f"_bi_show_feedback_buttons_{bi.id}"
-        ] = BotIntegration._meta.get_field("show_feedback_buttons").default
+        st.session_state[f"_bi_show_feedback_buttons_{bi.id}"] = (
+            BotIntegration._meta.get_field("show_feedback_buttons").default
+        )
         st.session_state[f"_bi_analysis_url_{bi.id}"] = None
 
     bi.show_feedback_buttons = st.checkbox(

daras_ai_v2/bots.py

@@ -389,11 +389,13 @@ def _save_msgs(
         role=CHATML_ROLE_USER,
         content=response.raw_input_text,
         display_content=input_text,
-        saved_run=SavedRun.objects.get_or_create(
-            workflow=Workflow.ASR, **furl(speech_run).query.params
-        )[0]
-        if speech_run
-        else None,
+        saved_run=(
+            SavedRun.objects.get_or_create(
+                workflow=Workflow.ASR, **furl(speech_run).query.params
+            )[0]
+            if speech_run
+            else None
+        ),
     )
     attachments = []
     for f_url in (input_images or []) + (input_documents or []):

daras_ai_v2/language_model.py

@@ -198,12 +198,14 @@ def calc_gpt_tokens(
         for entry in messages
         if (
             content := (
-                format_chatml_message(entry) + "\n"
-                if is_chat_model
-                else entry.get("content", "")
+                (
+                    format_chatml_message(entry) + "\n"
+                    if is_chat_model
+                    else entry.get("content", "")
+                )
+                if isinstance(entry, dict)
+                else str(entry)
             )
-            if isinstance(entry, dict)
-            else str(entry)
         )
     )
     return default_length_function(combined)
@@ -364,9 +366,11 @@ def run_language_model(
         else:
             out_content = [
                 # return messages back as either chatml or json messages
-                format_chatml_message(entry)
-                if is_chatml
-                else (entry.get("content") or "").strip()
+                (
+                    format_chatml_message(entry)
+                    if is_chatml
+                    else (entry.get("content") or "").strip()
+                )
                 for entry in result
             ]
         if tools:
@@ -514,9 +518,11 @@ def _run_openai_chat(
                 frequency_penalty=frequency_penalty,
                 presence_penalty=presence_penalty,
                 tools=[tool.spec for tool in tools] if tools else NOT_GIVEN,
-                response_format={"type": response_format_type}
-                if response_format_type
-                else NOT_GIVEN,
+                response_format=(
+                    {"type": response_format_type}
+                    if response_format_type
+                    else NOT_GIVEN
+                ),
             )
             for model_str in model
         ],

daras_ai_v2/language_model_settings_widgets.py

@@ -24,9 +24,9 @@ def language_model_settings(show_selector=True, show_document_model=False):
                 f"###### {field_title_desc(VideoBotsPage.RequestModel, 'document_model')}",
                 key="document_model",
                 options=[None, *doc_model_descriptions],
-                format_func=lambda x: f"{doc_model_descriptions[x]} ({x})"
-                if x
-                else "———",
+                format_func=lambda x: (
+                    f"{doc_model_descriptions[x]} ({x})" if x else "———"
+                ),
             )
 
     st.checkbox("Avoid Repetition", key="avoid_repetition")

daras_ai_v2/stable_diffusion.py

@@ -247,9 +247,9 @@ def instruct_pix2pix(
         },
         inputs={
             "prompt": [prompt] * len(images),
-            "negative_prompt": [negative_prompt] * len(images)
-            if negative_prompt
-            else None,
+            "negative_prompt": (
+                [negative_prompt] * len(images) if negative_prompt else None
+            ),
             "num_images_per_prompt": num_outputs,
             "num_inference_steps": num_inference_steps,
             "guidance_scale": guidance_scale,
@@ -440,9 +440,9 @@ def controlnet(
         pipeline={
             "model_id": text2img_model_ids[Text2ImgModels[selected_model]],
             "seed": seed,
-            "scheduler": Schedulers[scheduler].label
-            if scheduler
-            else "UniPCMultistepScheduler",
+            "scheduler": (
+                Schedulers[scheduler].label if scheduler else "UniPCMultistepScheduler"
+            ),
             "disable_safety_checker": True,
             "controlnet_model_id": [
                 controlnet_model_ids[ControlNetModels[model]]

gooeysite/urls.py

@@ -14,6 +14,7 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+
 from django.contrib import admin
 from django.urls import path
 

pyproject.toml

@@ -93,3 +93,6 @@ pre-commit = "^3.5.0"
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.black]
+--force-exclude = "migrations|node_modules|\\.git|\\.venv|\\.env|\\.pytest_cache|\\.vscode|\\.github|\\.to"

recipes/CompareLLM.py

@@ -36,9 +36,9 @@ class CompareLLMPage(BasePage):
 
     class RequestModel(BaseModel):
         input_prompt: str | None
-        selected_models: list[
-            typing.Literal[tuple(e.name for e in LargeLanguageModels)]
-        ] | None
+        selected_models: (
+            list[typing.Literal[tuple(e.name for e in LargeLanguageModels)]] | None
+        )
 
         avoid_repetition: bool | None
         num_outputs: int | None

recipes/CompareText2Img.py

@@ -64,9 +64,9 @@ class RequestModel(BaseModel):
         seed: int | None
         sd_2_upscaling: bool | None
 
-        selected_models: list[
-            typing.Literal[tuple(e.name for e in Text2ImgModels)]
-        ] | None
+        selected_models: (
+            list[typing.Literal[tuple(e.name for e in Text2ImgModels)]] | None
+        )
         scheduler: typing.Literal[tuple(e.name for e in Schedulers)] | None
 
         edit_instruction: str | None

recipes/CompareUpscaler.py

@@ -24,9 +24,9 @@ class RequestModel(BaseModel):
 
         scale: int
 
-        selected_models: list[
-            typing.Literal[tuple(e.name for e in UpscalerModels)]
-        ] | None
+        selected_models: (
+            list[typing.Literal[tuple(e.name for e in UpscalerModels)]] | None
+        )
 
     class ResponseModel(BaseModel):
         output_images: dict[typing.Literal[tuple(e.name for e in UpscalerModels)], str]

recipes/DocExtract.py

@@ -77,9 +77,9 @@ class RequestModel(BaseModel):
 
         task_instructions: str | None
 
-        selected_model: typing.Literal[
-            tuple(e.name for e in LargeLanguageModels)
-        ] | None
+        selected_model: (
+            typing.Literal[tuple(e.name for e in LargeLanguageModels)] | None
+        )
         avoid_repetition: bool | None
         num_outputs: int | None
         quality: float | None

recipes/DocSearch.py

@@ -60,9 +60,9 @@ class RequestModel(DocSearchRequest):
         task_instructions: str | None
         query_instructions: str | None
 
-        selected_model: typing.Literal[
-            tuple(e.name for e in LargeLanguageModels)
-        ] | None
+        selected_model: (
+            typing.Literal[tuple(e.name for e in LargeLanguageModels)] | None
+        )
         avoid_repetition: bool | None
         num_outputs: int | None
         quality: float | None

recipes/DocSummary.py

@@ -60,9 +60,9 @@ class RequestModel(BaseModel):
         task_instructions: str | None
         merge_instructions: str | None
 
-        selected_model: typing.Literal[
-            tuple(e.name for e in LargeLanguageModels)
-        ] | None
+        selected_model: (
+            typing.Literal[tuple(e.name for e in LargeLanguageModels)] | None
+        )
         avoid_repetition: bool | None
         num_outputs: int | None
         quality: float | None

recipes/GoogleGPT.py

@@ -79,9 +79,9 @@ class RequestModel(GoogleSearchMixin, BaseModel):
         task_instructions: str | None
         query_instructions: str | None
 
-        selected_model: typing.Literal[
-            tuple(e.name for e in LargeLanguageModels)
-        ] | None
+        selected_model: (
+            typing.Literal[tuple(e.name for e in LargeLanguageModels)] | None
+        )
         avoid_repetition: bool | None
         num_outputs: int | None
         quality: float | None

recipes/ImageSegmentation.py

@@ -49,9 +49,9 @@ class ImageSegmentationPage(BasePage):
     class RequestModel(BaseModel):
         input_image: str
 
-        selected_model: typing.Literal[
-            tuple(e.name for e in ImageSegmentationModels)
-        ] | None
+        selected_model: (
+            typing.Literal[tuple(e.name for e in ImageSegmentationModels)] | None
+        )
         mask_threshold: float | None
 
         rect_persepective_transform: bool | None

recipes/Img2Img.py

@@ -46,9 +46,11 @@ class RequestModel(BaseModel):
         text_prompt: str | None
 
         selected_model: typing.Literal[tuple(e.name for e in Img2ImgModels)] | None
-        selected_controlnet_model: list[
-            typing.Literal[tuple(e.name for e in ControlNetModels)]
-        ] | typing.Literal[tuple(e.name for e in ControlNetModels)] | None
+        selected_controlnet_model: (
+            list[typing.Literal[tuple(e.name for e in ControlNetModels)]]
+            | typing.Literal[tuple(e.name for e in ControlNetModels)]
+            | None
+        )
         negative_prompt: str | None
 
         num_outputs: int | None

recipes/QRCodeGenerator.py

@@ -88,18 +88,18 @@ class RequestModel(BaseModel):
         text_prompt: str
         negative_prompt: str | None
         image_prompt: str | None
-        image_prompt_controlnet_models: list[
-            typing.Literal[tuple(e.name for e in ControlNetModels)], ...
-        ] | None
+        image_prompt_controlnet_models: (
+            list[typing.Literal[tuple(e.name for e in ControlNetModels)], ...] | None
+        )
         image_prompt_strength: float | None
         image_prompt_scale: float | None
         image_prompt_pos_x: float | None
         image_prompt_pos_y: float | None
 
         selected_model: typing.Literal[tuple(e.name for e in Text2ImgModels)] | None
-        selected_controlnet_model: list[
-            typing.Literal[tuple(e.name for e in ControlNetModels)], ...
-        ] | None
+        selected_controlnet_model: (
+            list[typing.Literal[tuple(e.name for e in ControlNetModels)], ...] | None
+        )
 
         output_width: int | None
         output_height: int | None

recipes/SEOSummary.py

@@ -98,9 +98,9 @@ class RequestModel(GoogleSearchMixin, BaseModel):
 
         enable_html: bool | None
 
-        selected_model: typing.Literal[
-            tuple(e.name for e in LargeLanguageModels)
-        ] | None
+        selected_model: (
+            typing.Literal[tuple(e.name for e in LargeLanguageModels)] | None
+        )
         sampling_temperature: float | None
         max_tokens: int | None
         num_outputs: int | None

recipes/SmartGPT.py

@@ -34,9 +34,9 @@ class RequestModel(BaseModel):
         reflexion_prompt: str | None
         dera_prompt: str | None
 
-        selected_model: typing.Literal[
-            tuple(e.name for e in LargeLanguageModels)
-        ] | None
+        selected_model: (
+            typing.Literal[tuple(e.name for e in LargeLanguageModels)] | None
+        )
         avoid_repetition: bool | None
         num_outputs: int | None
         quality: float | None

recipes/SocialLookupEmail.py

@@ -40,9 +40,9 @@ class RequestModel(BaseModel):
         domain: str | None
         key_words: str | None
 
-        selected_model: typing.Literal[
-            tuple(e.name for e in LargeLanguageModels)
-        ] | None
+        selected_model: (
+            typing.Literal[tuple(e.name for e in LargeLanguageModels)] | None
+        )
         sampling_temperature: float | None
         max_tokens: int | None
 

recipes/Text2Audio.py

@@ -49,9 +49,9 @@ class RequestModel(BaseModel):
         seed: int | None
         sd_2_upscaling: bool | None
 
-        selected_models: list[
-            typing.Literal[tuple(e.name for e in Text2AudioModels)]
-        ] | None
+        selected_models: (
+            list[typing.Literal[tuple(e.name for e in Text2AudioModels)]] | None
+        )
 
     class ResponseModel(BaseModel):
         output_audios: dict[
@@ -114,9 +114,9 @@ def run(self, state: dict) -> typing.Iterator[str | None]:
                 ),
                 inputs=dict(
                     prompt=[request.text_prompt],
-                    negative_prompt=[request.negative_prompt]
-                    if request.negative_prompt
-                    else None,
+                    negative_prompt=(
+                        [request.negative_prompt] if request.negative_prompt else None
+                    ),
                     num_waveforms_per_prompt=request.num_outputs,
                     num_inference_steps=request.quality,
                     guidance_scale=request.guidance_scale,

recipes/TextToSpeech.py

@@ -53,9 +53,9 @@ class TextToSpeechPage(BasePage):
     class RequestModel(BaseModel):
         text_prompt: str
 
-        tts_provider: typing.Literal[
-            tuple(e.name for e in TextToSpeechProviders)
-        ] | None
+        tts_provider: (
+            typing.Literal[tuple(e.name for e in TextToSpeechProviders)] | None
+        )
 
         uberduck_voice_name: str | None
         uberduck_speaking_rate: float | None