Merge branch 'main' into llm-rest-api

* HF-Reference LLM mode.

* Fixup test to match current output from Turbine.

* lint

* Fix test error message + Only initialize HF torch model when used.

* Remove redundant format_out change.

apps/shark_studio/tests/api_test.py

@@ -27,6 +27,25 @@ from apps.shark_studio.web.utils.file_utils import get_resource_path
 #         for i in shark_sd_fn_dict_input(sd_kwargs):
 #             print(i)
 
+from apps.shark_studio.api.llm import LanguageModel, llm_chat_api
+from apps.shark_studio.api.sd import shark_sd_fn_dict_input, view_json_file
+from apps.shark_studio.web.utils.file_utils import get_resource_path
+
+# class SDAPITest(unittest.TestCase):
+#     def testSDSimple(self):
+#         from apps.shark_studio.modules.shared_cmd_opts import cmd_opts
+#         import apps.shark_studio.web.utils.globals as global_obj
+
+#         global_obj._init()
+
+#         sd_json = view_json_file(get_resource_path("../configs/default_sd_config.json"))
+#         sd_kwargs = json.loads(sd_json)
+#         for arg in vars(cmd_opts):
+#             if arg in sd_kwargs:
+#                 sd_kwargs[arg] = getattr(cmd_opts, arg)
+#         for i in shark_sd_fn_dict_input(sd_kwargs):
+#             print(i)
+
 
 class LLMAPITest(unittest.TestCase):
     def test01_LLMSmall(self):

apps/shark_studio/web/configs/default_sd_config.json

@@ -25,4 +25,4 @@
   "resample_type": "Nearest Neighbor",
   "controlnets": {},
   "embeddings": {}
-}
+}

apps/shark_studio/web/index.py

@@ -89,12 +89,6 @@ def webui():
 
     # required to do multiprocessing in a pyinstaller freeze
     freeze_support()
-
-    # if args.api or "api" in args.ui.split(","):
-    #     from apps.shark_studio.api.llm import (
-    #         chat,
-    #     )
-    #     from apps.shark_studio.web.api import sdapi
     #
     #     from fastapi import FastAPI, APIRouter
     #     from fastapi.middleware.cors import CORSMiddleware

apps/shark_studio/web/ui/chat.py

@@ -13,11 +13,6 @@ import apps.shark_studio.web.utils.globals as global_obj
 
 B_SYS, E_SYS = "<s>", "</s>"
 
-B_SYS, E_SYS = "<s>", "</s>"
-
-B_SYS, E_SYS = "<s>", "</s>"
-
-
 def user(message, history):
     # Append the user's message to the conversation history
     return "", history + [[message, ""]]

apps/shark_studio/web/ui/css/sd_dark_theme.css

@@ -125,15 +125,6 @@ body {
     }
 }
 
-/* media rules in custom css are don't appear to be applied in
-   gradio versions > 4.7, so we have to define a class which
-   we will manually need add and remove using javascript.
-   Remove this once this fixed in gradio.
-*/
-.gradio-container-size-full {
-    max-width: var(--size-full) !important;
-}
-
 .gradio-container .contain {
     padding: 0 var(--size-4) !important;
 }
@@ -370,4 +361,4 @@ footer {
     top: 14px;
     right: 0px;
     height: 36px;
-}
+}