From e5a23f7f8f22e33aef23d8d108ccce7a0049b97d Mon Sep 17 00:00:00 2001 From: Aedial Date: Mon, 4 Dec 2023 23:53:43 +0000 Subject: [PATCH] deploy: 0f62c89c1fde1f50fb422a2886d1ed0320f22f4f --- _modules/novelai_api/ImagePreset.html | 195 ++++++++++++++--------- genindex.html | 2 + novelai_api/novelai_api.ImagePreset.html | 8 +- objects.inv | Bin 4039 -> 4044 bytes searchindex.js | 2 +- 5 files changed, 134 insertions(+), 73 deletions(-) diff --git a/_modules/novelai_api/ImagePreset.html b/_modules/novelai_api/ImagePreset.html index 5a1cca9..38b9c9a 100644 --- a/_modules/novelai_api/ImagePreset.html +++ b/_modules/novelai_api/ImagePreset.html @@ -61,7 +61,9 @@

Source code for novelai_api.ImagePreset

 import math
 import os
 import random
-from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple, Union
+import sys
+import typing
+from typing import Any, Dict, Optional, Tuple, Union
 
 from novelai_api.ImagePreset_CostTables import DDIM_COSTS, NAI_COSTS, SMEA_COSTS, SMEA_DYN_COSTS
 from novelai_api.python_utils import NoneType, expand_kwargs
@@ -157,6 +159,7 @@ 
Source code for novelai_api.ImagePreset
     k_heun = "k_heun"
     plms = "plms"  # doesn't work
     ddim = "ddim"
+    ddim_v3 = "ddim_v3"  # for v3
 
     nai_smea = "nai_smea"  # doesn't work
     nai_smea_dyn = "nai_smea_dyn"
@@ -257,79 +260,56 @@ 
Source code for novelai_api.ImagePreset
 
     _TYPE_MAPPING = {
         "legacy": bool,
-        "quality_toggle": bool,
-        "resolution": (ImageResolution, tuple),
-        "uc_preset": (UCPreset, NoneType),
-        "n_samples": int,
-        "seed": int,
-        "sampler": ImageSampler,
-        "noise": (int, float),
-        "strength": (int, float),
-        "scale": (int, float),
-        "uncond_scale": (int, float),
-        "steps": int,
-        "uc": str,
-        "smea": bool,
-        "smea_dyn": bool,
-        "image": str,
-        "controlnet_condition": str,
-        "controlnet_model": ControlNetModel,
-        "controlnet_strength": (int, float),
-        "decrisper": bool,
-        "add_original_image": bool,
-        "mask": str,
-        "cfg_rescale": float,
-        "noise_schedule": str,
+        # rest is populated in at the bottom of the file
     }
 
     # type completion for __setitem__ and __getitem__
