Date: Thu, 8 Feb 2024 00:29:08 +0000
Subject: [PATCH] deploy: 9402f0d6a4a9b84042ac69053735dbee57759682
---
.buildinfo | 2 +-
_modules/example/boilerplate.html | 18 ++++---
_modules/index.html | 8 ++--
_modules/novelai_api/BanList.html | 8 ++--
_modules/novelai_api/BiasGroup.html | 8 ++--
_modules/novelai_api/GlobalSettings.html | 8 ++--
_modules/novelai_api/Idstore.html | 8 ++--
_modules/novelai_api/ImagePreset.html | 8 ++--
_modules/novelai_api/Keystore.html | 8 ++--
_modules/novelai_api/NovelAIError.html | 8 ++--
_modules/novelai_api/NovelAI_API.html | 8 ++--
_modules/novelai_api/Preset.html | 45 ++++++++++++++----
_modules/novelai_api/SchemaValidator.html | 8 ++--
_modules/novelai_api/StoryHandler.html | 8 ++--
_modules/novelai_api/Tokenizer.html | 8 ++--
_modules/novelai_api/_high_level.html | 8 ++--
_modules/novelai_api/_low_level.html | 10 ++--
_modules/novelai_api/utils.html | 8 ++--
_modules/tests/api/boilerplate.html | 17 +++++--
.../test_decrypt_encrypt_integrity_check.html | 8 ++--
_modules/tests/api/test_textgen_presets.html | 29 +++++++++--
_static/documentation_options.js | 2 +-
example/example.boilerplate.html | 8 ++--
example/example.html | 8 ++--
genindex.html | 16 ++++---
index.html | 12 +++--
novelai_api/Full_list_of_modules.html | 8 ++--
novelai_api/novelai_api.BanList.html | 8 ++--
novelai_api/novelai_api.BiasGroup.html | 8 ++--
novelai_api/novelai_api.GlobalSettings.html | 8 ++--
novelai_api/novelai_api.Idstore.html | 8 ++--
novelai_api/novelai_api.ImagePreset.html | 8 ++--
novelai_api/novelai_api.Keystore.html | 8 ++--
novelai_api/novelai_api.NovelAIError.html | 8 ++--
novelai_api/novelai_api.NovelAI_API.html | 8 ++--
novelai_api/novelai_api.Preset.html | 23 +++++++--
novelai_api/novelai_api.SchemaValidator.html | 8 ++--
novelai_api/novelai_api.StoryHandler.html | 8 ++--
novelai_api/novelai_api.Tokenizer.html | 8 ++--
novelai_api/novelai_api.high_level.html | 8 ++--
novelai_api/novelai_api.html | 8 ++--
novelai_api/novelai_api.low_level.html | 8 ++--
novelai_api/novelai_api.utils.html | 8 ++--
objects.inv | Bin 4044 -> 4062 bytes
py-modindex.html | 8 ++--
search.html | 8 ++--
searchindex.js | 2 +-
tests/api/api.boilerplate.html | 8 ++--
tests/api/api.html | 8 ++--
tests/mock/mock.html | 8 ++--
50 files changed, 280 insertions(+), 200 deletions(-)
diff --git a/.buildinfo b/.buildinfo
index 7a4d00a..96bb4e2 100644
--- a/.buildinfo
+++ b/.buildinfo
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: ce1b3f02132269e3117ff63e34dbbd14
+config: 6a687f250e5c1911bea924197742129c
tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/_modules/example/boilerplate.html b/_modules/example/boilerplate.html
index 7ae8ee1..0805593 100644
--- a/_modules/example/boilerplate.html
+++ b/_modules/example/boilerplate.html
@@ -5,7 +5,7 @@
example.boilerplate — NovelAI API 0.22.0 documentation
+ example.boilerplate — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »example.boilerplate Source code for example.boilerplate
import json
from logging import Logger , StreamHandler
from os import environ as env
+from pathlib import Path
from typing import Any , Optional
-import dotenv
from aiohttp import ClientSession
from novelai_api import NovelAIAPI
@@ -96,7 +96,13 @@ Source code for example.boilerplate
api : Optional [ NovelAIAPI ]
[docs] def __init__ ( self , base_address : Optional [ str ] = None ):
-
dotenv . load_dotenv ()
+
dotenv = Path ( ".env" )
+
if dotenv . exists ():
+
with dotenv . open ( "r" ) as f :
+
for line in f :
+
if "=" in line :
+
key , value = line . strip () . split ( "=" , 1 )
+
env [ key ] = value . strip ()
if "NAI_USERNAME" not in env or "NAI_PASSWORD" not in env :
raise RuntimeError ( "Please ensure that NAI_USERNAME and NAI_PASSWORD are set in your environment" )
@@ -177,13 +183,13 @@
Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Module code »example.boilerplate Overview: module code — NovelAI API 0.22.0 documentation
+ Overview: module code — NovelAI API 0.23.1 documentation
Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Overview: module code Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Overview: module code novelai_api.BanList — NovelAI API 0.22.0 documentation
+ novelai_api.BanList — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.BanList Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.BanList novelai_api.BiasGroup — NovelAI API 0.22.0 documentation
+ novelai_api.BiasGroup — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.BiasGroup Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.BiasGroup novelai_api.GlobalSettings — NovelAI API 0.22.0 documentation
+ novelai_api.GlobalSettings — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.GlobalSettings Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.GlobalSettings novelai_api.Idstore — NovelAI API 0.22.0 documentation
+ novelai_api.Idstore — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.Idstore Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.Idstore novelai_api.ImagePreset — NovelAI API 0.22.0 documentation
+ novelai_api.ImagePreset — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.ImagePreset Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.ImagePreset novelai_api.Keystore — NovelAI API 0.22.0 documentation
+ novelai_api.Keystore — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.Keystore Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.Keystore novelai_api.NovelAIError — NovelAI API 0.22.0 documentation
+ novelai_api.NovelAIError — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.NovelAIError Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.NovelAIError novelai_api.NovelAI_API — NovelAI API 0.22.0 documentation
+ novelai_api.NovelAI_API — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.NovelAI_API Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.NovelAI_API novelai_api.Preset — NovelAI API 0.22.0 documentation
+ novelai_api.Preset — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.Preset Source code for novelai_api.Preset
name : str
#: Model the preset is for
model : Model
+ #: Enable state of sampling options
+ sampling_options : List [ bool ]
[docs] def __init__ ( self , name : str , model : Model , settings : Optional [ Dict [ str , Any ]] = None ):
object . __setattr__ ( self , "name" , name )
object . __setattr__ ( self , "model" , model )
object . __setattr__ ( self , "_settings" , {})
-
self . update ( settings ) self . update ( settings )
+ self . set_sampling_options_state ([ True ] * len ( self . _settings [ "order" ])) [docs] def set_sampling_options_state ( self , sampling_options_state : List [ bool ]):
+
"""
+
Set the state (enabled/disabled) of the sampling options. Set it after setting the order setting.
+
It should come in the same order as the order setting.
+
"""
+
+
if "order" not in self . _settings :
+
raise ValueError ( "The order setting must be set before setting the sampling options state" )
+
+
if len ( sampling_options_state ) != len ( self . _settings [ "order" ]):
+
raise ValueError (
+
"The length of the sampling options state list must be equal to the length "
+
"of the sampling options list"
+
)
+
+
object . __setattr__ ( self , "sampling_options" , sampling_options_state ) def __setitem__ ( self , key : str , value : Any ):
if key not in self . _TYPE_MAPPING :
@@ -421,7 +441,8 @@ Source code for novelai_api.Preset
def __repr__ ( self ) -> str :
model = self . model . value if self . model is not None else "<?>"
- enabled_keys = ", " . join ( f " { ORDER_TO_NAME [ o ] } = { o in self . _settings [ 'order' ] } " for o in Order )
+ enabled_order = [ o for o , enabled in zip ( self . _settings [ "order" ], self . sampling_options ) if enabled ]
+ enabled_keys = ", " . join ( f " { ORDER_TO_NAME [ o ] } = { o in enabled_order } " for o in Order )
return f "Preset: ' { self . name } ( { model } , { enabled_keys } )'"
@@ -437,7 +458,11 @@ Source code for novelai_api.Preset
# remove disabled sampling options
if "order" in settings :
- order = [ Order ( e ) if isinstance ( e , int ) else e for e in settings [ "order" ]]
+ order = [
+ ( Order ( o ) if isinstance ( o , int ) else o )
+ for o , enabled in zip ( settings [ "order" ], self . sampling_options )
+ if enabled
+ ]
for o in Order :
if o not in order :
@@ -473,8 +498,8 @@ Source code for novelai_api.Preset
def __str__ ( self ):
- settings = { k : self . _settings . get ( k , v ) for k , v in self . DEFAULTS . items ()}
- is_default = { k : " (default)" if v == self . DEFAULTS [ k ] else "" for k , v in settings . items ()}
+ settings = self . to_settings () # use the sanitized settings
+ is_default = { k : " (default)" if v == self . DEFAULTS . get ( k , None ) else "" for k , v in settings . items ()}
values = " \n " . join ( f " { k } = { v }{ is_default [ k ] } " for k , v in settings . items ())
@@ -532,7 +557,6 @@ Source code for novelai_api.Preset
name = data [ "name" ] if "name" in data else "<?>"
- # FIXME: collapse model version
model_name = data [ "model" ] if "model" in data else ""
model = collapse_model ( Model , model_name )
@@ -547,6 +571,7 @@ Source code for novelai_api.Preset
settings . pop ( "logit_bias_groups" , None ) # get rid of unsupported option
c = cls ( name , model , settings )
+ c . set_sampling_options_state ([ o [ "enabled" ] for o in order ])
return c Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Module code »novelai_api.Preset novelai_api.SchemaValidator — NovelAI API 0.22.0 documentation
+ novelai_api.SchemaValidator — NovelAI API 0.23.1 documentation
Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Module code »novelai_api.SchemaValidator
@@ -121,13 +121,13 @@
Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Module code »novelai_api.SchemaValidator novelai_api.StoryHandler — NovelAI API 0.22.0 documentation
+ novelai_api.StoryHandler — NovelAI API 0.23.1 documentation
Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Module code »novelai_api.StoryHandler
@@ -551,13 +551,13 @@
Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Module code »novelai_api.StoryHandler novelai_api.Tokenizer — NovelAI API 0.22.0 documentation
+ novelai_api.Tokenizer — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.Tokenizer Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.Tokenizer novelai_api._high_level — NovelAI API 0.22.0 documentation
+ novelai_api._high_level — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api._high_level Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api._high_level novelai_api._low_level — NovelAI API 0.22.0 documentation
+ novelai_api._low_level — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api._low_level Source code for novelai_api._low_level
diff --git a/_modules/novelai_api/utils.html b/_modules/novelai_api/utils.html
index 9546296..9ce77de 100644
--- a/_modules/novelai_api/utils.html
+++ b/_modules/novelai_api/utils.html
@@ -5,7 +5,7 @@
novelai_api.utils — NovelAI API 0.22.0 documentation
+ novelai_api.utils — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.utils Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »novelai_api.utils tests.api.boilerplate — NovelAI API 0.22.0 documentation
+ tests.api.boilerplate — NovelAI API 0.23.1 documentation
Navigation
modules |
- NovelAI API 0.22.0 documentation »NovelAI API 0.23.1 documentation »Module code »tests.api.boilerplate Source code for tests.api.boilerplate
import json
from logging import Logger , StreamHandler
from os import environ as env
+from pathlib import Path
from typing import Any , Awaitable , Callable , NoReturn , Optional
import pytest
@@ -79,6 +80,14 @@ Source code for tests.api.boilerplate
diff --git a/_modules/tests/api/test_textgen_presets.html b/_modules/tests/api/test_textgen_presets.html
index 0e02442..6aaf897 100644
--- a/_modules/tests/api/test_textgen_presets.html
+++ b/_modules/tests/api/test_textgen_presets.html
@@ -5,7 +5,7 @@
tests.api.test_textgen_presets — NovelAI API 0.22.0 documentation
+ tests.api.test_textgen_presets — NovelAI API 0.23.1 documentation
Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Module code »tests.api.test_textgen_presets
@@ -59,6 +59,7 @@
Source code for tests.api.test_textgen_presets Tests pertaining to the Preset class
"""
+import asyncio
from typing import Tuple
import pytest
@@ -67,7 +68,7 @@
Source code for tests.api.test_textgen_presets from novelai_api.Preset import Model , Preset
from novelai_api.Tokenizer import Tokenizer
from novelai_api.utils import b64_to_tokens
-from tests.api.boilerplate import api_handle , error_handler # noqa: F401 # pylint: disable=W0611
+from tests.api.boilerplate import API , api_handle , error_handler # noqa: F401 # pylint: disable=W0611
prompt = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam at dolor dictum, interdum est sed, consequat arcu. Pellentesque in massa eget lorem fermentum placerat in pellentesque purus. Suspendisse potenti. Integer interdum, felis quis porttitor volutpat, est mi rutrum massa, venenatis viverra neque lectus semper metus. Pellentesque in neque arcu. Ut at arcu blandit purus aliquet finibus. Suspendisse laoreet risus a gravida semper. Aenean scelerisque et sem vitae feugiat. Quisque et interdum diam, eu vehicula felis. Ut tempus quam eros, et sollicitudin ligula auctor at. Integer at tempus dui, quis pharetra purus. Duis venenatis tincidunt tellus nec efficitur. Nam at malesuada ligula." # noqa: E501 # pylint: disable=C0301
models = list ( Model )
@@ -113,6 +114,24 @@
Source code for tests.api.test_textgen_presets """
Preset . from_official ( model )
+
+
+
async def main ():
+
for model in models :
+
model : Model
+
+
await preset_from_default ( model )
+
await preset_from_official ( model )
+
+
async with API () as handle :
+
for model_preset in models_presets :
+
model_preset : Tuple [ Model , Preset ]
+
+
await test_presets ( handle , model_preset )
+
+
+
if __name__ == "__main__" :
+
asyncio . run ( main ())
@@ -144,13 +163,13 @@
Navigation
modules |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »Module code »tests.api.test_textgen_presets
diff --git a/_static/documentation_options.js b/_static/documentation_options.js
index 91f85c9..b8ad807 100644
--- a/_static/documentation_options.js
+++ b/_static/documentation_options.js
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
- VERSION: '0.22.0',
+ VERSION: '0.23.1',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
diff --git a/example/example.boilerplate.html b/example/example.boilerplate.html
index 415f341..ba28ce7 100644
--- a/example/example.boilerplate.html
+++ b/example/example.boilerplate.html
@@ -6,7 +6,7 @@
-
boilerplate — NovelAI API 0.22.0 documentation
+
boilerplate — NovelAI API 0.23.1 documentation
@@ -52,7 +52,7 @@
Navigation
previous |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »example directory »boilerplate
@@ -198,13 +198,13 @@
Navigation
previous |
-
NovelAI API 0.22.0 documentation »
+
NovelAI API 0.23.1 documentation »example directory »boilerplate 
