From 420cc8f68e6aca8a3a0f42ee0e626a6b03712763 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 18 Jul 2023 11:48:40 +0300
Subject: also make None a valid option for options API for #11854

---
 modules/api/models.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'modules/api/models.py')

diff --git a/modules/api/models.py b/modules/api/models.py
index b5683071..b55fa728 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -1,4 +1,6 @@
 import inspect
+import types
+
 from pydantic import BaseModel, Field, create_model
 from typing import Any, Optional
 from typing_extensions import Literal
@@ -207,11 +209,14 @@ class PreprocessResponse(BaseModel):
 fields = {}
 for key, metadata in opts.data_labels.items():
     value = opts.data.get(key)
+    if key == 'sd_model_checkpoint':
+        value = None
     optType = opts.typemap.get(type(metadata.default), type(value))
 
-    if (metadata is not None):
-        fields.update({key: (Optional[optType], Field(
-            default=metadata.default ,description=metadata.label))})
+    if optType == types.NoneType:
+        pass
+    elif metadata is not None:
+        fields.update({key: (Optional[optType], Field(default=metadata.default, description=metadata.label))})
     else:
         fields.update({key: (Optional[optType], Field())})
 
-- 
cgit v1.2.1


From ed82f1c5f1677c85298f4d2c6c030a5551682c71 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 18 Jul 2023 15:55:23 +0300
Subject: lint

---
 modules/api/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/api/models.py')

diff --git a/modules/api/models.py b/modules/api/models.py
index b55fa728..96cfe920 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -213,7 +213,7 @@ for key, metadata in opts.data_labels.items():
         value = None
     optType = opts.typemap.get(type(metadata.default), type(value))
 
-    if optType == types.NoneType:
+    if isinstance(optType, types.NoneType):
         pass
     elif metadata is not None:
         fields.update({key: (Optional[optType], Field(default=metadata.default, description=metadata.label))})
-- 
cgit v1.2.1


From b270ded268c92950a35a7a326da54496ef4151c8 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 18 Jul 2023 18:10:04 +0300
Subject: fix the issue with /sdapi/v1/options failing (this time for sure!)
 fix automated tests downloading CLIP model

---
 modules/api/models.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'modules/api/models.py')

diff --git a/modules/api/models.py b/modules/api/models.py
index 96cfe920..4cd20a92 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -209,11 +209,9 @@ class PreprocessResponse(BaseModel):
 fields = {}
 for key, metadata in opts.data_labels.items():
     value = opts.data.get(key)
-    if key == 'sd_model_checkpoint':
-        value = None
-    optType = opts.typemap.get(type(metadata.default), type(value))
+    optType = opts.typemap.get(type(metadata.default), type(metadata.default))
 
-    if isinstance(optType, types.NoneType):
+    if metadata.default is None:
         pass
     elif metadata is not None:
         fields.update({key: (Optional[optType], Field(default=metadata.default, description=metadata.label))})
-- 
cgit v1.2.1


From 7f7db1700bda40ba3171a49b6a4ef38f868b7d0a Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 18 Jul 2023 18:16:23 +0300
Subject: linter fix

---
 modules/api/models.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/api/models.py')

diff --git a/modules/api/models.py b/modules/api/models.py
index 4cd20a92..bf97b1a3 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -1,5 +1,4 @@
 import inspect
-import types
 
 from pydantic import BaseModel, Field, create_model
 from typing import Any, Optional
-- 
cgit v1.2.1


From 6305632493406ff078a2a3fd22c06859fee260d4 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Wed, 26 Jul 2023 16:47:12 +0900
Subject: use "Any" type when type is None

---
 modules/api/models.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'modules/api/models.py')

diff --git a/modules/api/models.py b/modules/api/models.py
index bf97b1a3..800c9b93 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -208,11 +208,9 @@ class PreprocessResponse(BaseModel):
 fields = {}
 for key, metadata in opts.data_labels.items():
     value = opts.data.get(key)
-    optType = opts.typemap.get(type(metadata.default), type(metadata.default))
+    optType = opts.typemap.get(type(metadata.default), type(metadata.default)) if metadata.default else Any
 
-    if metadata.default is None:
-        pass
-    elif metadata is not None:
+    if metadata is not None:
         fields.update({key: (Optional[optType], Field(default=metadata.default, description=metadata.label))})
     else:
         fields.update({key: (Optional[optType], Field())})
-- 
cgit v1.2.1