-    if TYPE_CHECKING:
-        #: https://docs.novelai.net/image/qualitytags.html
-        quality_toggle: bool
-        #: Resolution of the image to generate as ImageResolution or a (width, height) tuple
-        resolution: Union[ImageResolution, Tuple[int, int]]
-        #: Default UC to prepend to the UC
-        uc_preset: Union[UCPreset, None]
-        #: Number of images to return
-        n_samples: int
-        #: Random seed to use for the image. The ith image has seed + i for seed
-        seed: int
-        #: https://docs.novelai.net/image/sampling.html
-        sampler: ImageSampler
-        #: https://docs.novelai.net/image/strengthnoise.html
-        noise: float
-        #: https://docs.novelai.net/image/strengthnoise.html
-        strength: float
-        #: https://docs.novelai.net/image/stepsguidance.html (scale is called Prompt Guidance)
-        scale: float
-        #: TODO
-        uncond_scale: float
-        #: https://docs.novelai.net/image/stepsguidance.html
-        steps: int
-        #: https://docs.novelai.net/image/undesiredcontent.html
-        uc: str
-        #: Enable SMEA for any sampler (makes Large+ generations manageable)
-        smea: bool
-        #: Enable SMEA DYN for any sampler if SMEA is enabled (best for Large+, but not Wallpaper resolutions)
-        smea_dyn: bool
-        #: b64-encoded png image for img2img
-        image: str
-        #: Controlnet mask gotten by the generate_controlnet_mask method
-        controlnet_condition: str
-        #: Model to use for the controlnet
-        controlnet_model: ControlNetModel
-        #: Influence of the chosen controlnet on the image
-        controlnet_strength: float
-        #: Reduce the deepfrying effects of high scale (https://twitter.com/Birchlabs/status/1582165379832348672)
-        decrisper: bool
-        #: Prevent seams along the edges of the mask, but may change the image slightly
-        add_original_image: bool
-        #: Mask for inpainting (b64-encoded black and white png image, white is the inpainting area)
-        mask: str
-        #: https://docs.novelai.net/image/stepsguidance.html#prompt-guidance-rescale
-        cfg_rescale: float
-        #: ??? (TODO: use an enum ? - valid values: native, karras, exponential, polyexponential)
-        noise_schedule: str
+    #: https://docs.novelai.net/image/qualitytags.html
+    quality_toggle: bool
+    #: Resolution of the image to generate as ImageResolution or a (width, height) tuple
+    resolution: Union[ImageResolution, Tuple[int, int]]
+    #: Default UC to prepend to the UC
+    uc_preset: Union[UCPreset, None]
+    #: Number of images to return
+    n_samples: int
+    #: Random seed to use for the image. The ith image has seed + i for seed
+    seed: int
+    #: https://docs.novelai.net/image/sampling.html
+    sampler: ImageSampler
+    #: https://docs.novelai.net/image/strengthnoise.html
+    noise: float
+    #: https://docs.novelai.net/image/strengthnoise.html
+    strength: float
+    #: https://docs.novelai.net/image/stepsguidance.html (scale is called Prompt Guidance)
+    scale: float
+    #: TODO
+    uncond_scale: float
+    #: https://docs.novelai.net/image/stepsguidance.html
+    steps: int
+    #: https://docs.novelai.net/image/undesiredcontent.html
+    uc: str
+    #: Enable SMEA for any sampler (makes Large+ generations manageable)
+    smea: bool
+    #: Enable SMEA DYN for any sampler if SMEA is enabled (best for Large+, but not Wallpaper resolutions)
+    smea_dyn: bool
+    #: b64-encoded png image for img2img
+    image: str
+    #: Controlnet mask gotten by the generate_controlnet_mask method
+    controlnet_condition: str
+    #: Model to use for the controlnet
+    controlnet_model: ControlNetModel
+    #: Influence of the chosen controlnet on the image
+    controlnet_strength: float
+    #: Reduce the deepfrying effects of high scale (https://twitter.com/Birchlabs/status/1582165379832348672)
+    decrisper: bool
+    #: Prevent seams along the edges of the mask, but may change the image slightly
+    add_original_image: bool
+    #: Mask for inpainting (b64-encoded black and white png image, white is the inpainting area)
+    mask: str
+    #: https://docs.novelai.net/image/stepsguidance.html#prompt-guidance-rescale
+    cfg_rescale: float
+    #: ??? (TODO: use an enum ? - valid values: native, karras, exponential, polyexponential)
+    noise_schedule: str
 
     _DEFAULT = {
         "legacy": False,
@@ -462,6 +442,9 @@ 
Source code for novelai_api.ImagePreset
         settings["negative_prompt"] = combined_uc
 
         sampler: ImageSampler = settings.pop("sampler")
+        if sampler is ImageSampler.ddim and model in (ImageModel.Anime_v3,):
+            sampler = ImageSampler.ddim_v3
+
         settings["sampler"] = sampler.value
 
         settings["sm"] = settings.pop("smea", False)
@@ -597,6 +580,76 @@ 
Source code for novelai_api.ImagePreset
 
         with open(path, "w", encoding="utf-8") as f:
             f.write(json.dumps(self._settings))

+
+
+def _get_typing_origin(t: type) -> type:
+    """
+    Get the typing origin of a type
+
+    :param t: Type to get the origin of
+    """
+
+    if sys.version_info < (3, 8):  # 3.7
+        origin = getattr(t, "__origin__", None)
+        assert origin is not None  # should never happen for 3.7
+
+        return origin
+
+    return typing.get_origin(t)
+
+
+def _get_typing_args(t: type) -> Tuple[type, ...]:
+    """
+    Get the typing arguments of a type
+
+    :param t: Type to get the arguments of
+    """
+
+    if sys.version_info < (3, 8):  # 3.7
+        args = getattr(t, "__args__", None)
+        assert args is not None  # should never happen for 3.7
+
+        return args
+
+    return typing.get_args(t)
+
+
+def _get_recursive_type(t: type, depth: int = 1) -> Union[type, Tuple[type, ...]]:
+    if t is None:
+        return NoneType
+
+    if t.__module__ == "typing":
+        if _get_typing_origin(t) is Union:
+            if depth == 0:
+                raise ValueError("Union types are not supported past depth 1")
+
+            return tuple(_get_recursive_type(x, depth - 1) for x in _get_typing_args(t))
+
+        return _get_typing_origin(t)
+
+    return t
+
+
+def _create_type_mapping():
+    """
+    Create the type mapping for the ImagePreset class
+    """
+
+    non_mapping_keys = ["last_seed"]
+
+    for type_key, type_value in ImagePreset.__annotations__.items():
+        if not type_key.startswith("_") and type_key != type_key.upper() and type_key not in non_mapping_keys:
+            if type_value is float:
+                type_value = (int, float)
+            else:
+                type_value = _get_recursive_type(type_value)
+
+            ImagePreset._TYPE_MAPPING[type_key] = type_value  # noqa
+
+    assert all(type_key in ImagePreset._TYPE_MAPPING for type_key in ImagePreset._DEFAULT)  # noqa
+
+
+_create_type_mapping()
 

 
             

diff --git a/genindex.html b/genindex.html
index 34f995c..3e4b2d8 100644
--- a/genindex.html
+++ b/genindex.html
@@ -279,6 +279,8 @@ 
D

       
  • data (Keystore attribute)
 
    • 
       
  • ddim (ImageSampler attribute)
+
    • 
+      
  • ddim_v3 (ImageSampler attribute)
 
    • 
       
  • decode() (SentencePiece method)
 
diff --git a/novelai_api/novelai_api.ImagePreset.html b/novelai_api/novelai_api.ImagePreset.html
index 68e8c93..d2574fa 100644
--- a/novelai_api/novelai_api.ImagePreset.html
+++ b/novelai_api/novelai_api.ImagePreset.html
@@ -336,6 +336,11 @@ 
    Navigation
    
 ddim = 'ddim'
 
    
 
+
    
+
    
+ddim_v3 = 'ddim_v3'
    
+
    
+
 
    
 
    
 nai_smea = 'nai_smea'
    
@@ -592,7 +597,7 @@ 
    Navigation
    
 
 
    
 
    
-__init__(*, legacy: bool, quality_toggle: bool, resolution: Union[novelai_api.ImagePreset.ImageResolution, tuple], uc_preset: Optional[novelai_api.ImagePreset.UCPreset], n_samples: int, seed: int, sampler: novelai_api.ImagePreset.ImageSampler, noise: float, strength: float, scale: float, uncond_scale: float, steps: int, uc: str, smea: bool, smea_dyn: bool, image: str, controlnet_condition: str, controlnet_model: novelai_api.ImagePreset.ControlNetModel, controlnet_strength: float, decrisper: bool, add_original_image: bool, mask: str, cfg_rescale: float, noise_schedule: str)[source]
    
+__init__(*, legacy: bool)[source]
 
    
 
 
    
@@ -735,6 +740,7 @@ 
    Table of Contents
    
 
  • ImageSampler.k_heun
    • 
 
  • ImageSampler.plms
    • 
 
  • ImageSampler.ddim
    • 
+
  • ImageSampler.ddim_v3
    • 
 
  • ImageSampler.nai_smea
    • 
 
  • ImageSampler.nai_smea_dyn
    • 
 
  • ImageSampler.k_dpmpp_2m
    • 
diff --git a/objects.inv b/objects.inv
index 94c8ad8b51464e65db4594783d15b404d9724dee..95fbf3b1c8f704b2732937c21a228158b1e64b90 100644
GIT binary patch
delta 2703
zcmV;A3UKwuAIu-HS_OYf3ToA8KrbZDGx8}Ih)^DZG8G{Wg`_dfHG73nyd_mS5G&8g
zrz{{#1us2ARdJA_g93F_di;Eu@el5mIR8(NN)d*44J%_wPv
zC)FQvO=EJ!sTSE9H6ab}8_?G~QX3>0>@#Skn-E1+?`BMWAVR>nCbDZE08O**{8l7GrunB;6WVnK%xTDVU|
zx|Gza(wG>{G7yE{*}3atN{{7~4l60^AkGV)PI>fgt;v7qlnK|Ibrzi(9qB$0?yP%b
zm-~BH{kG2GT4?XOw>)LseJ5tOZz!sd
z{#DmGi|l{g7>~-2Pt&Wr>)F&wmZK-b)K-!zc!K;9xToi}EjhVL5^4RJSD%%(L+CZ8
z+E@GzVpe2W>JQ5$mh=yhYy7;o6z}=({F1?0Z1QFL_3HcVdG0-${d({2vJ0WAZJr2=
z{YToaIPEo?zMr)F;)5Q#uFEUkC1dkoNM&DGi(j{9Rbxo!GsGUAqT1nPbAHV
zVt*p!J)l;aYQwz)8yu?5R@6mi*?=KAgM$Y*R()T@3U~5qT$&9&fX?5xo#!t1IwGGk5BFp~eYShS&dHDI)7*RzA`boP
z;sDTrL)|bi3(BoStAenY={bfW*&Va11I6AodQn9yAr#r>T>$#$@_z#n6{4?wz=W|yfvvieVEu@gI&WA+p~eNL3USqnxT?3X*=ymm{cT;W9wI*c|A^t3VLIDRW%Wa
zs9wjAUWQO%O25dr_MkQV6OQJ|?sOKKpKZW5p-;Ep+h8;C=G=Pkh&z9%PUgizMUs_!
zu{<+3&(8y9^6>cGc|D8|-s9Ed^eH58{`u))HVa97zPg@GpAm_@+`J3)7tEfs(MlE?
zs92ND0WuhXXl19C5*kIIlyl>AIVeP?l~#c*(UMZV%e8qX3dg44a!PHdaUo*yyX%9LsYLVd=U_DBOv
zL)p9cbRi>`%=Fsz8k5m$V)&(u0F75UdM7F45F^|EeG*#cF+0vpjSH~AOO9cva`Gst
zC!E^FCcrH+MszjZhXyVXmk^l{65G}2)m6Vp|BnKcMwV}KiPV3&hGuRQ81LUyG?o&B
zVM`XFT4@!)N~-`CR24~Li%C;FMrqHG?PfhdgX_$8APSFCZf}9>`IXPex_V$dGmK+l
zp7(M%GpCXo<$C`~hs7XgD1~OJavCTrL!KNYt3ptjm=2wM_f
zZJFs!*6!6qjHUA>TJTO*lrP-|WQH~_jj|I!Ckw$+ka>UF3=K8yMj7IxmDvfk*Jd2l
zn(XWqen#%3&f$UaL5c^az7Epcul=oEcLymS-p%=9$zSIW_tR?MDlf&;(wiLGKI&p&
z^S|*r?6kw38ty@nSkvuGHZHPU`4R)W&wm|DIYiW6H738Y&E_f6kk}zD60IP5Iq|$7
zf5u&eCzOBHLo?euClhmF0yZp?oH2(0@c;{C6o#w-F%p^p%KJ6-We3uhyyQY6~-1=Z-(!_WS@1;OW7m!+s=F=+t
zt-Ty=gVmf?h}zZqU=lpCi>W_|<%ec;x+Cm94Q6IH84}BJEi*EI4@5Lye`s!0F}bU%
zV-@8#?Q4;y#Kz6k1JaILotkrDEBSwNG1g3{@UPL4q#V=iq;@CI#yO2%%wv8`b8=02
znIC@++I7$lqkZEzgHd%OMUgvEn!pD*&8?%Pn{shdvz?I(uKSIBX7~P4@NK;|$$?l0
z-AC0oMh<7NIdOK5Y#SfBIXZX#mJ6(NR@eB@osr8yOfIOsgPX?3?v5Nz<>*1&9O5xP
za&vTgqZt>}vGO`oRJ*&!IFJtQtTH|kVB~+Yj>!qUyY6Xx?C$97+5{I~cOk?0;H}a5
z*2BsAcH5fq;d`UAL(nd)?s)b1;H}ZgK?@hkc64LB_wlIJM4o9oAJ?YW%DYXd0xF|b
z_lwnM)pzFA{YTq+bsV2|y!Sn#v3;nwp3Tv|-EozZUQHD=6VXfgYhPt^tMM94plt_q
J{s*AL5AEhZR>%MV

delta 2698
zcmV;53U&3&AIBfCS_OY5FC@-0@+laIP#%FY<&%a&(wOF&y+SD7k}4gDmFMJB7LcWa
zm!6@jI7rb!fjU^d0}7jwD=2sfPMRrv3^xIA2g-LzxTEC_Eyv2e@1Kz-dNjh5>JPc5
zF}dPYi)@XWkcRgS=xZ3#j3p}_h9us|zpHnGp?Sf}?_O|!ru~06Si8@!Zvvm3ti1`;
zmOl3Yb(POb_M0HpSG>nW`@Yi6!aA3->#Yst&Jif_u6L#IpnY$zuWqMO3h7ko+Fv+X
z@j3x_G4LKiUT^;3PI5-{tB^xL87S3bzReJn(o`2J1gVgzcMPfbjd87DHoQyyD#O*+
zJ6qE@6WpXH*H?e@DY^Rc
zNQf5(3On0k2$rH1(74_x1v5n};~bI{ULnOM9p3oJKjkeiQbRVB~*1fT-@V%>k
zTjy{sw0GTGo-*z~6Mmy>N&Txz`r<#XbCwh`_Akrf#k(lj)%Y1?3y|cMriFWx?SOcY
zvDDAr!Y-%OT(UW0nD@heRLH-Eb)AQPvoLnV|wEoPi&q~`N^cqv`D}Dzt
zD>5wghvgDW`Ul80e%@P(_xyK$$>1zD`7-@_^?mj{_a4oDy?1xng;3S*ON7P#BW)Lg
z_L}70PuhJ=Ko4ElRgdnHv3W40vM(%h;52oAQR07&fNJ|*!Ud6#1J#5ll4eA)KN0dC
zP%BNf58i=&h&@R=FN*1@E0#+ZvFZi6Z|!Pbiu>+>?(%lY>Wam&DNO63dUej51*GMA
zC%npUSKOw()>QS=wgVUl%8cX1y6$g~R3eINS|F(RSx@gS%PB?~hB3Fc|181u$M|M9
zQiOk}R5U$lzp^=v5!;HqbP`Fu^PYcwTe`a3Qv%O??K7Izum4VhgQ!bc)vhpUESt0*
zyFw0vNy?KjB$bLh3<Z+l8MxYrzw7NLY0b`=KdfUf
z5DZVB#oN79d#%>)qns0pkqtRXaAaR_WOIK6*?MpfLAuA}d0JP&ygi8Q6TadI}%Y@MbvK(~A?WA~M!j4Kba^JoPb{XtV^s+8jlvz_mp
zd{es{_5kl(ZXd+;Brp_Ce4go$-|NBgCruWmQtLNK?dorIs+bvq>W$VAZGYQv`kHI
z0Y~RF=P(2SX%ZDu0@p;FP98q6JimXS)0x4pfc2S>0Wh1j8`!K~j_(jqE@8>u1Ce@c
z;5CFKAr|QMT+vtjheZKnveiHDnftYDyYnz}Bll+5>e%6=ivNZ}~!ALMFmhAvV9I#fkq&=FE4ar3
ze6CL&bQ{#zgg!Z~=Dj*FbZJj5@TRq-hVbrhf6-M3KUbW9Jm86+DGL%HR%kIuvr)}_)
z=BXt+`DQL>4d7g%?&>=U_p^UZmmy;DR<;SGP$v7UWUFAjsskC0r&f@@227uI&sbpI
zn$(>>Ol+^gu3?DQDfP%8yIDNVP)VA!opvNlDiX%A^()W39;ZVEy)nJ2ng~QxuhT&<
zL#QyNU*ubR&>H>;NAqNNIt$IuHsG7kr`zvsu$g#sZoPNJ9aJatVxfN`$;!Q0o|&8H
z=K(W$c>M0X9>xdn@#=B<6cRZ9{PZxJg(N;-UC*Y^h{RrQ-Ua##W{Sj={zKI2P!(g3ER?A?31
zkdaGfdhL3R$>=pP{8C1M#;Y8?laz6Yk!}Az2`%%O9p|RT1z6xE$1qemd6d)>PVHh7
z;1(Gpx|;4o0~d%(h)f8H?P~Pus$Zo4M*&JB%Qv}1>RdxJHwu4@_irj1ONqg-C5uq4
zv?xLmQVy*$JSNgNC
zBX?5g@WA*W#RF4c2kGtC{?@L$gOm^N=6tc_uk(ldX|->am*Q#ZO%81zb+NGd-*_E%
z+Tl(O_n=6u>GmZX7g?@+iGkhczmBCGB5JQ1li%28^Au@F?2s0TRuH|Mc;1gc<1WGz
z%Icw+?VW#VmyZTQXr)ZNUcQkX%+s~UXHfG
zYECOe?P`562_D(S)E~t1Lo+(v5q6&jGqalviRHMK8JWKaBATy1G&ic4+*Q@FigKIw
zwMbK9<7VmsX~(Tj&AG6Z{6D!EYo=59*XT%6j%jvMyOU?*oJKF^F+Zj`xu(3#4+rf!
zXor8%zHywvsJfA&$ek!n-~*iI)=|<;xj3oW&d3GV{l-4Cd;ci-wqBd$K&*rAqv{(Y
zhcnomI6FtSjgQsE#p<)_
zJM-%Pqiwx9j!!$@`ySEQKGa*!=4jvUxXMYdrV5&g=%xI%ud=z-cnv1dHah