Datasets:
SWE-Dev
/
SWE-Dev-1

Dataset card Data Studio Files Community
repo
stringlengths
5
69
instance_id
stringlengths
11
74
base_commit
stringlengths
40
40
patch
stringlengths
169
823k
test_patch
stringclasses
1 value
problem_statement
stringlengths
22
84.7k
hints_text
stringlengths
0
274k
created_at
timestamp[ns]date
2013-07-02 23:04:30
2024-12-13 21:22:22
environment_setup_commit
stringclasses
1 value
version
stringclasses
1 value
FAIL_TO_PASS
sequencelengths
0
0
PASS_TO_PASS
sequencelengths
0
0
zarr-developers/numcodecs
zarr-developers__numcodecs-515
1be12d3ae13ad900ef8f70228b30c86f225eee32
diff --git a/docs/release.rst b/docs/release.rst index b569015c..17f146e9 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -26,7 +26,8 @@ Enhancements Fix ~~~ - +* Fix VLenUTF8 encoding for read-only buffers. + By :user:`Isaac Virshup <ivirshup>`, :issue:`514`. * Fix skip of entry points backport tests By :user:`Elliott Sales de Andrade <QuLogic>`, :issue:`487`. * Fix Upgrade to Zstd 1.5.5 due to potential corruption. diff --git a/numcodecs/vlen.pyx b/numcodecs/vlen.pyx index a1ff0e26..e1e149ee 100644 --- a/numcodecs/vlen.pyx +++ b/numcodecs/vlen.pyx @@ -7,6 +7,7 @@ import cython cimport cython +from numpy cimport ndarray import numpy as np from .abc import Codec from .compat_ext cimport Buffer @@ -74,7 +75,7 @@ class VLenUTF8(Codec): def encode(self, buf): cdef: Py_ssize_t i, l, n_items, data_length, total_length - object[:] input_values + ndarray[object, ndim=1] input_values object[:] encoded_values int[:] encoded_lengths char* encv diff --git a/pyproject.toml b/pyproject.toml index 319b29d7..af8f040a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,8 @@ requires = [ "setuptools>=64", "setuptools-scm[toml]>=6.2", "Cython", - "py-cpuinfo" + "py-cpuinfo", + "numpy", ] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index ea8bc64c..e594a203 100644 --- a/setup.py +++ b/setup.py @@ -196,12 +196,13 @@ def lz4_extension(): def vlen_extension(): info('setting up vlen extension') + import numpy extra_compile_args = base_compile_args.copy() define_macros = [] # setup sources - include_dirs = ['numcodecs'] + include_dirs = ['numcodecs', numpy.get_include()] # define_macros += [('CYTHON_TRACE', '1')] sources = ['numcodecs/vlen.pyx']
VLenUTF8().encode(buffer) fails is buffer is read-only <!-- For bug reports, please follow the template below. For enhancement proposals, feel free to use whatever template makes sense. --> #### Minimal, reproducible code sample, a copy-pastable example if possible ```python import numpy as np from numcodecs import VLenUTF8 codec = VLenUTF8() a = np.array(list("abc"), dtype=object) a.flags.writeable = False codec.encode(a) ``` ```pytb --------------------------------------------------------------------------- ValueError Traceback (most recent call last) Cell In[39], line 9 6 a = np.array(list("abc"), dtype=object) 7 a.flags.writeable = False ----> 9 codec.encode(a) File numcodecs/vlen.pyx:87, in numcodecs.vlen.VLenUTF8.encode() File <stringsource>:663, in View.MemoryView.memoryview_cwrapper() File <stringsource>:353, in View.MemoryView.memoryview.__cinit__() ValueError: buffer source array is read-only ``` #### Problem description Short description: this shouldn't error, as the codec shouldn't care whether it can write to the buffer it's passed. Long description: * Pandas 3.0 will set copy on write by default * AnnData saves pandas dataframes to zarr stores * Encoding string columns now errors since numcodecs throws an error * This is made more urgent by dask-dataframe setting `copy-on-write=True` on import in the latest release I can't think of a reason that `.encode` would need to modify the buffer, so it shouldn't care that it's read-only. #### Version and installation information Please provide the following: * Value of ``numcodecs.__version__`` '0.12.1' * Version of Python interpreter Python 3.11.7 | packaged by conda-forge | (main, Dec 23 2023, 14:43:09) [GCC 12.3.0] * Operating system (Linux/Windows/Mac) Linux-5.15.0-100-generic-x86_64-with-glibc2.35 * How NumCodecs was installed pip into conda Also, if you think it might be relevant, please provide the output from ``pip list`` or ``conda list`` depending on which was used to install NumCodecs. <details> <summary> conda list </summary> ```python # packages in environment at /mnt/workspace/mambaforge/envs/scanpy-dev: # # Name Version Build Channel _libgcc_mutex 0.1 conda_forge conda-forge _openmp_mutex 4.5 2_gnu conda-forge anndata 0.10.5.post1 pypi_0 pypi annoy 1.17.3 pypi_0 pypi array-api-compat 1.4.1 pypi_0 pypi asciitree 0.3.3 pypi_0 pypi asttokens 2.4.1 pypi_0 pypi atk-1.0 2.38.0 hd4edc92_1 conda-forge attrs 23.2.0 pypi_0 pypi bokeh 3.3.4 pypi_0 pypi bzip2 1.0.8 hd590300_5 conda-forge ca-certificates 2023.11.17 hbcca054_0 conda-forge cairo 1.18.0 h3faef2a_0 conda-forge click 8.1.7 pypi_0 pypi cloudpickle 3.0.0 pypi_0 pypi comm 0.2.1 pypi_0 pypi contourpy 1.2.0 pypi_0 pypi cycler 0.12.1 pypi_0 pypi cython 3.0.8 pypi_0 pypi dask 2024.3.0 pypi_0 pypi dask-expr 1.0 pypi_0 pypi dask-glm 0.3.2 pypi_0 pypi dask-ml 2023.3.24 pypi_0 pypi debugpy 1.8.0 pypi_0 pypi decorator 5.1.1 pypi_0 pypi deprecated 1.2.14 pypi_0 pypi distributed 2024.1.1 pypi_0 pypi execnet 2.0.2 pypi_0 pypi executing 2.0.1 pypi_0 pypi expat 2.5.0 hcb278e6_1 conda-forge fasteners 0.19 pypi_0 pypi fbpca 1.0 pypi_0 pypi font-ttf-dejavu-sans-mono 2.37 hab24e00_0 conda-forge font-ttf-inconsolata 3.000 h77eed37_0 conda-forge font-ttf-source-code-pro 2.038 h77eed37_0 conda-forge font-ttf-ubuntu 0.83 h77eed37_1 conda-forge fontconfig 2.14.2 h14ed4e7_0 conda-forge fonts-conda-ecosystem 1 0 conda-forge fonts-conda-forge 1 0 conda-forge fonttools 4.47.2 pypi_0 pypi freetype 2.12.1 h267a509_2 conda-forge fribidi 1.0.10 h36c2ea0_0 conda-forge fsspec 2023.12.2 pypi_0 pypi future 0.18.3 pypi_0 pypi gdk-pixbuf 2.42.10 h829c605_4 conda-forge geosketch 1.2 pypi_0 pypi gettext 0.21.1 h27087fc_0 conda-forge giflib 5.2.1 h0b41bf4_3 conda-forge gprof2dot 2022.7.29 pypi_0 pypi graphite2 1.3.13 h58526e2_1001 conda-forge graphtools 1.5.3 pypi_0 pypi graphviz 9.0.0 h78e8752_1 conda-forge gtk2 2.24.33 h7f000aa_3 conda-forge gts 0.7.6 h977cf35_4 conda-forge h5py 3.10.0 pypi_0 pypi harfbuzz 8.3.0 h3d44ed6_0 conda-forge harmonypy 0.0.9 pypi_0 pypi icu 73.2 h59595ed_0 conda-forge igraph 0.11.3 pypi_0 pypi imageio 2.33.1 pypi_0 pypi importlib-metadata 7.0.1 pypi_0 pypi iniconfig 2.0.0 pypi_0 pypi intervaltree 3.1.0 pypi_0 pypi ipykernel 6.29.0 pypi_0 pypi ipython 8.20.0 pypi_0 pypi jedi 0.19.1 pypi_0 pypi jinja2 3.1.3 pypi_0 pypi joblib 1.3.2 pypi_0 pypi jupyter-client 8.6.0 pypi_0 pypi jupyter-core 5.7.1 pypi_0 pypi kiwisolver 1.4.5 pypi_0 pypi lazy-loader 0.3 pypi_0 pypi ld_impl_linux-64 2.40 h41732ed_0 conda-forge legacy-api-wrap 1.4 pypi_0 pypi leidenalg 0.10.2 pypi_0 pypi lerc 4.0.0 h27087fc_0 conda-forge libdeflate 1.19 hd590300_0 conda-forge libexpat 2.5.0 hcb278e6_1 conda-forge libffi 3.4.2 h7f98852_5 conda-forge libgcc-ng 13.2.0 h807b86a_4 conda-forge libgd 2.3.3 h119a65a_9 conda-forge libglib 2.78.3 h783c2da_0 conda-forge libgomp 13.2.0 h807b86a_4 conda-forge libiconv 1.17 hd590300_2 conda-forge libjpeg-turbo 3.0.0 hd590300_1 conda-forge libnsl 2.0.1 hd590300_0 conda-forge libpng 1.6.39 h753d276_0 conda-forge librsvg 2.56.3 he3f83f7_1 conda-forge libsqlite 3.44.2 h2797004_0 conda-forge libstdcxx-ng 13.2.0 h7e041cc_4 conda-forge libtiff 4.6.0 ha9c0a0a_2 conda-forge libuuid 2.38.1 h0b41bf4_0 conda-forge libwebp 1.3.2 h658648e_1 conda-forge libwebp-base 1.3.2 hd590300_0 conda-forge libxcb 1.15 h0b41bf4_0 conda-forge libxcrypt 4.4.36 hd590300_1 conda-forge libxml2 2.12.4 h232c23b_1 conda-forge libzlib 1.2.13 hd590300_5 conda-forge llvmlite 0.41.1 pypi_0 pypi locket 1.0.0 pypi_0 pypi magic-impute 3.0.0 pypi_0 pypi markdown-it-py 3.0.0 pypi_0 pypi markupsafe 2.1.4 pypi_0 pypi matplotlib 3.8.2 pypi_0 pypi matplotlib-inline 0.1.6 pypi_0 pypi matplotx 0.3.10 pypi_0 pypi mdurl 0.1.2 pypi_0 pypi memory-profiler 0.61.0 pypi_0 pypi msgpack 1.0.7 pypi_0 pypi multipledispatch 1.0.0 pypi_0 pypi natsort 8.4.0 pypi_0 pypi ncurses 6.4 h59595ed_2 conda-forge nest-asyncio 1.6.0 pypi_0 pypi networkx 3.2.1 pypi_0 pypi numba 0.58.1 pypi_0 pypi numcodecs 0.12.1 pypi_0 pypi numpy 1.26.3 pypi_0 pypi openssl 3.2.0 hd590300_1 conda-forge packaging 23.2 pypi_0 pypi pandas 2.2.0 pypi_0 pypi pango 1.50.14 ha41ecd1_2 conda-forge parso 0.8.3 pypi_0 pypi partd 1.4.1 pypi_0 pypi patsy 0.5.6 pypi_0 pypi pbr 6.0.0 pypi_0 pypi pcre2 10.42 hcad00b1_0 conda-forge perfplot 0.10.2 pypi_0 pypi pexpect 4.9.0 pypi_0 pypi pillow 10.2.0 pypi_0 pypi pip 23.3.2 pyhd8ed1ab_0 conda-forge pixman 0.43.2 h59595ed_0 conda-forge platformdirs 4.1.0 pypi_0 pypi pluggy 1.4.0 pypi_0 pypi profimp 0.1.0 pypi_0 pypi prompt-toolkit 3.0.43 pypi_0 pypi psutil 5.9.8 pypi_0 pypi pthread-stubs 0.4 h36c2ea0_1001 conda-forge ptyprocess 0.7.0 pypi_0 pypi pure-eval 0.2.2 pypi_0 pypi pyarrow 15.0.1 pypi_0 pypi pygments 2.17.2 pypi_0 pypi pygsp 0.5.1 pypi_0 pypi pynndescent 0.5.11 pypi_0 pypi pyparsing 3.1.1 pypi_0 pypi pytest 7.4.4 pypi_0 pypi pytest-mock 3.12.0 pypi_0 pypi pytest-nunit 1.0.4 pypi_0 pypi pytest-profiling 1.7.0 pypi_0 pypi pytest-xdist 3.5.0 pypi_0 pypi python 3.11.7 hab00c5b_1_cpython conda-forge python-dateutil 2.8.2 pypi_0 pypi python-graphviz 0.20.1 pypi_0 pypi pytz 2023.4 pypi_0 pypi pyyaml 6.0.1 pypi_0 pypi pyzmq 25.1.2 pypi_0 pypi readline 8.2 h8228510_1 conda-forge rich 13.7.1 pypi_0 pypi scanorama 1.7.4 pypi_0 pypi scanpy 1.10.0.dev197+g96e19540 pypi_0 pypi scikit-image 0.22.0 pypi_0 pypi scikit-learn 1.4.0 pypi_0 pypi scikit-misc 0.3.1 pypi_0 pypi scipy 1.12.0 pypi_0 pypi scprep 1.1.0 pypi_0 pypi scrublet 0.2.3 pypi_0 pypi seaborn 0.13.2 pypi_0 pypi session-info 1.0.0 pypi_0 pypi setuptools 69.0.3 pyhd8ed1ab_0 conda-forge six 1.16.0 pypi_0 pypi sortedcontainers 2.4.0 pypi_0 pypi sparse 0.15.1 pypi_0 pypi stack-data 0.6.3 pypi_0 pypi statsmodels 0.14.1 pypi_0 pypi stdlib-list 0.10.0 pypi_0 pypi tasklogger 1.2.0 pypi_0 pypi tblib 3.0.0 pypi_0 pypi texttable 1.7.0 pypi_0 pypi threadpoolctl 3.2.0 pypi_0 pypi tifffile 2023.12.9 pypi_0 pypi tk 8.6.13 noxft_h4845f30_101 conda-forge toolz 0.12.1 pypi_0 pypi tornado 6.4 pypi_0 pypi tqdm 4.66.1 pypi_0 pypi traitlets 5.14.1 pypi_0 pypi tzdata 2023.4 pypi_0 pypi umap-learn 0.5.5 pypi_0 pypi urllib3 2.1.0 pypi_0 pypi wcwidth 0.2.13 pypi_0 pypi wheel 0.42.0 pyhd8ed1ab_0 conda-forge wrapt 1.16.0 pypi_0 pypi xorg-kbproto 1.0.7 h7f98852_1002 conda-forge xorg-libice 1.1.1 hd590300_0 conda-forge xorg-libsm 1.2.4 h7391055_0 conda-forge xorg-libx11 1.8.7 h8ee46fc_0 conda-forge xorg-libxau 1.0.11 hd590300_0 conda-forge xorg-libxdmcp 1.1.3 h7f98852_0 conda-forge xorg-libxext 1.3.4 h0b41bf4_2 conda-forge xorg-libxrender 0.9.11 hd590300_0 conda-forge xorg-renderproto 0.11.1 h7f98852_1002 conda-forge xorg-xextproto 7.3.0 h0b41bf4_1003 conda-forge xorg-xproto 7.0.31 h7f98852_1007 conda-forge xyzservices 2023.10.1 pypi_0 pypi xz 5.2.6 h166bdaf_0 conda-forge zarr 2.17.1 pypi_0 pypi zict 3.0.0 pypi_0 pypi zipp 3.17.0 pypi_0 pypi zlib 1.2.13 hd590300_5 conda-forge zstd 1.5.5 hfc55251_0 conda-forge ``` </details>
Does `object[:] input_values` allow for `static` (meaning we promise not to change the values, as opposed to changing the value of the pointer) ? In true C-land, we cannot truly guarantee that code will not write to any buffer passed. Do you mean like: ``` Error compiling Cython file: ------------------------------------------------------------ ... @cython.wraparound(False) @cython.boundscheck(False) def encode(self, buf): cdef: Py_ssize_t i, l, n_items, data_length, total_length const object[:] values ^ ------------------------------------------------------------ numcodecs/vlen.pyx:351:12: Const/volatile base type cannot be a Python object ``` Apparently not. I would have thought that this is handleable since `pandas` is presumably passing these arrays into cython code. Pandas has recently started wrapping the low-level arrays into immutable ones, which is maybe why you are seeing this now. I assume they internally access the low-level writable buffer somewhere. I think this is part of their move towards arrow, since arrow buffers are supposed to be immutable (which makes sense when there are offsets/indexes around, rather than just values). > Pandas has recently started wrapping the low-level arrays into immutable ones It looks like if you access the `.array` backing a `Series` you can get a mutable interface to the memory via the public API. Unclear if I should rely on that though. If you're not doing any `._data` or similar, I don't see why not. It would fail for some extension array that doesn't offer that API, but some extension arrays wouldn't be appropriate input anyway. Or we could require the caller to always provide a raw, writable numpy-like.
2024-03-12T16:26:31
0.0
[]
[]
hasindu2008/slow5lib
hasindu2008__slow5lib-62
aa2e88e2bd5f2404b5ebb49e5894cfecf4cdc4b3
diff --git a/.gitignore b/.gitignore index c893fa00..0848971a 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,7 @@ dist/ pyslow5.egg-info/ docs/doxygen examples/xample.slow5.idx +/.eggs # testing output *actual* diff --git a/Makefile b/Makefile index fa10a117..2c5632fa 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ test: slow5lib pyslow5: make clean - rm -rf *.so python/pyslow5.cpp build/lib.* build/temp.* sdist + rm -rf *.so python/pyslow5.cpp build/lib.* build/temp.* build/bdist.* sdist pyslow5.egg-info dist python3 setup.py build cp build/lib.*/*.so ./ python3 < python/example.py diff --git a/examples/.gitignore b/examples/.gitignore index 4c7747e3..fa5d2564 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -5,3 +5,11 @@ header_attribute random_read_pthreads random_read_openmp *.idx +example_write_aux_multi.slow5 +example_write.slow5 +example_write_append.blow5 +example_write_append_aux.blow5 +example_write_aux.slow5 +example_write_aux_multi.slow5 +example_write_aux_multi.slow5 +example_write_append.slow5 diff --git a/python/README.md b/python/README.md index fced10c6..3b8ef9a2 100644 --- a/python/README.md +++ b/python/README.md @@ -1,11 +1,28 @@ # pyslow5 python library -The slow5 python library (pyslow5) allows a user to read slow5 and blow5 files. +The slow5 python library (pyslow5) allows a user to read and write slow5/blow5 files. ## Installation Initial setup and example info for environment + ###### slow5lib needs python3.4.2 or higher. + +If you only want to use the python library, then you can simply install using pip + +Using a virtual environment (see below if you need to install python) + +```bash +python3 -m venv path/to/slow5libvenv +source path/to/slow5libvenv/bin/activate +python3 -m pip install --upgrade pip +python3 -m pip install setuptools cython numpy wheel +# do this separately, after the libs above +python3 -m pip install pyslow5 +``` + +### Dev install + ```bash # If your native python3 meets this requirement, you can use that, or use a # specific version installed with deadsnakes below. If you install with deadsnakes, @@ -25,7 +42,7 @@ sudo apt install python3.7 python3.7-dev python3.7-venv # get zlib1g-dev sudo apt-get update && sudo apt-get install -y zlib1g-dev -# Chekc with +# Check with python3 --version # You will also need the python headers if you don't already have them installed. @@ -45,7 +62,8 @@ git clone [email protected]:hasindu2008/slow5lib.git cd slow5lib make -# CHOOSE A OR B: +# CHOOSE A OR B: +# (B is the cleanest method) # |=======================================================================| # |A. Install with pip if wheel is present, otherwise it uses setuptools | python3 -m pip install . --use-feature=in-tree-build @@ -71,12 +89,17 @@ python3 -m pip uninstall pyslow5 ## Usage +### Reading a file + #### `Open(FILE, mode, DEBUG=0)`: -The pyslow5 libraryr has one main Class, `pyslow5.Open` which opens a slow5/blow5 (slow5 for easy reference) file for reading. +The pyslow5 library has one main Class, `pyslow5.Open` which opens a slow5/blow5 (slow5 for easy reference) file for reading/writing. `FILE`: the file or filepath of the slow5 file to open -`mode`: mode in which to open the file. Currently, only `r` is accepted for read only. +`mode`: mode in which to open the file. ++ `r`= read only ++ `w`= write/overwrite ++ `a`= append This is designed to mimic Python's native Open() to help users remember the syntax @@ -122,6 +145,40 @@ for read in s5.seq_reads(pA=True, aux='all'): print("================================") ``` + +#### `seq_reads_multi(threads=4, batchsize=4096, pA=False, aux=None)`: + +Access all reads sequentially in an opened slow5, using multiple threads. ++ If readID is not found, `None` is returned. ++ threads = number of threads to use in C backend. ++ batchsize = number of reads to fetch at a time. Higher numbers use more ram, but is more efficient with more threads. ++ pA = Bool for converting signal to picoamps. ++ aux = `str` '<attr_name>'/'all' or list of names of auxiliary fields added to return dictionary, `None` if `<attr_name>` not found ++ returns `dict` = dictionary of main fields for read_id, with any aux fields added + +Example: + +```python +# create generator +reads = s5.seq_reads_multi(threads=2, batchsize=3) + +# print all readIDs +for read in reads: + print(read['read_id']) + +# or use directly in a for loop +for read in s5.seq_reads_multi(threads=2, batchsize=3, pA=True, aux='all'): + print("read_id:", read['read_id']) + print("read_group:", read['read_group']) + print("digitisation:", read['digitisation']) + print("offset:", read['offset']) + print("range:", read['range']) + print("sampling_rate:", read['sampling_rate']) + print("len_raw_signal:", read['len_raw_signal']) + print("signal:", read['signal'][:10]) + print("================================") +``` + #### `get_read(readID, pA=False, aux=None)`: Access a specific read using a unique readID. This is a ranom access method, using the index. @@ -143,7 +200,7 @@ if read is not None: #### `get_read_list(read_list, pA=False, aux=None)`: -Access a list of specific reads using a list `read_list` of unique readIDs. This is a random access method using the index, so order of readIDs does impact access speed. +Access a list of specific reads using a list `read_list` of unique readIDs. This is a random access method using the index. If an index does not exist, it will create one first. + If readID is not found, `None` is returned. + pA = Bool for converting signal to picoamps. + aux = `str` '<attr_name>'/'all' or list of names of auxiliary fields added to return dictionary, `None` if `<attr_name>` not found @@ -162,6 +219,28 @@ for r, read in zip(read_list,selected_reads): ``` +#### `get_read_list_multi(read_list, threads=4, batchsize=100, pA=False, aux=None):`: + +Access a list of specific reads using a list `read_list` of unique readIDs using multiple threads. This is a random access method using the index. If an index does not exist, it will create one first. ++ If readID is not found, `None` is returned. ++ threads = number of threads to use in C backend ++ batchsize = number of reads to fetch at a time. Higher numbers use more ram, but is more efficient with more threads. ++ pA = Bool for converting signal to picoamps. ++ aux = `str` '<attr_name>'/'all' or list of names of auxiliary fields added to return dictionary, `None` if `<attr_name>` not found ++ returns `dict` = dictionary of main fields for read_id, with any aux fields added +Example: + +```python +read_list = ["r1", "r3", "null_read", "r5", "r2", "r1"] +selected_reads = s5.get_read_list_multi(read_list, threads=2, batchsize=3) +for r, read in zip(read_list, selected_reads): + if read is not None: + print(r, read['read_id']) + else: + print(r, "read not found") +``` + + #### `get_header_names()`: Returns a list containing the uninon of header names from all read_groups @@ -188,4 +267,155 @@ Returns an ordered list of auxiliary attribute types (same order as get_aux_name This can mostly be ignored, but will be used in error tracing in the future, as auxiliary field requests have multiple types, each with their own calls, and not all are used. It could be the case a call for an auxiliary filed fails, and knowing which type the field is requesting is very helpful in understanding which function in C is being called, that could be causing the error. -See documentation for full example +### Writing a file + +To write a file, `mode` in `Open()` must be set to `'w'` and when appending, `'a'` + +#### `get_empty_header()`: + +Returns a dictionary containing all known header attributes with their values set to `None`. + +User can modify each value, and add or remove attributes to be used has header items. +All values end up stored as strings, and anything left as `None` will be skipped. +To write header, see `write_header()` + +Example: + +```python +s5 = slow5.Open(file,'w') +header = s5.get_empty_header() +``` + +#### `write_header(header, read_group=0)`: + +Write header to file + ++ `header` = populated dictionary from `get_empty_header()` ++ read_group = read group integer for when multiple runs are written to the same slow5 file ++ returns 0 on success, <0 on error with error code + +You must write `read_group=0` (default) first before writing any other read_groups, and it is advised to write read_groups in sequential order. + +Example: + +```python +# Get some empty headers +header = s5.get_empty_header() +header2 = s5.get_empty_header() + +# Populate headers with some test data +counter = 0 +for i in header: + header[i] = "test_{}".format(counter) + counter += 1 + +for i in header2: + header2[i] = "test_{}".format(counter) + counter += 1 + +# Write first read group +ret = s5.write_header(header) +print("ret: write_header(): {}".format(ret)) +# Write second read group, etc +ret = s5.write_header(header2, read_group=1) +print("ret: write_header(): {}".format(ret)) +``` + +#### `get_empty_record(aux=False)`: + +Get empty read record for populating with data. Use with `write_record()` + ++ aux = Bool for returning empty aux dictionary as well as read dictionary ++ returns a single read dictionary or a read and aux dictionary depending on aux flag + +Example: +```python +# open some file to read. We will copy the data then write it +# including aux fields +s5_read = slow5.Open(read_file,'r') +reads = s5_read.seq_reads(aux='all') + +# For each read in s5_read... +for read in reads: + # get an empty record and aux dictionary + record, aux = s5.get_empty_record(aux=True) + # for each field in read... + for i in read: + # if the field is in the record dictionary... + if i in record: + # copy the value over... + record[i] = read[i] + do same for aux dictionary + if i in aux: + aux[i] = read[i] + # write the record + ret = s5.write_record(record, aux) + print("ret: write_record(): {}".format(ret)) +``` + +#### `write_record(record, aux=None)`: + +Write a record and optional aux fields. + ++ record = a populated dictionary from `get_empty_record()` ++ aux = an empty aux record returned by `get_empty_record(aux=True)` ++ returns 0 on success and -1 on error/failure + +Example: + +```python + +record, aux = s5.get_empty_record(aux=True) +# populate record, aux dictionaries +#.... +# Write record +ret = s5.write_record(record, aux) +print("ret: write_record(): {}".format(ret)) +``` + + +#### `write_record_batch(records, threads=4, batchsize=4096, aux=None)`: + +Write a record and optional aux fields, using multiple threads + ++ records = a dictionary of dictionaries where each entry is a populated form of `get_empty_record()` with the key of each being the read['read_id']. ++ threads = number of threads to use in the C backend. ++ batchsize = number of reads to write at a time. If parsing 1000 records, with batchsize=250 and threads=4, 4 threads will be spawned 4 times to write 250 records to the file before returning ++ aux = an empty aux record returned by `get_empty_record(aux=True)` ++ returns 0 on success and -1 on error/failure + +Example: + +```python + +record, aux = s5.get_empty_record(aux=True) +# populate record, aux +#.... +records[record['read_id']] = record +auxs[record['read_id']] = aux +# Write record +ret = s5.write_record_batch(records, threads=2, batchsize=3, aux=auxs) +print("ret: write_record(): {}".format(ret)) +``` + +#### `close()`: + +Closes a record open for writing or appending, and writes an End Of File (EOF) flag. + +If not explicitly closed, when the `s5` object goes out of context in python, it will also trigger a close to attempt to avoid having a missing EOF. + +Please call this when you are finished writing a file. + +Example: + +```python +s5 = slow5.Open(file,'w') + +# do some writing.... + +# Write's EOF and closes file +s5.close() +``` + + +See documentation for full examples diff --git a/python/example.py b/python/example.py index 71c20c52..356c2776 100644 --- a/python/example.py +++ b/python/example.py @@ -125,7 +125,8 @@ val = s5.get_header_value(attr) print("{}: {}".format(attr, val)) - +s5.close() +print("==============================================") s52 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) print("get_read check, 0d624d4b-671f-40b8-9798-84f2ccc4d7fc") read1 = s52.get_read("0d624d4b-671f-40b8-9798-84f2ccc4d7fc", aux=["read_number", "start_mux", "blah"]) @@ -184,5 +185,431 @@ print(read['read_id']) print("read_number", read['read_number']) +s52.close() +print("==============================================") + +print("write reads no aux") + +F = slow5.Open('examples/example_write.slow5','w', DEBUG=debug) +header = F.get_empty_header() + +counter = 0 +for i in header: + header[i] = "test_{}".format(counter) + counter += 1 + +ret = F.write_header(header) +print("ret: write_header(): {}".format(ret)) + +s58 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s58.seq_reads() + +for read in reads: + record = F.get_empty_record() + for i in read: + if i in record: + record[i] = read[i] + ret = F.write_record(record) + print("ret: write_record(): {}".format(ret)) + +F.close() + +print("==============================================") + +print("append reads no aux") + +F = slow5.Open('examples/example_write_append.blow5','w', DEBUG=debug) +header = F.get_empty_header() + +counter = 0 +for i in header: + header[i] = "test_{}".format(counter) + counter += 1 + +ret = F.write_header(header) +print("ret: write_header(): {}".format(ret)) + +s58 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s58.seq_reads() + +read_count = 0 +for read in reads: + record = F.get_empty_record() + for i in read: + if i in record: + record[i] = read[i] + ret = F.write_record(record) + print("ret: write_record(): {}".format(ret)) + +s58.close() +F.close() + +F2 = slow5.Open('examples/example_write_append.blow5','a', DEBUG=debug) + +print("get_all_headers") +headers = F2.get_all_headers() +print(headers) + +s58 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s58.seq_reads() + +for read in reads: + record = F2.get_empty_record() + for i in read: + if i in record: + if i == "read_id": + j = read[i]+"_append" + record[i] = j + else: + record[i] = read[i] + ret = F2.write_record(record) + print("ret: write_record(): {}".format(ret)) + +s58.close() +F.close() + + +print("==============================================") +print("write reads with aux") + +F = slow5.Open('examples/example_write_aux.slow5','w', DEBUG=debug) +header = F.get_empty_header() +header2 = F.get_empty_header() + +counter = 0 +for i in header: + header[i] = "test_{}".format(counter) + counter += 1 + +for i in header2: + header2[i] = "test_{}".format(counter) + counter += 1 + +ret = F.write_header(header) +print("ret: write_header(): {}".format(ret)) +ret = F.write_header(header2, read_group=1) +print("ret: write_header(): {}".format(ret)) + +s58 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s58.seq_reads(aux='all') + +for read in reads: + record, aux = F.get_empty_record(aux=True) + for i in read: + if i in record: + record[i] = read[i] + if i in aux: + aux[i] = read[i] + ret = F.write_record(record, aux) + print("ret: write_record(): {}".format(ret)) + +s58.close() +F.close() + print("==============================================") +print("append reads with aux") + +F = slow5.Open('examples/example_write_append_aux.blow5','w', DEBUG=debug) +header = F.get_empty_header() +header2 = F.get_empty_header() + +counter = 0 +for i in header: + header[i] = "test_{}".format(counter) + counter += 1 + +for i in header2: + header2[i] = "test_{}".format(counter) + counter += 1 + +ret = F.write_header(header) +print("ret: write_header(): {}".format(ret)) +ret = F.write_header(header2, read_group=1) +print("ret: write_header(): {}".format(ret)) + +s58 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s58.seq_reads(aux='all') + +for read in reads: + record, aux = F.get_empty_record(aux=True) + for i in read: + if i in record: + record[i] = read[i] + if i in aux: + aux[i] = read[i] + ret = F.write_record(record, aux) + print("ret: write_record(): {}".format(ret)) + +s58.close() +F.close() + +F2 = slow5.Open('examples/example_write_append_aux.blow5','a', DEBUG=debug) + +s58 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s58.seq_reads(aux='all') + +for read in reads: + record, aux = F2.get_empty_record(aux=True) + for i in read: + if i in record: + if i == "read_id": + j = read[i]+"_append" + record[i] = j + else: + record[i] = read[i] + if i in aux: + aux[i] = read[i] + ret = F2.write_record(record, aux) + print("ret: write_record(): {}".format(ret)) + +s58.close() +F.close() + + + +print("==============================================") + +print("seq_reads_multi with aux:") +s53 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s53.seq_reads_multi(threads=2, batchsize=3, pA=True, aux='all') +print("type check reads:", type(reads)) +for read in reads: + print(read['read_id']) + print("read_number", read['read_number']) + +print("==============================================") + +print("get_reads_multi with aux:") + +read_list = ['r0', + 'r1', + 'r2', + 'r3', + 'r4', + 'r5', + '0a238451-b9ed-446d-a152-badd074006c4', + '0d624d4b-671f-40b8-9798-84f2ccc4d7fc'] + +s53.close() + +s53 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s53.get_read_list_multi(read_list, threads=2, batchsize=3, pA=True, aux='all') +print("type check reads:", type(reads)) +for read in reads: + print(read['read_id']) + print("read_number", read['read_number']) + +s53.close() +print("==============================================") +print("write reads with aux multi") + +F = slow5.Open('examples/example_write_aux_multi.slow5','w', DEBUG=debug) +header = F.get_empty_header() +header2 = F.get_empty_header() + +counter = 0 +for i in header: + header[i] = "test_{}".format(counter) + counter += 1 + +for i in header2: + header2[i] = "test_{}".format(counter) + counter += 1 + +ret = F.write_header(header) +print("ret: write_header(): {}".format(ret)) +ret = F.write_header(header2, read_group=1) +print("ret: write_header(): {}".format(ret)) + +s58 = slow5.Open('examples/example2.slow5','r', DEBUG=debug) +reads = s58.seq_reads(aux='all') + +records = {} +auxs = {} +for read in reads: + record, aux = F.get_empty_record(aux=True) + # record = F.get_empty_record() + for i in read: + if i == "read_id": + readID = read[i] + if i in record: + record[i] = read[i] + if i in aux: + aux[i] = read[i] + records[readID] = record + auxs[readID] = aux +print(records) +print(auxs) +ret = F.write_record_batch(records, threads=2, batchsize=3, aux=auxs) +print("ret: write_record(): {}".format(ret)) + +s58.close() +F.close() + +print("==============================================") +# print("seq_reads with big file:") +# start_time = time.time() +# s53 = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/FAK40634_d1cc054609fe2c5fcdeac358864f9dc81c8bb793_95.blow5','r', DEBUG=debug) +# reads = s53.seq_reads(pA=True, aux='all') +# # print("type check reads:", type(reads)) +# for read in reads: +# print(read['read_id']) +# # print("read_number", read['read_number']) +# seq_time = round(time.time() - start_time, 4) +# print("get_read in: {} seconds".format(seq_time)) +# +# print("==============================================") +# print("seq_reads_multi with big file:") +# start_time = time.time() +# s53 = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/FAK40634_d1cc054609fe2c5fcdeac358864f9dc81c8bb793_95.blow5','r', DEBUG=debug) +# reads = s53.seq_reads_multi(threads=8, batchsize=10, pA=True, aux='all') +# # print("type check reads:", type(reads)) +# for read in reads: +# print(read['read_id']) +# # print("read_number", read['read_number']) +# seq_multi_time = round(time.time() - start_time, 4) +# print("get_read in: {} seconds".format(seq_multi_time)) +# +# print("==============================================") +# +# print("single seq/write with big file:") +# start_time = time.time() +# sR = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/FAK40634_d1cc054609fe2c5fcdeac358864f9dc81c8bb793_95.blow5','r', DEBUG=debug) +# reads = sR.seq_reads(aux='all') +# sW = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/single_read_write.blow5','w', DEBUG=debug) +# +# header = F.get_empty_header() +# +# counter = 0 +# for i in header: +# header[i] = "test_{}".format(counter) +# counter += 1 +# +# ret = sW.write_header(header) +# print("ret: write_header(): {}".format(ret)) +# +# for read in reads: +# record, aux = sW.get_empty_record(aux=True) +# for i in read: +# if i in record: +# record[i] = read[i] +# if i in aux: +# aux[i] = read[i] +# ret = sW.write_record(record, aux) +# +# single_seq_write_time = round(time.time() - start_time, 4) +# print("single seq/write in: {} seconds".format(single_seq_write_time)) +# +# print("==============================================") +# print("multi seq, single write with big file:") +# start_time = time.time() +# sR = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/FAK40634_d1cc054609fe2c5fcdeac358864f9dc81c8bb793_95.blow5','r', DEBUG=debug) +# reads = sR.seq_reads_multi(threads=4, batchsize=100, aux='all') +# sW = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/multi_read_single_write.blow5','w', DEBUG=debug) +# header = F.get_empty_header() +# +# counter = 0 +# for i in header: +# header[i] = "test_{}".format(counter) +# counter += 1 +# +# ret = sW.write_header(header) +# print("ret: write_header(): {}".format(ret)) +# +# for read in reads: +# record, aux = sW.get_empty_record(aux=True) +# for i in read: +# if i in record: +# record[i] = read[i] +# if i in aux: +# aux[i] = read[i] +# ret = sW.write_record(record, aux) +# +# multi_seq_single_write_time = round(time.time() - start_time, 4) +# print("multi seq, single write in: {} seconds".format(multi_seq_single_write_time)) +# +# print("==============================================") +# print("single seq, multi write with big file:") +# start_time = time.time() +# sR = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/FAK40634_d1cc054609fe2c5fcdeac358864f9dc81c8bb793_95.blow5','r', DEBUG=debug) +# reads = sR.seq_reads(aux='all') +# sW = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/single_read_multi_write.blow5','w', DEBUG=debug) +# +# header = sW.get_empty_header() +# +# counter = 0 +# for i in header: +# header[i] = "test_{}".format(counter) +# counter += 1 +# +# ret = sW.write_header(header) +# print("ret: write_header(): {}".format(ret)) +# +# records = {} +# auxs = {} +# for read in reads: +# record, aux = sW.get_empty_record(aux=True) +# for i in read: +# if i == "read_id": +# readID = read[i] +# if i in record: +# record[i] = read[i] +# if i in aux: +# aux[i] = read[i] +# records[readID] = record +# auxs[readID] = aux +# if len(records) >= 100: +# ret = sW.write_record_batch(records, threads=4, batchsize=100, aux=auxs) +# records = {} +# auxs = {} +# +# single_seq_multi_write_time = round(time.time() - start_time, 4) +# print("single seq, multi write in: {} seconds".format(single_seq_multi_write_time)) +# +# print("==============================================") +# print("multi seq/write with big file:") +# start_time = time.time() +# sR = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/FAK40634_d1cc054609fe2c5fcdeac358864f9dc81c8bb793_95.blow5','r', DEBUG=debug) +# reads = sR.seq_reads_multi(threads=4, batchsize=100, aux='all') +# sW = slow5.Open('/home/jamfer/Data/SK/multi_fast5/s5/multi_read_write.blow5','w', DEBUG=debug) +# +# +# header = sW.get_empty_header() +# +# counter = 0 +# for i in header: +# header[i] = "test_{}".format(counter) +# counter += 1 +# +# ret = sW.write_header(header) +# print("ret: write_header(): {}".format(ret)) +# +# records = {} +# auxs = {} +# for read in reads: +# record, aux = sW.get_empty_record(aux=True) +# for i in read: +# if i == "read_id": +# readID = read[i] +# if i in record: +# record[i] = read[i] +# if i in aux: +# aux[i] = read[i] +# records[readID] = record +# auxs[readID] = aux +# if len(records) >= 100: +# ret = sW.write_record_batch(records, threads=4, batchsize=100, aux=auxs) +# records = {} +# auxs = {} +# multi_seq_write_time = round(time.time() - start_time, 4) +# print("multi seq/write in: {} seconds".format(multi_seq_write_time)) +# +# print("==============================================") +# +# print("big file times:") +# print("single seq/write in: {} seconds".format(single_seq_write_time)) +# print("multi seq, single write in: {} seconds".format(multi_seq_single_write_time)) +# print("single seq, multi write in: {} seconds".format(single_seq_multi_write_time)) +# print("multi seq/write in: {} seconds".format(multi_seq_write_time)) + print("done") diff --git a/python/pydebug.sh b/python/pydebug.sh index 520cefc3..9da6db7f 100755 --- a/python/pydebug.sh +++ b/python/pydebug.sh @@ -8,3 +8,4 @@ CFLAGS="-fsanitize=address -fno-omit-frame-pointer" python3 setup.py build cp build/lib.*/*.so ./ echo $GCC_ASAN_PRELOAD LD_PRELOAD=$GCC_ASAN_PRELOAD python3 < python/example.py +# LD_PRELOAD=$GCC_ASAN_PRELOAD python3 -m unittest -v python/test.py diff --git a/python/pyslow5.pxd b/python/pyslow5.pxd index 1d86bd78..9360f0eb 100644 --- a/python/pyslow5.pxd +++ b/python/pyslow5.pxd @@ -1,8 +1,8 @@ +#cython: language_level=3 from libc.stdio cimport * from libc.stdint cimport * from libc.stdlib cimport * - cdef extern from "pyslow5.h": cdef enum slow5_aux_type: @@ -31,6 +31,11 @@ cdef extern from "pyslow5.h": SLOW5_STRING, SLOW5_ENUM_ARRAY + ctypedef struct slow5_aux_meta_t: + pass + + ctypedef struct slow5_hdr_data_t: + pass ctypedef struct slow5_version: uint8_t major @@ -42,7 +47,9 @@ cdef extern from "pyslow5.h": ctypedef struct slow5_hdr_t: slow5_version version; uint32_t num_read_groups; - pass + slow5_hdr_data_t data; + slow5_aux_meta_t *aux_meta; + ctypedef struct slow5_idx_t: pass ctypedef enum slow5_fmt: @@ -58,8 +65,8 @@ cdef extern from "pyslow5.h": slow5_idx_t *index slow5_file_meta_t meta - ctypedef struct slow5_rec_t: + uint16_t read_id_len char* read_id uint32_t read_group double digitisation @@ -71,18 +78,21 @@ cdef extern from "pyslow5.h": pass - # Open a slow5 file - slow5_file_t *slow5_open(const char *pathname, const char *mode) + slow5_file_t *slow5_open(const char *pathname, const char *mode); const char **slow5_get_hdr_keys(const slow5_hdr_t *header, uint64_t *len); char *slow5_hdr_get(const char *attr, uint32_t read_group, const slow5_hdr_t *header); - int slow5_close(slow5_file_t *s5p) - int slow5_idx_load(slow5_file_t *s5p) - int slow5_get(const char *read_id, slow5_rec_t **read, slow5_file_t *s5p) - int slow5_get_next(slow5_rec_t **read, slow5_file_t *s5p) + void slow5_idx_unload(slow5_file_t *s5p); + int slow5_close(slow5_file_t *s5p); + int slow5_idx_load(slow5_file_t *s5p); + int slow5_get(const char *read_id, slow5_rec_t **read, slow5_file_t *s5p); + int slow5_get_next(slow5_rec_t **read, slow5_file_t *s5p); char **slow5_get_aux_names(const slow5_hdr_t *header, uint64_t *len); slow5_aux_type *slow5_get_aux_types(const slow5_hdr_t *header, uint64_t *len); - void slow5_rec_free(slow5_rec_t *read) + void slow5_rec_free(slow5_rec_t *read); + + + int8_t slow5_aux_get_int8(const slow5_rec_t *read, const char *attr, int *err); int16_t slow5_aux_get_int16(const slow5_rec_t *read, const char *attr, int *err); @@ -95,6 +105,7 @@ cdef extern from "pyslow5.h": float slow5_aux_get_float(const slow5_rec_t *read, const char *attr, int *err); double slow5_aux_get_double(const slow5_rec_t *read, const char *attr, int *err); char slow5_aux_get_char(const slow5_rec_t *read, const char *attr, int *err); + uint8_t slow5_aux_get_enum(const slow5_rec_t *read, const char *field, int *err); int8_t *slow5_aux_get_int8_array(const slow5_rec_t *read, const char *attr, uint64_t *len, int *err); int16_t *slow5_aux_get_int16_array(const slow5_rec_t *read, const char *attr, uint64_t *len, int *err); int32_t *slow5_aux_get_int32_array(const slow5_rec_t *read, const char *attr, uint64_t *len, int *err); @@ -106,3 +117,40 @@ cdef extern from "pyslow5.h": float *slow5_aux_get_float_array(const slow5_rec_t *read, const char *attr, uint64_t *len, int *err); double *slow5_aux_get_double_array(const slow5_rec_t *read, const char *attr, uint64_t *len, int *err); char *slow5_aux_get_string(const slow5_rec_t *read, const char *attr, uint64_t *len, int *err); + uint8_t *slow5_aux_get_enum_array(const slow5_rec_t *read, const char *field, uint64_t *len, int *err); + + + # Write slow5 file + + # from slow5.h + int slow5_hdr_add_attr(const char *attr, slow5_hdr_t *header); + int slow5_hdr_set(const char *attr, const char *value, uint32_t read_group, slow5_hdr_t *header); + int64_t slow5_hdr_add_rg(slow5_hdr_t *header); + slow5_rec_t *slow5_rec_init(); + + # from slow5_extra.h + + int slow5_aux_meta_add(slow5_aux_meta_t *aux_meta, const char *attr, slow5_aux_type type); + int slow5_rec_set_string(slow5_rec_t *read, slow5_aux_meta_t *aux_meta, const char *attr, const char *data); + int slow5_rec_set(slow5_rec_t *read, slow5_aux_meta_t *aux_meta, const char *attr, const void *data); + +cdef extern from "slow5_write.h": + + # Write slow5 file + + #from slow5_write.h + slow5_file_t *slow5_open_write(char *filename, char *mode); + slow5_file_t *slow5_open_write_append(char *filename, char *mode); + int slow5_close_write(slow5_file_t *sf); + int slow5_header_write(slow5_file_t *sf); + int slow5_rec_write(slow5_file_t *sf, slow5_rec_t *rec); + int slow5_aux_meta_add_wrapper(slow5_hdr_t *header, const char *attr, slow5_aux_type type); + int slow5_rec_set_wrapper(slow5_rec_t *read, slow5_hdr_t *header, const char *attr, const void *data); + int slow5_rec_set_string_wrapper(slow5_rec_t *read, slow5_hdr_t *header, const char *attr, const char *data); + +cdef extern from "slow5threads.h": + + int slow5_get_batch(slow5_rec_t ***read, slow5_file_t *s5p, char **rid, int num_rid, int num_threads); + int slow5_get_next_batch(slow5_rec_t ***read, slow5_file_t *s5p, int batch_size, int num_threads); + int slow5_write_batch(slow5_rec_t **read, slow5_file_t *s5p, int batch_size, int num_threads); + void slow5_free_batch(slow5_rec_t ***read, int num_rec); diff --git a/python/pyslow5.pyx b/python/pyslow5.pyx index a5e5fe74..3567cc27 100644 --- a/python/pyslow5.pyx +++ b/python/pyslow5.pyx @@ -1,8 +1,11 @@ - # distutils: language = c++ # cython: language_level=3 +# cython: profile=True import sys +import time import logging +import copy +from itertools import chain from libc.stdlib cimport malloc, free from libc.string cimport strdup cimport pyslow5 @@ -15,14 +18,22 @@ cimport numpy as np np.import_array() # -# Class Open is for read-only of slow5/blow5 files. +# Class Open for reading and writing slow5/blow5 files +# m attribute sets the read/write state and file extension of p sets the type # cdef class Open: cdef pyslow5.slow5_file_t *s5 cdef pyslow5.slow5_rec_t *rec cdef pyslow5.slow5_rec_t *read + cdef pyslow5.slow5_rec_t *write + cdef pyslow5.slow5_rec_t **twrite + cdef pyslow5.slow5_rec_t **trec + cdef char **rid cdef bint index_state + cdef bint header_state + cdef bint header_add_attr_state + cdef bint close_state cdef pyslow5.uint64_t head_len cdef pyslow5.uint64_t aux_len cdef pyslow5.slow5_aux_type *s5_aux_type @@ -30,8 +41,11 @@ cdef class Open: cdef pyslow5.uint64_t aux_get_len cdef np.npy_intp shape_get[1] cdef np.npy_intp shape_seq[1] - cdef const char* p - cdef const char* m + cdef char* p + cdef str path + cdef char* m + cdef str mode + cdef int state cdef int V cdef object logger cdef list aux_names @@ -48,6 +62,7 @@ cdef class Open: cdef pyslow5.float e8 cdef double e9 cdef char e10 + cdef int e11 cdef pyslow5.int8_t *e12 cdef pyslow5.int16_t *e13 cdef pyslow5.int32_t *e14 @@ -59,16 +74,48 @@ cdef class Open: cdef float *e20 cdef double *e21 cdef char *e22 # meant to be string, not sure about this + cdef char *channel_number + cdef char *median_before + cdef char *read_number + cdef char *start_mux + cdef char *start_time + cdef char *end_reason # need to add end_reason_val + cdef char *channel_number_val + cdef double median_before_val + cdef pyslow5.int32_t read_number_val + cdef pyslow5.uint8_t start_mux_val + cdef pyslow5.uint64_t start_time_val + cdef char **channel_number_val_array + cdef double *median_before_val_array + cdef pyslow5.int32_t *read_number_val_array + cdef pyslow5.uint8_t *start_mux_val_array + cdef pyslow5.uint64_t *start_time_val_array + cdef pyslow5.float total_time_slow5_get_next + cdef pyslow5.float total_time_yield_reads + cdef pyslow5.float total_single_write_time + cdef pyslow5.float total_multi_write_signal_time + cdef pyslow5.float total_multi_write_time def __cinit__(self, pathname, mode, DEBUG=0): # Set to default NULL type self.s5 = NULL self.rec = NULL self.read = NULL + self.write = NULL + self.twrite = NULL + self.path = "" self.p = "" + self.mode = "" self.m = "" + # state for read/write. -1=null, 0=read, 1=write, 2=append + self.state = -1 + self.trec = NULL + self.rid = NULL self.index_state = False + self.header_state = False + self.header_add_attr_state = False + self.close_state = False self.s5_aux_type = NULL self.aux_get_err = 1 self.aux_get_len = 0 @@ -87,6 +134,7 @@ cdef class Open: self.e8 = -1.0 self.e9 = -1.0 self.e10 = 0 + self.e11 = 0 self.e12 = NULL self.e13 = NULL self.e14 = NULL @@ -98,6 +146,30 @@ cdef class Open: self.e20 = NULL self.e21 = NULL self.e22 = NULL + self.channel_number = strdup("channel_number") + self.median_before = strdup("median_before") + self.read_number = strdup("read_number") + self.start_mux = strdup("start_mux") + self.start_time = strdup("start_time") + self.end_reason = strdup("end_reason") + channel_number_val = NULL + median_before_val = -1.0 + read_number_val = -1 + start_mux_val = -1 + start_time_val = -1 + channel_number_val_array = NULL + median_before_val_array = NULL + read_number_val_array = NULL + start_mux_val_array = NULL + start_time_val_array = NULL + + + # cdef something end_reason # some enum + self.total_time_slow5_get_next = 0.0 + self.total_time_yield_reads = 0.0 + self.total_single_write_time = 0.0 + self.total_multi_write_signal_time = 0.0 + self.total_multi_write_time = 0.0 # sets up logging level/verbosity self.V = DEBUG @@ -118,24 +190,51 @@ cdef class Open: -5: ["SLOW5_ERR_IO", "other file I/O error"], -6: ["SLOW5_ERR_NOIDX", "index not loaded"], -7: ["SLOW5_ERR_NOTFOUND", "read id not found"], - } + -8: ["SLOW5_ERR_OTH", "other error (big endian, internal error, etc.)"], + -9: ["SLOW5_ERR_UNK", "file format unknown"], + -10: ["SLOW5_ERR_MEM", "memory (re)allocation error"], + -11: ["SLOW5_ERR_NOAUX", "no auxiliary map"], + -12: ["SLOW5_ERR_NOFLD", "field not found"], + -13: ["SLOW5_ERR_PRESS", "(de)compression failure"], + -14: ["SLOW5_ERR_MAGIC", "magic number invalid"], + -15: ["SLOW5_ERR_VERSION", "version incompatible"], + -16: ["SLOW5_ERR_HDRPARSE", "header parsing error"], + -17: ["SLOW5_ERR_TYPE", "error relating to slow5 type"]} p = str.encode(pathname) + self.path = pathname self.p = strdup(p) m = str.encode(mode) + self.mode = mode self.m = strdup(m) - # print binary strings of filepath and mode - self.logger.debug("FILE: {}, mode: {}".format(self.p.decode(), self.m.decode())) + self.logger.debug("FILE: {}, mode: {}".format(self.path, self.mode)) self.logger.debug("FILE: {}, mode: {}".format(self.p, self.m)) - # opens file and creates slow5 object - self.s5 = pyslow5.slow5_open(self.p, self.m) + # Set state based on mode for file opening + # state for read/write. -1=null, 0=read, 1=write, 2=append + if mode == "r": + self.state = 0 + elif mode == "w": + self.state = 1 + elif mode == "a": + self.state = 2 + else: + self.state = -1 + # opens file and creates slow5 object for reading + if self.state == 0: + self.s5 = pyslow5.slow5_open(self.p, self.m) + self.logger.debug("Number of read_groups: {}".format(self.s5.header.num_read_groups)) + elif self.state == 1: + self.s5 = slow5_open_write(self.p, self.m) + if self.s5 is NULL: + self.logger.error("File '{}' could not be opened for writing.".format(self.path)) + elif self.state == 2: + self.s5 = slow5_open_write_append(self.p, self.m) + if self.s5 is NULL: + self.logger.error("File '{}' could not be opened for writing - appending.".format(self.path)) + else: + self.logger.error("File '{}' unknown open method: {}".format(self.path, self.mode)) + # check object was actually created. if self.s5 is NULL: raise MemoryError() - # load or create and load index - self.logger.debug("Number of read_groups: {}".format(self.s5.header.num_read_groups)) - # self.logger.debug("Creating/loading index...") - # ret = slow5_idx_load(self.s5) - # if ret != 0: - # self.logger.warning("slow5_idx_load return not 0: {}: {}".format(ret, self.error_codes[ret])) def __init__(self, pathname, mode, DEBUG=0): @@ -144,12 +243,45 @@ cdef class Open: def __dealloc__(self): + if self.p is not NULL: + free(self.p) + if self.m is not NULL: + free(self.m) if self.rec is not NULL: slow5_rec_free(self.rec) if self.read is not NULL: slow5_rec_free(self.read) - if self.s5 is not NULL: - pyslow5.slow5_close(self.s5) + if self.write is not NULL: + slow5_rec_free(self.write) + if self.state in [1, 2]: + if not self.close_state: + if self.s5 is not NULL: + slow5_close_write(self.s5) + self.close_state = True + self.logger.debug("{} closed".format(self.path)) + else: + self.logger.debug("{} already closed".format(self.path)) + if self.state == 0: + if not self.close_state: + if self.s5 is not NULL: + slow5_idx_unload(self.s5) + slow5_close(self.s5) + self.close_state = True + self.logger.debug("{} closed".format(self.path)) + + free(self.channel_number) + free(self.median_before) + free(self.read_number) + free(self.start_mux) + free(self.start_time) + free(self.end_reason) + + self.logger.debug("pathname: {}".format(self.path)) + self.logger.debug("total_time_slow5_get_next: {} seconds".format(self.total_time_slow5_get_next)) + self.logger.debug("total_time_yield_reads: {} seconds".format(self.total_time_yield_reads)) + self.logger.debug("total_single_write_time: {} seconds".format(self.total_single_write_time)) + self.logger.debug("total_multi_write_signal_time: {} seconds".format(self.total_multi_write_signal_time)) + self.logger.debug("total_multi_write_time: {} seconds".format(self.total_multi_write_time)) def _convert_to_pA(self, d): @@ -159,6 +291,7 @@ cdef class Open: for (int32_t j = 0; j < nsample; j++) { rawptr[j] = (rawptr[j] + offset) * raw_unit; } + TODO: Use memory view for the loop so it's faster ''' digitisation = d['digitisation'] range = d['range'] @@ -168,9 +301,13 @@ cdef class Open: # for i in d['signal']: # j = (i + offset) * raw_unit # new_raw.append(float("{0:.2f}".format(round(j,2)))) - new_raw = np.array(raw_unit * (d['signal'] + offset), dtype=np.float32) + # new_raw = np.array(raw_unit * (d['signal'] + offset), dtype=np.float32) + new_raw = (raw_unit * (d['signal'] + offset)).astype(np.float32) return new_raw + # ========================================================================== + # Read SLOW5 file + # ========================================================================== def _get_read(self, read_id, pA, aux): ''' @@ -180,8 +317,8 @@ cdef class Open: returns dic = dictionary of main fields for read_id, with any aux fields added ''' if not self.index_state: - self.logger.debug("FILE: {}, mode: {}".format(self.p.decode(), self.m.decode())) - self.logger.debug("FILE: {}, mode: {}".format(self.p, self.m)) + self.logger.debug("FILE: {}, mode: {}".format(self.path, self.mode)) + # self.logger.debug("FILE: {}, mode: {}".format(self.path, self.m)) self.logger.debug("Creating/loading index...") ret = slow5_idx_load(self.s5) if ret != 0: @@ -254,8 +391,8 @@ cdef class Open: # dic['signal'] = [self.rec.raw_signal[i] for i in range(self.rec.len_raw_signal)] # cdef np.npy_intp shape_get[1] self.shape_get[0] = <np.npy_intp> self.rec.len_raw_signal - signal = np.PyArray_SimpleNewFromData(1, self.shape_get, - np.NPY_INT16, <void *> self.rec.raw_signal) + signal = copy.deepcopy(np.PyArray_SimpleNewFromData(1, self.shape_get, + np.NPY_INT16, <void *> self.rec.raw_signal)) np.PyArray_UpdateFlags(signal, signal.flags.num | np.NPY_OWNDATA) dic['signal'] = signal @@ -267,6 +404,143 @@ cdef class Open: dic.update(aux_dic) return dic + def _get_batches(self, read_list, size): + """ + batchify readIDs + """ + for i in range(0, len(read_list), size): + yield read_list[i:i+size] + + def _get_read_multi(self, read_list, threads, batchsize, pA, aux): + ''' + read_list = list of readIDs + pA = Bool for converting signal to picoamps + aux = str 'name'/'all' or list of names of auxiliary fields added to return dictionary + returns dic = dictionary of main fields for read_id, with any aux fields added + threads = how many threads to use to go fast + ''' + if not self.index_state: + self.logger.debug("FILE: {}, mode: {}".format(self.path, self.mode)) + self.logger.debug("Creating/loading index...") + ret = slow5_idx_load(self.s5) + if ret != 0: + self.logger.warning("slow5_idx_load return not 0: {}: {}".format(ret, self.error_codes[ret])) + else: + self.index_state = True + + self.logger.debug("Setting up batching...") + self.logger.debug("read_list: {}".format([i for i in read_list])) + num_reads = len(read_list) + if num_reads > batchsize: + batches = self._get_batches(read_list, size=batchsize) + else: + batches = self._get_batches(read_list, size=num_reads) + + self.logger.debug("batch for loop start") + for batch in chain(batches): + self.logger.debug("Batch: {}".format(",".join([i for i in batch]))) + batch_len = len(batch) + self.logger.debug("Starting rid assignment") + self.rid = <char **> malloc(sizeof(char*)*batch_len) + for i in range(batch_len): + self.logger.debug("readID: {}, bin: {}".format(batch[i], batch[i].encode())) + self.rid[i] = strdup(batch[i].encode()) + self.logger.debug("rid assignment complete") + + + self.logger.debug("slow5_get_batch: num_reads: {}".format(batch_len)) + ret = slow5_get_batch(&self.trec, self.s5, self.rid, batch_len, threads); + self.logger.debug("get_read_multi slow5_get_batch ret: {}".format(ret)) + if ret < 0: + self.logger.error("slow5_get_next error code: {}: {}".format(ret, self.error_codes[ret])) + break + if ret == 0: + self.logger.debug("No more reads: {}".format(ret)) + break + + for i in range(ret): + python_parse_read_start = time.time() + self.rec = self.trec[i] + dic = {} + aux_dic = {} + + # check for aux fields + if aux is not None: + if not self.aux_names or not self.aux_types: + self.aux_names = self.get_aux_names() + self.aux_types = self.get_aux_types() + if type(aux) is str: + # special type 'all' + if aux == "all": + aux_dic = self._get_read_aux(self.aux_names, self.aux_types) + else: + found_single_aux = False + for n, t in zip(self.aux_names, self.aux_types): + if n == aux: + found_single_aux = True + aux_dic = self._get_read_aux([n], [t]) + break + if not found_single_aux: + self.logger.warning("get_read unknown aux name: {}".format(aux)) + aux_dic.update({aux: None}) + elif type(aux) is list: + n_list = [] + t_list = [] + for n, t in zip(self.aux_names, self.aux_types): + if n in aux: + n_list.append(n) + t_list.append(t) + + aux_dic = self._get_read_aux(n_list, t_list) + # Check for items given that did not exist + n_set = set(n_list) + aux_set = set(aux) + if len(aux_set.difference(n_set)) > 0: + for i in aux_set.difference(n_set): + self.logger.warning("get_read unknown aux name: {}".format(i)) + aux_dic.update({i: None}) + + else: + self.logger.debug("get_read aux type unknown, accepts str or list: {}".format(aux)) + + # get read data + if type(self.rec.read_id) is bytes: + dic['read_id'] = self.rec.read_id.decode() + else: + dic['read_id'] = self.rec.read_id + dic['read_group'] = self.rec.read_group + dic['digitisation'] = self.rec.digitisation + dic['offset'] = self.rec.offset + dic['range'] = self.rec.range + dic['sampling_rate'] = self.rec.sampling_rate + dic['len_raw_signal'] = self.rec.len_raw_signal + # This could be handled by numpy.fromiter() or similar + # Probably MUCH faster + # https://stackoverflow.com/questions/7543675/how-to-convert-pointer-to-c-array-to-python-array + # https://groups.google.com/g/cython-users/c/KnjF7ViaHUM + # dic['signal'] = [self.rec.raw_signal[i] for i in range(self.rec.len_raw_signal)] + # cdef np.npy_intp shape_get[1] + self.shape_get[0] = <np.npy_intp> self.rec.len_raw_signal + signal = copy.deepcopy(np.PyArray_SimpleNewFromData(1, self.shape_get, + np.NPY_INT16, <void *> self.rec.raw_signal)) + np.PyArray_UpdateFlags(signal, signal.flags.num | np.NPY_OWNDATA) + dic['signal'] = signal + + # if pA=True, convert signal to pA + if pA: + dic['signal'] = self._convert_to_pA(dic) + # if aux data, add to main dic + if aux_dic: + dic.update(aux_dic) + yield dic + + slow5_free_batch(&self.trec, ret) + for i in range(batch_len): + free(self.rid[i]) + free(self.rid) + self.rec = NULL + self.logger.debug("seq_reads_multi timings:") + def _get_read_aux(self, aux_names, aux_types): ''' @@ -285,75 +559,82 @@ cdef class Open: if self.aux_get_err == 0: dic[name] = self.e0 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 1: self.e1 = slow5_aux_get_int16(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e1 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 2: self.e2 = slow5_aux_get_int32(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e2 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 3: self.e3 = slow5_aux_get_int64(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e3 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 4: self.e4 = slow5_aux_get_uint8(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e4 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 5: self.e5 = slow5_aux_get_uint16(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e5 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 6: self.e6 = slow5_aux_get_uint32(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e6 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 7: self.e7 = slow5_aux_get_uint64(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e7 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 8: self.e8 = slow5_aux_get_float(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e8 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 9: self.e9 = slow5_aux_get_double(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e9 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 10: self.e10 = slow5_aux_get_char(self.rec, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e10 + else: + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) + dic[name] = None + elif atype == 11: + self.e11 = slow5_aux_get_enum(self.rec, a_name, &self.aux_get_err) + if self.aux_get_err == 0: + dic[name] = self.e11 else: self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) dic[name] = None @@ -365,7 +646,7 @@ cdef class Open: l.append(self.e12[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 13: self.e13 = slow5_aux_get_int16_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -375,7 +656,7 @@ cdef class Open: l.append(self.e13[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 14: self.e14 = slow5_aux_get_int32_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -385,7 +666,7 @@ cdef class Open: l.append(self.e14[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 15: self.e15 = slow5_aux_get_int64_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -395,7 +676,7 @@ cdef class Open: l.append(self.e15[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 16: self.e16 = slow5_aux_get_uint8_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -405,7 +686,7 @@ cdef class Open: l.append(self.e16[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 17: self.e17 = slow5_aux_get_uint16_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -415,7 +696,7 @@ cdef class Open: l.append(self.e17[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 18: self.e18 = slow5_aux_get_uint32_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -425,7 +706,7 @@ cdef class Open: l.append(self.e18[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 19: self.e19 = slow5_aux_get_uint64_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -435,7 +716,7 @@ cdef class Open: l.append(self.e19[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 20: self.e20 = slow5_aux_get_float_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -445,7 +726,7 @@ cdef class Open: l.append(self.e20[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 21: self.e21 = slow5_aux_get_double_array(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -455,7 +736,7 @@ cdef class Open: l.append(self.e21[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 22: self.e22 = slow5_aux_get_string(self.rec, a_name, &self.aux_get_len, &self.aux_get_err) @@ -467,8 +748,11 @@ cdef class Open: s = "".join(l) dic[name] = s else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None + elif atype == 22: + self.logger.debug("NOT IMPLEMENTED YET: get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + dic[name] = None else: self.logger.debug("get_read_aux atype not known, skipping: {}".format(atype)) @@ -492,75 +776,82 @@ cdef class Open: if self.aux_get_err == 0: dic[name] = self.e0 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 1: self.e1 = slow5_aux_get_int16(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e1 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 2: self.e2 = slow5_aux_get_int32(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e2 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 3: self.e3 = slow5_aux_get_int64(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e3 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 4: self.e4 = slow5_aux_get_uint8(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e4 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 5: self.e5 = slow5_aux_get_uint16(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e5 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 6: self.e6 = slow5_aux_get_uint32(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e6 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 7: self.e7 = slow5_aux_get_uint64(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e7 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 8: self.e8 = slow5_aux_get_float(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e8 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 9: self.e9 = slow5_aux_get_double(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e9 else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 10: self.e10 = slow5_aux_get_char(self.read, a_name, &self.aux_get_err) if self.aux_get_err == 0: dic[name] = self.e10 + else: + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) + dic[name] = None + elif atype == 11: + self.e11 = slow5_aux_get_enum(self.read, a_name, &self.aux_get_err) + if self.aux_get_err == 0: + dic[name] = self.e11 else: self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) dic[name] = None @@ -572,7 +863,7 @@ cdef class Open: l.append(self.e12[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 13: self.e13 = slow5_aux_get_int16_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -582,7 +873,7 @@ cdef class Open: l.append(self.e13[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 14: self.e14 = slow5_aux_get_int32_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -592,7 +883,7 @@ cdef class Open: l.append(self.e14[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 15: self.e15 = slow5_aux_get_int64_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -602,7 +893,7 @@ cdef class Open: l.append(self.e15[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 16: self.e16 = slow5_aux_get_uint8_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -612,7 +903,7 @@ cdef class Open: l.append(self.e16[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 17: self.e17 = slow5_aux_get_uint16_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -622,7 +913,7 @@ cdef class Open: l.append(self.e17[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 18: self.e18 = slow5_aux_get_uint32_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -632,7 +923,7 @@ cdef class Open: l.append(self.e18[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 19: self.e19 = slow5_aux_get_uint64_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -642,7 +933,7 @@ cdef class Open: l.append(self.e19[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 20: self.e20 = slow5_aux_get_float_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -652,7 +943,7 @@ cdef class Open: l.append(self.e20[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 21: self.e21 = slow5_aux_get_double_array(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -662,7 +953,7 @@ cdef class Open: l.append(self.e21[i]) dic[name] = l else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None elif atype == 22: self.e22 = slow5_aux_get_string(self.read, a_name, &self.aux_get_len, &self.aux_get_err) @@ -674,8 +965,11 @@ cdef class Open: s = "".join(l) dic[name] = s else: - self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + self.logger.debug("get_aux_types {} self.aux_get_err is {}: {}".format(atype, self.aux_get_err, self.error_codes[self.aux_get_err])) dic[name] = None + elif atype == 22: + self.logger.debug("NOT IMPLEMENTED YET: get_aux_types {} self.aux_get_err is {}: {}".format(atype), self.aux_get_err, self.error_codes[self.aux_get_err]) + dic[name] = None else: self.logger.debug("get_read_aux atype not known, skipping: {}".format(atype)) @@ -696,7 +990,10 @@ cdef class Open: ret = 0 # While loops check ret of previous read for errors as fail safe while ret >= 0: + start_slow5_get_next = time.time() ret = slow5_get_next(&self.read, self.s5) + self.total_time_slow5_get_next = self.total_time_slow5_get_next + (time.time() - start_slow5_get_next) + self.logger.debug("slow5_get_next return: {}".format(ret)) # check for EOF or other errors if ret < 0: @@ -752,21 +1049,17 @@ cdef class Open: row['read_id'] = self.read.read_id.decode() else: row['read_id'] = self.read.read_id - # row['read_id'] = self.read.read_id.decode() row['read_group'] = self.read.read_group row['digitisation'] = self.read.digitisation row['offset'] = self.read.offset row['range'] = self.read.range row['sampling_rate'] = self.read.sampling_rate row['len_raw_signal'] = self.read.len_raw_signal - # row['signal'] = [self.read.raw_signal[i] for i in range(self.read.len_raw_signal)] self.shape_seq[0] = <np.npy_intp> self.read.len_raw_signal - signal = np.PyArray_SimpleNewFromData(1, self.shape_seq, - np.NPY_INT16, <void *> self.read.raw_signal) + signal = copy.deepcopy(np.PyArray_SimpleNewFromData(1, self.shape_seq, + np.NPY_INT16, <void *> self.read.raw_signal)) np.PyArray_UpdateFlags(signal, signal.flags.num | np.NPY_OWNDATA) row['signal'] = signal - # for i in range(self.read.len_raw_signal): - # row['signal'].append(self.read.raw_signal[i]) # if pA=True, convert signal to pA if pA: @@ -774,10 +1067,124 @@ cdef class Open: # if aux data update main dic if aux_dic: row.update(aux_dic) - + self.total_time_yield_reads = self.total_time_yield_reads + (time.time() - start_slow5_get_next) yield row + def seq_reads_multi(self, threads=4, batchsize=4096, pA=False, aux=None): + ''' + returns generator for sequential reading of slow5 file + for pA and aux, see _get_read + threads: number of threads to use + batchsize: Number of reads to process with thread pool in parallel + ''' + aux_dic = {} + row = {} + ret = 1 + timedic = {"aux_total_time": 0, + "primary_total_time": 0, + "pA_total_time": 0, + "signal_total_time": 0} + + # While loops check ret of previous read for errors as fail safe + while ret > 0: + start_slow5_get_next = time.time() + ret = slow5_get_next_batch(&self.trec, self.s5, batchsize, threads) + self.total_time_slow5_get_next = self.total_time_slow5_get_next + (time.time() - start_slow5_get_next) + self.logger.debug("slow5_get_next_multi return: {}".format(ret)) + # check for EOF or other errors + if ret < 0: + if ret == -1: + self.logger.debug("slow5_get_next_multi reached end of file (EOF)(-1): {}: {}".format(ret, self.error_codes[ret])) + else: + self.logger.error("slow5_get_next_multi error code: {}: {}".format(ret, self.error_codes[ret])) + + break + for i in range(ret): + python_parse_read_start = time.time() + self.read = self.trec[i] + aux_dic = {} + row = {} + # get aux fields + aux_time_start = time.time() + if aux is not None: + if not self.aux_names or not self.aux_types: + self.aux_names = self.get_aux_names() + self.aux_types = self.get_aux_types() + if type(aux) is str: + if aux == "all": + aux_dic = self._get_seq_read_aux(self.aux_names, self.aux_types) + else: + found_single_aux = False + for n, t in zip(self.aux_names, self.aux_types): + if n == aux: + found_single_aux = True + aux_dic = self._get_read_aux([n], [t]) + break + if not found_single_aux: + self.logger.warning("slow5_get_next_multi unknown aux name: {}".format(aux)) + aux_dic.update({aux: None}) + elif type(aux) is list: + n_list = [] + t_list = [] + for n, t in zip(self.aux_names, self.aux_types): + if n in aux: + n_list.append(n) + t_list.append(t) + + aux_dic = self._get_read_aux(n_list, t_list) + # check for items in given list that do not exist + n_set = set(n_list) + aux_set = set(aux) + if len(aux_set.difference(n_set)) > 0: + for i in aux_set.difference(n_set): + self.logger.warning("slow5_get_next_multi unknown aux name: {}".format(i)) + aux_dic.update({i: None}) + + else: + self.logger.debug("slow5_get_next_multi aux type unknown, accepts str or list: {}".format(aux)) + timedic["aux_total_time"] = timedic["aux_total_time"] + (time.time() - aux_time_start) + # Get read data + primary_start_time = time.time() + if type(self.read.read_id) is bytes: + row['read_id'] = self.read.read_id.decode() + else: + row['read_id'] = self.read.read_id + # row['read_id'] = self.read.read_id.decode() + row['read_group'] = self.read.read_group + row['digitisation'] = self.read.digitisation + row['offset'] = self.read.offset + row['range'] = self.read.range + row['sampling_rate'] = self.read.sampling_rate + row['len_raw_signal'] = self.read.len_raw_signal + signal_start_time = time.time() + self.shape_seq[0] = <np.npy_intp> self.read.len_raw_signal + signal = copy.deepcopy(np.PyArray_SimpleNewFromData(1, self.shape_seq, + np.NPY_INT16, <void *> self.read.raw_signal)) + np.PyArray_UpdateFlags(signal, signal.flags.num | np.NPY_OWNDATA) + row['signal'] = signal + timedic["signal_total_time"] = timedic["signal_total_time"] + (time.time() - signal_start_time) + timedic["primary_total_time"] = timedic["primary_total_time"] + (time.time() - primary_start_time) + # if pA=True, convert signal to pA + if pA: + pA_start_time = time.time() + row['signal'] = self._convert_to_pA(row) + timedic["pA_total_time"] = timedic["pA_total_time"] + (time.time() - pA_start_time) + # if aux data update main dic + if aux_dic: + row.update(aux_dic) + self.total_time_yield_reads = self.total_time_yield_reads + (time.time() - python_parse_read_start) + yield row + slow5_free_batch(&self.trec, ret) + if ret < batchsize: + self.logger.debug("slow5_get_next_multi has no more batches - batchsize:{} ret:{}".format(batchsize, ret)) + break + self.read = NULL + self.logger.debug("seq_reads_multi timings:") + for i in timedic: + self.logger.debug("{}: {}".format(i, timedic[i])) + + def get_read_list(self, read_list, pA=False, aux=None): ''' returns generator for random access of slow5 file @@ -788,12 +1195,22 @@ cdef class Open: yield self._get_read(r, pA, aux) + def get_read_list_multi(self, read_list, threads=4, batchsize=100, pA=False, aux=None): + ''' + returns generator for random access of slow5 file + read_list = list of readIDs, if readID not in file, None type returned (need EOF to work) + for pA and aux see _get_read + threads = number of threads to use to do batched random access + ''' + for r in self._get_read_multi(read_list, threads, batchsize, pA, aux): + yield r + + def get_header_names(self): ''' get all header names and return list ''' headers = [] - # ret = slow5_header_names(self.s5.header) ret = slow5_get_hdr_keys(self.s5.header, &self.head_len) self.logger.debug("slow5_get_hdr_keys head_len: {}".format(self.head_len)) @@ -802,6 +1219,7 @@ cdef class Open: return headers headers = [ret[i].decode() for i in range(self.head_len)] + free(ret) return headers @@ -862,3 +1280,696 @@ cdef class Open: aux_types = [self.s5_aux_type[i] for i in range(self.aux_len)] return aux_types + + # ========================================================================== + # Write SLOW5 file + # ========================================================================== + + def get_empty_header(self): + ''' + returns empty header dic for user to populate + Any values not populated will be skipped + ''' + header = {"asic_id": None, + "asic_id_eeprom": None, + "asic_temp": None, + "asic_version": None, + "auto_update": None, + "auto_update_source": None, + "barcoding_enabled": None, + "bream_is_standard": None, + "configuration_version": None, + "device_id": None, + "device_type": None, + "distribution_status": None, + "distribution_version": None, + "exp_script_name": None, + "exp_script_purpose": None, + "exp_start_time": None, + "experiment_duration_set": None, + "flow_cell_id": None, + "flow_cell_product_code": None, + "guppy_version": None, + "heatsink_temp": None, + "hostname": None, + "installation_type": None, + "local_basecalling": None, + "operating_system": None, + "package": None, + "protocol_group_id": None, + "protocol_run_id": None, + "protocol_start_time": None, + "protocols_version": None, + "run_id": None, + "sample_frequency": None, + "sample_id": None, + "sequencing_kit": None, + "usb_config": None, + "version": None, + "hublett_board_id": None, + "satellite_firmware_version": None} + + return header + + def get_empty_record(self, aux=False): + ''' + Return a dictionary of empty record and types + if axu=True, a second dictionary will be returned with optional aux record + ''' + record = {"read_id": None, + "read_group": 0, + "digitisation": None, + "offset": None, + "range": None, + "sampling_rate": None, + "len_raw_signal": None, + "signal": None} + + aux_rec = {"channel_number": None, + "median_before": None, + "read_number": None, + "start_mux": None, + "start_time": None} + + if aux: + return record, aux_rec + return record + + + def _header_type_validation(self, header): + ''' + internal function to validate header types before pushing to C side + ''' + for h in header: + if header[h] is not None: + t = type(header[h]) + if t is not type("string"): + self.logger.warning("_header_type_validation {}: {} is not a string type, attempting to convert".format(h, header[h])) + #try and convert + try: + s = str(header[h]) + header[h] = s + self.logger.warning("_header_type_validation {}: {} conversion successful".format(h, s)) + except: + self.logger.error("_header_type_validation {}: {} could not convert value to string".format(h, header[h])) + raise + return header + + + def _aux_header_type_validation(self, user_aux_types): + ''' + internal function to validate and convert aux types before pushing to C side + ''' + slow5_aux_types = {} + + py_aux_types = {"channel_number": type("string"), + "median_before": type(1.0), + "read_number": type(10), + "start_mux": type(1), + "start_time": type(100), + "end_reason": None} + + C_aux_types = {"channel_number": SLOW5_STRING, + "median_before":SLOW5_DOUBLE, + "read_number": SLOW5_INT32_T, + "start_mux": SLOW5_UINT8_T, + "start_time": SLOW5_UINT64_T, + "end_reason": None} + + for a in user_aux_types: + if user_aux_types[a] is None: + continue + if a not in py_aux_types: + self.logger.error("_aux_type_validation {}: {} user aux field not in pyslow5 aux_types".format(a, user_aux_types[a])) + return None + if user_aux_types[a] == py_aux_types[a]: + slow5_aux_types[a] = C_aux_types[a] + else: + self.logger.error("_aux_type_validation {}: {} user aux field type mismatch with pyslow5 aux_types".format(a, user_aux_types[a])) + return None + return slow5_aux_types + + + def _record_type_validation(self, user_record, aux=None): + ''' + internal function to validate and convert aux types before pushing to C side + returns None, None on error + ''' + + py_record_types = {"read_id": type("string"), + "read_group": type(1), + "digitisation": type(1.0), + "offset": type(1.0), + "range": type(1.0), + "sampling_rate": type(1.0), + "len_raw_signal": type(10), + "signal": type(np.array([1, 2, 3], np.int16))} + + py_aux_types = {"channel_number": type("string"), + "median_before": type(1.0), + "read_number": type(10), + "start_mux": type(1), + "start_time": type(100), + "end_reason": None} + + new_aux = {} + + for a in user_record: + if user_record[a] is None: + continue + if a not in py_record_types: + self.logger.error("_record_type_validation {}: {} user primary field not in pyslow5 record_types".format(a, user_record[a])) + return None, None + + if type(user_record[a]) != py_record_types[a]: + self.logger.error("_record_type_validation {}: {} user primary field type mismatch with pyslow5 record_types".format(a, user_record[a])) + return None, None + + # check aux if given + if aux is not None: + self.logger.debug("_record_type_validation: doing aux stuff...") + for a in aux: + if a not in py_aux_types: + self.logger.error("_record_type_validation {}: {} user aux field not in pyslow5 aux_types".format(a, aux[a])) + return None, None + if aux[a] is None: + continue + if type(aux[a]) != py_aux_types[a]: + self.logger.error("_record_type_validation {}: {} user aux field type mismatch with pyslow5 aux_types".format(a, aux[a])) + return None, None + else: + self.logger.debug("_record_type_validation: aux passed tests...") + if a == "channel_number": + self.channel_number_val=strdup(aux[a].encode()) + new_aux[a] = aux[a] + elif a == "median_before": + self.median_before_val = <double>aux[a] + new_aux[a] = aux[a] + elif a == "read_number": + self.read_number_val = <int32_t>aux[a] + new_aux[a] = aux[a] + elif a == "start_mux": + self.start_mux_val = <uint8_t>aux[a] + new_aux[a] = aux[a] + elif a == "start_time": + self.start_time_val = <uint64_t>aux[a] + new_aux[a] = aux[a] + elif a == "end_reason": + continue + self.logger.debug("_record_type_validation: doing aux stuff...") + + return user_record, new_aux + + + def _multi_record_type_validation(self, user_record, aux=None): + ''' + internal function to validate and convert aux types before pushing to C side + returns None, None on error + ''' + + py_record_types = {"read_id": type("string"), + "read_group": type(1), + "digitisation": type(1.0), + "offset": type(1.0), + "range": type(1.0), + "sampling_rate": type(1.0), + "len_raw_signal": type(10), + "signal": type(np.array([1, 2, 3], np.int16))} + + py_aux_types = {"channel_number": type("string"), + "median_before": type(1.0), + "read_number": type(10), + "start_mux": type(1), + "start_time": type(100), + "end_reason": None} + + new_aux = {} + + for a in user_record: + if user_record[a] is None: + continue + if a not in py_record_types: + self.logger.error("_record_type_validation {}: {} user primary field not in pyslow5 record_types".format(a, user_record[a])) + return None, None + + if type(user_record[a]) != py_record_types[a]: + self.logger.error("_record_type_validation {}: {} user primary field type mismatch with pyslow5 record_types".format(a, user_record[a])) + return None, None + + # check aux if given + if aux is not None: + self.logger.debug("_record_type_validation: doing aux stuff...") + for a in aux: + if a not in py_aux_types: + self.logger.error("_record_type_validation {}: {} user aux field not in pyslow5 aux_types".format(a, aux[a])) + return None, None + if aux[a] is None: + continue + if type(aux[a]) != py_aux_types[a]: + self.logger.error("_record_type_validation {}: {} user aux field type mismatch with pyslow5 aux_types".format(a, aux[a])) + return None, None + else: + self.logger.debug("_record_type_validation: aux passed tests...") + if a == "channel_number": + new_aux[a] = aux[a] + elif a == "median_before": + new_aux[a] = aux[a] + elif a == "read_number": + new_aux[a] = aux[a] + elif a == "start_mux": + new_aux[a] = aux[a] + elif a == "start_time": + new_aux[a] = aux[a] + elif a == "end_reason": + continue + + self.logger.debug("_record_type_validation: aux stuff done") + + + return user_record, new_aux + + + def write_header(self, header, read_group=0): + ''' + write slow5 header to file. + takes header dic for attributes, then write once. + Currently limited to ONLY 1 read_group + Use slow5tools merge after writing as a temporary solution + ''' + checked_header = self._header_type_validation(header) + + errors = False + if not self.header_add_attr_state: + if read_group > 0: + self.logger.error("write_header: You must set read_group=0 first") + self.logger.error("write_header: headers failed to initialise.") + return -1 + for h in checked_header: + ret = slow5_hdr_add_attr(h.encode(), self.s5.header) + if ret < 0: + self.logger.error("write_header: slow5_hdr_add_attr {}: {} could not initialise to C s5.header struct".format(h, checked_header[h])) + errors = True + else: + self.header_add_attr_state = True + + if read_group > 0 and self.header_add_attr_state: + ret = slow5_hdr_add_rg(self.s5.header) + if ret < 0: + self.logger.error("write_header: slow5_hdr_add_rg failed for read_group: {}".format(read_group)) + errors = True + + if errors: + self.logger.error("write_header: headers failed to initialise.") + return -1 + + for h in checked_header: + ret = slow5_hdr_set(h.encode(), checked_header[h].encode(), read_group, self.s5.header) + if ret < 0: + self.logger.error("write_header: slow5_hdr_set {}: {} could not set to C s5.header struct".format(h, checked_header[h])) + errors = True + + if not errors: + return 0 + else: + self.logger.error("write_header: errors encountered setting up header, aborting write") + # sys.exit(1) + return -1 + + def write_record(self, record, aux=None): + ''' + write a single record + check self.header_state, if False, header needs to be written. Use aux types to do first check. + if the validation works, then write the header just before the first record is written. + This should make the user experience a lot less complicated and have less steps + ''' + + aux_types = {"channel_number": type("string"), + "median_before": type(1.0), + "read_number": type(10), + "start_mux": type(1), + "start_time": type(100), + "end_reason": None} + + self.logger.debug("write_record: _record_type_validation running") + checked_record, checked_aux = self._record_type_validation(record, aux) + self.logger.debug("write_record: _record_type_validation done") + + # check if in append state + # if so, we can skip header setup + if self.state == 2: + self.header_state = True + + # if all checks are good, test self.header_state for 1 time write + if not self.header_state: + self.logger.debug("write_record: checking header stuff...") + error = False + if aux is not None: + if checked_aux is not None: + slow5_aux_types = self._aux_header_type_validation(aux_types) + for a in slow5_aux_types: + if slow5_aux_types[a] is None: + continue + ret = slow5_aux_meta_add_wrapper(self.s5.header, a.encode(), slow5_aux_types[a]) + if ret < 0: + self.logger.error("write_record: slow5_aux_meta_add_wrapper {}: {} could not set to C s5.header.aux_meta struct".format(a, checked_aux[a])) + error = True + else: + error = True + + if error: + self.logger.error("write_record: aux_meta fields failed to initialise") + return -1 + # write the header + self.logger.debug("write_record: writting header...") + ret = slow5_header_write(self.s5) + if ret < 0: + self.logger.error("write_record: slow5_header_write could not write header") + return -1 + # set state true so only done once + self.header_state = True + self.logger.debug("write_record: header written") + + # Add values to read struct + self.logger.debug("write_record: slow5_rec_init()") + self.write = slow5_rec_init() + if self.write == NULL: + self.logger.error("write_record: failed to allocate space for slow5 record (self.write)") + return -1 + + self.logger.debug("write_record: self.write assignments...") + checked_record["read_id"] = checked_record["read_id"].encode() + self.write.read_id = strdup(checked_record["read_id"]) + self.write.read_id_len = len(checked_record["read_id"]) + self.write.read_group = checked_record["read_group"] + self.write.digitisation = checked_record["digitisation"] + self.write.offset = checked_record["offset"] + self.write.range = checked_record["range"] + self.write.sampling_rate = checked_record["sampling_rate"] + self.write.len_raw_signal = checked_record["len_raw_signal"] + self.logger.debug("write_record: self.write.raw_signal malloc...") + self.write.raw_signal = <int16_t *> malloc(sizeof(int16_t)*checked_record["len_raw_signal"]) + self.logger.debug("write_record: self.write.raw_signal malloc done") + self.logger.debug("write_record: self.write assignments done") + + self.logger.debug("write_record: self.write processing raw_signal") + start_write_copy_signal = time.time() + # grabs buffer of numby array so the for loop operats in C not python = super fast + memview = memoryview(checked_record["signal"]) + for i in range(checked_record["len_raw_signal"]): + self.write.raw_signal[i] = memview[i] + # for i in range(checked_record["len_raw_signal"]): + # self.write.raw_signal[i] = checked_record["signal"][i] + end_write_copy_signal = (time.time() - start_write_copy_signal) + self.total_single_write_time = self.total_single_write_time + end_write_copy_signal + self.logger.debug("write_record: self.write raw_signal done") + + if aux: + self.logger.debug("write_record: aux stuff...") + if checked_aux is None: + self.logger.error("write_record: checked_aux is None".format(a, checked_aux[a])) + return -1 + + for a in checked_aux: + self.logger.debug("write_record: checked_aux: {}: {}".format(a, checked_aux[a])) + if checked_aux[a] is None: + continue + if a == "channel_number": + self.logger.debug("write_record: slow5_rec_set_string_wrapper running...") + self.logger.debug("write_record: slow5_rec_set_string_wrapper type: {}".format(type(checked_aux[a]))) + ret = slow5_rec_set_string_wrapper(self.write, self.s5.header, self.channel_number, <const char *>self.channel_number_val) + self.logger.debug("write_record: slow5_rec_set_string_wrapper running done: ret = {}".format(ret)) + if ret < 0: + self.logger.error("write_record: slow5_rec_set_string_wrapper could not write aux value {}: {}".format(a, checked_aux[a])) + #### We should free here + return -1 + elif a == "median_before": + ret = slow5_rec_set_wrapper(self.write, self.s5.header, self.median_before, <const void *>&self.median_before_val) + elif a == "read_number": + ret = slow5_rec_set_wrapper(self.write, self.s5.header, self.read_number, <const void *>&self.read_number_val) + elif a == "start_mux": + ret = slow5_rec_set_wrapper(self.write, self.s5.header, self.start_mux, <const void *>&self.start_mux_val) + elif a == "start_time": + ret = slow5_rec_set_wrapper(self.write, self.s5.header, self.start_time, <const void *>&self.start_time_val) + elif a == "end_reason": + # not implemented yet becuase of variability in ONT versioning + ret = 0 + if ret < 0: + self.logger.error("write_record: slow5_rec_set_wrapper could not write aux value {}: {}".format(a, checked_aux[a])) + return -1 + + self.logger.debug("write_record: aux stuff done") + + + self.logger.debug("write_record: slow5_rec_write()") + # write the record + ret = slow5_rec_write(self.s5, self.write) + self.logger.debug("write_record: slow5_rec_write() ret: {}".format(ret)) + + if aux is not None: + free(self.channel_number_val) + self.channel_number_val = NULL + self.median_before_val = -1.0 + self.read_number_val = -1 + self.start_mux_val = -1 + self.start_time_val = -1 + + + # free memory + self.logger.debug("write_record: slow5_rec_free()") + slow5_rec_free(self.write) + self.write = NULL + + self.logger.debug("write_record: function complete, returning 0") + return 0 + + + def write_record_batch(self, records, threads=4, batchsize=4096, aux=None): + ''' + write a batch of records + same as write_record, but in batches + records = dic of read rics, where the key for each is the readID + if aux, aux is also a dic of dics, whhere the key for each is teh readID + records = {readID_0: {read_dic}, readID_1: {read_dic}} + ''' + start_multi_write = time.time() + aux_types = {"channel_number": type("string"), + "median_before": type(1.0), + "read_number": type(10), + "start_mux": type(1), + "start_time": type(100), + "end_reason": None} + # check an empty dic wasn't given + if aux is not None: + if len(aux) == 0: + aux = None + self.logger.debug("write_record_batch: Setting up batching...") + num_reads = len(records) + read_list = list(records.keys()) + if num_reads > batchsize: + batches = self._get_batches(read_list, size=batchsize) + else: + batches = self._get_batches(read_list, size=num_reads) + + + self.logger.debug("write_record_batch: batch for loop start") + for batch in chain(batches): + batch_len = len(batch) + self.twrite = <slow5_rec_t **> malloc(sizeof(slow5_rec_t*)*batch_len) + self.logger.debug("write_record_batch: _record_type_validation running") + checked_records = {} + checked_auxs = {} + self.channel_number_val_array = <char **> malloc(sizeof(char*)*batch_len) + self.median_before_val_array = <double *> malloc(sizeof(double)*batch_len) + self.read_number_val_array = <int32_t *> malloc(sizeof(int32_t)*batch_len) + self.start_mux_val_array = <uint8_t *> malloc(sizeof(uint8_t)*batch_len) + self.start_time_val_array = <uint64_t *> malloc(sizeof(uint64_t)*batch_len) + for i, idx in enumerate(batch): + if aux is not None: + checked_record, checked_aux = self._multi_record_type_validation(records[idx], aux[idx]) + checked_records[idx] = checked_record + for a in checked_aux: + if a == "channel_number": + self.channel_number_val_array[i] = strdup(checked_aux[a].encode()) + elif a == "median_before": + self.median_before_val_array[i] = <double>checked_aux[a] + elif a == "read_number": + self.read_number_val_array[i] = <int32_t>checked_aux[a] + elif a == "start_mux": + self.start_mux_val_array[i] = <uint8_t>checked_aux[a] + elif a == "start_time": + self.start_time_val_array[i] = <uint64_t>checked_aux[a] + checked_auxs[idx] = checked_aux + else: + checked_record, checked_aux = self._record_type_validation(records[idx], aux) + checked_records[idx] = checked_record + self.logger.debug("write_record_batch: _record_type_validation done") + if len(checked_aux) == 0: + checked_aux = None + for idx in range(batch_len): + + # check if in append state + # if so, we can skip header setup + if self.state == 2: + self.header_state = True + + # if all checks are good, test self.header_state for 1 time write + if not self.header_state: + self.logger.debug("write_record_batch: checking header stuff...") + error = False + if aux is not None: + if checked_aux is not None: + slow5_aux_types = self._aux_header_type_validation(aux_types) + for a in slow5_aux_types: + if slow5_aux_types[a] is None: + continue + ret = slow5_aux_meta_add_wrapper(self.s5.header, a.encode(), slow5_aux_types[a]) + if ret < 0: + self.logger.error("write_record_batch: slow5_aux_meta_add_wrapper {}: {} could not set to C s5.header.aux_meta struct".format(a, checked_aux[a])) + error = True + else: + error = True + + if error: + self.logger.error("write_record_batch: aux_meta fields failed to initialise") + return -1 + # write the header + self.logger.debug("write_record_batch: writting header...") + ret = slow5_header_write(self.s5) + if ret < 0: + self.logger.error("write_record_batch: slow5_header_write could not write header") + return -1 + # set state true so only done once + self.header_state = True + self.logger.debug("write_record_batch: header written") + + # Add values to read struct + self.logger.debug("write_record_batch: slow5_rec_init()") + + self.twrite[idx] = slow5_rec_init() + if self.twrite[idx] == NULL: + self.logger.error("write_record_batch: failed to allocate space for slow5 record (self.twrite[idx])") + return -1 + + self.logger.debug("write_record_batch: self.write assignments...") + checked_records[batch[idx]]["read_id"] = checked_records[batch[idx]]["read_id"].encode() + self.twrite[idx].read_id = strdup(checked_records[batch[idx]]["read_id"]) + self.twrite[idx].read_id_len = len(checked_records[batch[idx]]["read_id"]) + self.twrite[idx].read_group = checked_records[batch[idx]]["read_group"] + self.twrite[idx].digitisation = checked_records[batch[idx]]["digitisation"] + self.twrite[idx].offset = checked_records[batch[idx]]["offset"] + self.twrite[idx].range = checked_records[batch[idx]]["range"] + self.twrite[idx].sampling_rate = checked_records[batch[idx]]["sampling_rate"] + self.twrite[idx].len_raw_signal = checked_records[batch[idx]]["len_raw_signal"] + self.logger.debug("write_record_batch: self.write.raw_signal malloc...") + self.twrite[idx].raw_signal = <int16_t *> malloc(sizeof(int16_t)*checked_records[batch[idx]]["len_raw_signal"]) + self.logger.debug("write_record_batch: self.write.raw_signal malloc done") + self.logger.debug("write_record_batch: self.write assignments done") + + self.logger.debug("write_record_batch: self.write processing raw_signal") + start_write_copy_signal = time.time() + # grabs buffer of numby array so the for loop operats in C not python = super fast + memview = memoryview(checked_records[batch[idx]]["signal"]) + for i in range(checked_records[batch[idx]]["len_raw_signal"]): + self.twrite[idx].raw_signal[i] = memview[i] + # for i in range(checked_records[batch[idx]]["len_raw_signal"]): + # self.twrite[idx].raw_signal[i] = checked_records[batch[idx]]["signal"][i] + end_write_copy_signal = (time.time() - start_write_copy_signal) + self.total_multi_write_signal_time = self.total_multi_write_signal_time + end_write_copy_signal + + self.logger.debug("write_record_batch: self.write raw_signal done") + + if aux is not None: + self.logger.debug("write_record_batch: aux stuff...") + if checked_auxs[batch[idx]] is None: + self.logger.error("write_record_batch: checked_aux is None".format(a, checked_auxs[batch[idx]][a])) + return -1 + + for a in checked_auxs[batch[idx]]: + self.logger.debug("write_record_batch: checked_aux: {}: {}".format(a, checked_auxs[batch[idx]][a])) + if checked_auxs[batch[idx]][a] is None: + continue + if a == "channel_number": + self.logger.debug("write_record_batch: slow5_rec_set_string_wrapper running...") + self.logger.debug("write_record_batch: slow5_rec_set_string_wrapper type: {}".format(type(checked_auxs[batch[idx]][a]))) + ret = slow5_rec_set_string_wrapper(self.twrite[idx], self.s5.header, self.channel_number, <const char *>self.channel_number_val_array[idx]) + self.logger.debug("write_record_batch: slow5_rec_set_string_wrapper running done: ret = {}".format(ret)) + if ret < 0: + self.logger.error("write_record_batch: slow5_rec_set_string_wrapper could not write aux value {}: {}".format(a, checked_auxs[batch[idx]][a])) + #### We should free here + return -1 + elif a == "median_before": + ret = slow5_rec_set_wrapper(self.twrite[idx], self.s5.header, self.median_before, <const void *>&self.median_before_val_array[idx]) + elif a == "read_number": + ret = slow5_rec_set_wrapper(self.twrite[idx], self.s5.header, self.read_number, <const void *>&self.read_number_val_array[idx]) + elif a == "start_mux": + ret = slow5_rec_set_wrapper(self.twrite[idx], self.s5.header, self.start_mux, <const void *>&self.start_mux_val_array[idx]) + elif a == "start_time": + ret = slow5_rec_set_wrapper(self.twrite[idx], self.s5.header, self.start_time, <const void *>&self.start_time_val_array[idx]) + elif a == "end_reason": + # not implemented yet becuase of variability in ONT versioning + ret = 0 + if ret < 0: + self.logger.error("write_record_batch: slow5_rec_set_wrapper could not write aux value {}: {}".format(a, checked_aux[a])) + return -1 + + self.logger.debug("write_record_batch: aux stuff done") + + self.logger.debug("write_record_batch: slow5_write_batch()") + + # write the record + if batch_len <= 0: + self.logger.debug("write_record_batch: batch_len 0 or less") + break + + ret = slow5_write_batch(self.twrite, self.s5, batch_len, threads) + if ret < batch_len: + self.logger.error("write_record_batch: write failed") + return -1 + + self.logger.debug("write_record_batch: free()") + for i in range(batch_len): + slow5_rec_free(self.twrite[i]) + free(self.twrite) + + + self.logger.debug("write_record_batch: free() aux") + if aux is not None: + for i in range(batch_len): + free(self.channel_number_val_array[i]) + + free(self.channel_number_val_array) + free(self.median_before_val_array) + free(self.read_number_val_array) + free(self.start_mux_val_array) + free(self.start_time_val_array) + + end_multi_write = time.time() - start_multi_write + self.total_multi_write_time = self.total_multi_write_time + end_multi_write + # free memory + # self.twrite = NULL + self.logger.debug("write_record_batch: function complete, returning 0") + return 0 + + def close(self): + ''' + close file so EOF is written + ''' + if self.state in [1,2]: + if not self.close_state: + if self.s5 is not NULL: + slow5_close_write(self.s5) + self.close_state = True + self.logger.debug("{} closed".format(self.path)) + else: + self.logger.warning("{} already closed".format(self.path)) + elif self.state == 0: + if not self.close_state: + if self.s5 is not NULL: + slow5_close(self.s5) + self.close_state = True + self.logger.debug("{} closed".format(self.path)) + else: + self.logger.warning("{} already closed".format(self.path)) + else: + self.logger.error("{} not open for writing, remake class object to refresh".format(self.path)) + return diff --git a/python/slow5_write.c b/python/slow5_write.c new file mode 100644 index 00000000..2503f261 --- /dev/null +++ b/python/slow5_write.c @@ -0,0 +1,397 @@ +#include <stdio.h> +#include <slow5/slow5.h> +#include "../src/slow5_extra.h" + +extern enum slow5_log_level_opt slow5_log_level; +extern enum slow5_exit_condition_opt slow5_exit_condition; + +slow5_file_t *slow5_open_write(const char *filename, const char *mode){ + + FILE *fp = fopen(filename, "w"); + if(fp==NULL){ + SLOW5_ERROR_EXIT("Error opening file '%s': %s.", filename, strerror(errno)); + slow5_errno = SLOW5_ERR_IO; + return NULL; + } + + slow5_file_t *sf = slow5_init_empty(fp, filename, SLOW5_FORMAT_UNKNOWN); + if(sf==NULL){ + SLOW5_ERROR_EXIT("Error initialising an empty SLOW5 file '%s'",filename); //todo error handling down the chain + fclose(fp); + return NULL; + } + + slow5_hdr_t *header=sf->header; + if (slow5_hdr_add_rg(header) < 0){ + SLOW5_ERROR_EXIT("Error adding read group 0 for %s",filename); //todo error handling down the chain + slow5_close(sf); + return NULL; + } + header->num_read_groups = 1; + + struct slow5_aux_meta *aux_meta = slow5_aux_meta_init_empty(); + if(aux_meta == NULL){ + SLOW5_ERROR_EXIT("Error initializing aux meta for %s",filename); //todo error handling down the chain + slow5_close(sf); + return NULL; + } + header->aux_meta = aux_meta; + + //not thread safe, this structure is only used in single threaded writes + if(sf->format == SLOW5_FORMAT_BINARY){ + slow5_press_method_t press_out = {SLOW5_COMPRESS_ZLIB, SLOW5_COMPRESS_SVB_ZD}; + sf->compress = slow5_press_init(press_out); + if(!sf->compress){ + SLOW5_ERROR_EXIT("Could not initialise the slow5 compression method. %s",""); + slow5_close(sf); + return NULL; + } + } + + return sf; +} + +slow5_file_t *slow5_open_write_append(const char *filename, const char *mode){ + + slow5_file_t* slow5File = slow5_open(filename, "r"); + if(!slow5File){ + SLOW5_ERROR_EXIT("Error opening file '%s': %s.", filename, strerror(errno)); + slow5_errno = SLOW5_ERR_IO; + return NULL; + } + + if(slow5File->format==SLOW5_FORMAT_BINARY){ + if(fseek(slow5File->fp , 0, SEEK_END) !=0 ){ + SLOW5_ERROR_EXIT("Fseek to the end of file failed '%s': %s.", filename, strerror(errno)); + slow5_errno = SLOW5_ERR_IO; + slow5_close(slow5File); + return NULL; + } + const char eof[] = SLOW5_BINARY_EOF; + if(slow5_is_eof(slow5File->fp, eof, sizeof eof)!=1){ + SLOW5_ERROR_EXIT("No valid slow5 EOF marker at the end of the SLOW5 file %s.",filename); //should be a warning instead? + //todo error code + slow5_close(slow5File); + return NULL; + } + } + + int ret = fclose(slow5File->fp); + if(ret != 0){ + SLOW5_ERROR_EXIT("Closing %s after reading the header failed\n", filename); + //todo free what is inside slow5File + slow5_errno = SLOW5_ERR_IO; + return NULL; + } + + //opening a file like this twice is unnecessary if we use open_with, but lazy for now + slow5File->fp = fopen(filename, "r+"); + if(slow5File->fp == NULL){ + SLOW5_ERROR_EXIT("Error opening file for appending'%s': %s.", filename, strerror(errno)); + slow5_errno = SLOW5_ERR_IO; + //todo free what is inside slow5File + return NULL; + } + + if(slow5File->format==SLOW5_FORMAT_BINARY){ + const char eof[] = SLOW5_BINARY_EOF; + if(fseek(slow5File->fp, - (sizeof *eof) * (sizeof eof) , SEEK_END) != 0){ + SLOW5_ERROR_EXIT("Fseek to the end of file failed '%s': %s.", filename, strerror(errno)); + slow5_errno = SLOW5_ERR_IO; + slow5_close(slow5File); + return NULL; + } + } else if (slow5File->format==SLOW5_FORMAT_ASCII){ + if(fseek(slow5File->fp, 0 , SEEK_END) != 0){ + SLOW5_ERROR_EXIT("Fseek to the end of file failed '%s': %s.", filename, strerror(errno)); + slow5_errno = SLOW5_ERR_IO; + slow5_close(slow5File); + return NULL; + } + } else { + SLOW5_ERROR("Unknown slow5 format for file '%s'. Extension must be '%s' or '%s'.", + filename, SLOW5_ASCII_EXTENSION, SLOW5_BINARY_EXTENSION); + slow5_errno = SLOW5_ERR_UNK; + slow5_close(slow5File); + return NULL; + } + + return slow5File; + +} + + +int slow5_close_write(slow5_file_t *sf){ + if(sf->format == SLOW5_FORMAT_BINARY){ + if(slow5_eof_fwrite(sf->fp) < 0){ + SLOW5_ERROR_EXIT("%s","Error writing EOF!\n"); + //todo free sf + return -1; + } + } + int ret = slow5_close(sf); + return ret; +} + + +int slow5_header_write(slow5_file_t *sf){ + + slow5_press_method_t method={SLOW5_COMPRESS_NONE,SLOW5_COMPRESS_NONE}; + if (sf->format == SLOW5_FORMAT_BINARY){ + method.record_method = sf->compress->record_press->method; + method.signal_method = sf->compress->signal_press->method; + } + int ret = slow5_hdr_fwrite(sf->fp, sf->header, sf->format, method); + return ret; +} + + +int slow5_rec_write(slow5_file_t *sf, slow5_rec_t *rec){ + int ret = slow5_rec_fwrite(sf->fp, rec, sf->header->aux_meta, sf->format, sf->compress); + return ret; +} + + +int slow5_aux_meta_add_wrapper(slow5_hdr_t *header, const char *attr, enum slow5_aux_type type){ + int ret = slow5_aux_meta_add(header->aux_meta, attr, type); + return ret; +} + +int slow5_rec_set_wrapper(struct slow5_rec *read, slow5_hdr_t *header, const char *attr, const void *data){ + int ret = slow5_rec_set(read, header->aux_meta, attr, data); + return ret; +} + +int slow5_rec_set_string_wrapper(struct slow5_rec *read, slow5_hdr_t *header, const char *attr, const char *data) { + int ret = slow5_rec_set_string(read, header->aux_meta, attr, data); + return ret; +} + + +#ifdef PYSLOW5_WRITE_DEBUG + +#define FILE_NAME "test.slow5" + +void single_read_group_file(){ + + slow5_file_t *sf = slow5_open_write(FILE_NAME, "w"); + if(sf==NULL){ + fprintf(stderr,"Error opening file!\n"); + exit(EXIT_FAILURE); + } + + + /*********************** Header ******************/ + + slow5_hdr_t *header=sf->header; + //add a header group attribute called run_id + if (slow5_hdr_add_attr("run_id", header) != 0){ + fprintf(stderr,"Error adding run_id attribute\n"); + exit(EXIT_FAILURE); + } + //add another header group attribute called asic_id + if (slow5_hdr_add_attr("asic_id", header) != 0){ + fprintf(stderr,"Error adding asic_id attribute\n"); + exit(EXIT_FAILURE); + } + + //set the run_id attribute to "run_0" for read group 0 + if (slow5_hdr_set("run_id", "run_0", 0, header) != 0){ + fprintf(stderr,"Error setting run_id attribute in read group 0\n"); + exit(EXIT_FAILURE); + } + //set the asic_id attribute to "asic_0" for read group 1 + if (slow5_hdr_set("asic_id", "asic_id_0", 0, header) != 0){ + fprintf(stderr,"Error setting asic_id attribute in read group 0\n"); + exit(EXIT_FAILURE); + } + + //add auxilliary field: channel number + if (slow5_aux_meta_add(sf->header->aux_meta, "channel_number", SLOW5_STRING)!=0){ + fprintf(stderr,"Error adding channel_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + + //add axuilliary field: median_before + if (slow5_aux_meta_add(sf->header->aux_meta, "median_before", SLOW5_DOUBLE)!=0){ + fprintf(stderr,"Error adding median_before auxilliary field\n"); + exit(EXIT_FAILURE); + } + + //add axuilliary field: read_number + if(slow5_aux_meta_add_wrapper(sf->header, "read_number", SLOW5_INT32_T)!=0){ + fprintf(stderr,"Error adding read_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + //add axuilliary field: start_mux + if(slow5_aux_meta_add_wrapper(sf->header, "start_mux", SLOW5_UINT8_T)!=0){ + fprintf(stderr,"Error adding start_mux auxilliary field\n"); + exit(EXIT_FAILURE); + } + //add auxilliary field: start_time + if(slow5_aux_meta_add_wrapper(sf->header, "start_time", SLOW5_UINT64_T)!=0){ + fprintf(stderr,"Error adding start_time auxilliary field\n"); + exit(EXIT_FAILURE); + } + + if(slow5_header_write(sf) < 0){ + fprintf(stderr,"Error writing header!\n"); + exit(EXIT_FAILURE); + } + + + /******************* A SLOW5 record ************************/ + slow5_rec_t *slow5_record = slow5_rec_init(); + if(slow5_record == NULL){ + fprintf(stderr,"Could not allocate space for a slow5 record."); + exit(EXIT_FAILURE); + } + + //primary fields + slow5_record -> read_id = strdup("read_0"); + if(slow5_record->read_id == NULL){ + fprintf(stderr,"Could not allocate space for strdup."); + exit(EXIT_FAILURE); + } + slow5_record -> read_id_len = strlen(slow5_record -> read_id); + slow5_record -> read_group = 0; + slow5_record -> digitisation = 4096.0; + slow5_record -> offset = 3.0; + slow5_record -> range = 10.0; + slow5_record -> sampling_rate = 4000.0; + slow5_record -> len_raw_signal = 10; + slow5_record -> raw_signal = malloc(sizeof(int16_t)*10); + if(slow5_record->raw_signal == NULL){ + fprintf(stderr,"Could not allocate space for raw signal."); + exit(EXIT_FAILURE); + } + for(int i=0;i<10;i++){ + slow5_record->raw_signal[i] = i; + } + + //auxiliary fileds + char *channel_number = "channel_number"; + double median_before = 0.1; + int32_t read_number = 10; + uint8_t start_mux = 1; + uint64_t start_time = 100; + + if(slow5_rec_set_string_wrapper(slow5_record, sf->header, "channel_number", channel_number)!=0){ + fprintf(stderr,"Error setting channel_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + if(slow5_rec_set_wrapper(slow5_record, sf->header, "median_before", &median_before)!=0){ + fprintf(stderr,"Error setting median_before auxilliary field\n"); + exit(EXIT_FAILURE); + } + if(slow5_rec_set_wrapper(slow5_record, sf->header, "read_number", &read_number)!=0){ + fprintf(stderr,"Error setting read_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + + if(slow5_rec_set_wrapper(slow5_record, sf->header, "start_mux", &start_mux)!=0){ + fprintf(stderr,"Error setting start_mux auxilliary field\n"); + exit(EXIT_FAILURE); + } + + if(slow5_rec_set_wrapper(slow5_record, sf->header, "start_time", &start_time)!=0){ + fprintf(stderr,"Error setting start_time auxilliary field\n"); + exit(EXIT_FAILURE); + } + + slow5_rec_write(sf, slow5_record); + + slow5_rec_free(slow5_record); + + slow5_close_write(sf); + + + // // now some appending fun + + sf = slow5_open_write_append(FILE_NAME, "a"); + if(sf==NULL){ + fprintf(stderr,"Error opening file!\n"); + exit(EXIT_FAILURE); + } + + /******************* A SLOW5 record ************************/ + slow5_record = slow5_rec_init(); + if(slow5_record == NULL){ + fprintf(stderr,"Could not allocate space for a slow5 record."); + exit(EXIT_FAILURE); + } + + //primary fields + slow5_record -> read_id = strdup("read_1"); + if(slow5_record->read_id == NULL){ + fprintf(stderr,"Could not allocate space for strdup."); + exit(EXIT_FAILURE); + } + slow5_record -> read_id_len = strlen(slow5_record -> read_id); + slow5_record -> read_group = 0; + slow5_record -> digitisation = 4096.0; + slow5_record -> offset = 4.0; + slow5_record -> range = 12.0; + slow5_record -> sampling_rate = 4000.0; + slow5_record -> len_raw_signal = 12; + slow5_record -> raw_signal = malloc(sizeof(int16_t)*12); + if(slow5_record->raw_signal == NULL){ + fprintf(stderr,"Could not allocate space for raw signal."); + exit(EXIT_FAILURE); + } + for(int i=0;i<12;i++){ + slow5_record->raw_signal[i] = i; + } + + //auxiliary fileds + channel_number = "channel_number"; + median_before = 0.2; + read_number = 11; + start_mux = 2; + start_time = 200; + + if(slow5_rec_set_string_wrapper(slow5_record, sf->header, "channel_number", channel_number)!=0){ + fprintf(stderr,"Error setting channel_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + if(slow5_rec_set_wrapper(slow5_record, sf->header, "median_before", &median_before)!=0){ + fprintf(stderr,"Error setting median_before auxilliary field\n"); + exit(EXIT_FAILURE); + } + if(slow5_rec_set_wrapper(slow5_record, sf->header, "read_number", &read_number)!=0){ + fprintf(stderr,"Error setting read_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + + if(slow5_rec_set_wrapper(slow5_record, sf->header, "start_mux", &start_mux)!=0){ + fprintf(stderr,"Error setting start_mux auxilliary field\n"); + exit(EXIT_FAILURE); + } + + if(slow5_rec_set_wrapper(slow5_record, sf->header, "start_time", &start_time)!=0){ + fprintf(stderr,"Error setting start_time auxilliary field\n"); + exit(EXIT_FAILURE); + } + + slow5_rec_write(sf, slow5_record); + + slow5_rec_free(slow5_record); + + slow5_close_write(sf); + +} + + +int main(){ + + + single_read_group_file(); + + + return EXIT_SUCCESS; + + +} + +#endif +//gcc -Wall python/slow5_write.c -I include/ lib/libslow5.a -lm -lz -O2 -g -D PYSLOW5_WRITE_DEBUG=1 diff --git a/python/slow5_write.h b/python/slow5_write.h new file mode 100644 index 00000000..14a516d6 --- /dev/null +++ b/python/slow5_write.h @@ -0,0 +1,14 @@ +#ifndef PYSLOW5_WRITE_H +#define PYSLOW5_WRITE_H + +//these functionalities will be moved to the slow5lib API in a while, but names will change +slow5_file_t *slow5_open_write(const char *filename, const char *mode); +slow5_file_t *slow5_open_write_append(const char *filename, const char *mode); +int slow5_close_write(slow5_file_t *sf); +int slow5_header_write(slow5_file_t *sf); +int slow5_rec_write(slow5_file_t *sf, slow5_rec_t *rec); +int slow5_aux_meta_add_wrapper(slow5_hdr_t *header, const char *attr, enum slow5_aux_type type); +int slow5_rec_set_wrapper(struct slow5_rec *read, slow5_hdr_t *header, const char *attr, const void *data); +int slow5_rec_set_string_wrapper(struct slow5_rec *read, slow5_hdr_t *header, const char *attr, const char *data); + +#endif diff --git a/python/slow5threads.c b/python/slow5threads.c new file mode 100644 index 00000000..9df0e7e0 --- /dev/null +++ b/python/slow5threads.c @@ -0,0 +1,646 @@ +/* @file slow5threads.c +** +** @@ +******************************************************************************/ + +#include <assert.h> +#include <math.h> +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <slow5/slow5.h> +#include "../src/slow5_extra.h" +#include "slow5_write.h" + +#define SLOW5_WORK_STEAL 1 //simple work stealing enabled or not (no work stealing mean no load balancing) +#define SLOW5_STEAL_THRESH 1 //stealing threshold + +extern enum slow5_log_level_opt slow5_log_level; +extern enum slow5_exit_condition_opt slow5_exit_condition; + +#define SLOW5_MALLOC_CHK_LAZY_EXIT(ret) { \ + SLOW5_MALLOC_CHK(ret) \ + if (ret == NULL) { \ + exit(EXIT_FAILURE); \ + } \ +} + +/* a batch of read data (dynamic data based on the reads) */ +typedef struct { + int32_t n_rec; + int32_t capacity_rec; + + char **mem_records; //unused in get() + size_t *mem_bytes; + + slow5_rec_t **slow5_rec; + char **rid; //only used in get() + +} slow5_db_t; + + +/* core data structure (mostly static data throughout the program lifetime) */ +typedef struct { + //slow5 + slow5_file_t *sf; + int num_thread; + int batch_size; +} slow5_core_t; + + +/* argument wrapper for the multithreaded framework used for data processing */ +typedef struct { + slow5_core_t* core; + slow5_db_t* db; + int32_t starti; + int32_t endi; + void (*func)(slow5_core_t*,slow5_db_t*,int); + int32_t thread_index; +#ifdef SLOW5_WORK_STEAL + void *all_pthread_args; +#endif +} slow5_pt_arg_t; + + +/* initialise the core data structure */ +static slow5_core_t* slow5_init_core(slow5_file_t *s5p, int batch_size, int num_thread) { + + slow5_core_t* core = (slow5_core_t*)malloc(sizeof(slow5_core_t)); + SLOW5_MALLOC_CHK_LAZY_EXIT(core); + + core->sf = s5p; + core->batch_size = batch_size; + core->num_thread = num_thread; + + return core; +} + +/* free the core data structure */ +static void slow5_free_core(slow5_core_t* core) { + free(core); +} + +/* initialise a data batch */ +static slow5_db_t* slow5_init_db(slow5_core_t* core) { + slow5_db_t* db = (slow5_db_t*)(malloc(sizeof(slow5_db_t))); + SLOW5_MALLOC_CHK_LAZY_EXIT(db); + + db->capacity_rec = core->batch_size; + db->n_rec = 0; + + db->mem_records = (char**)(calloc(db->capacity_rec,sizeof(char*))); + SLOW5_MALLOC_CHK_LAZY_EXIT(db->mem_records); + db->mem_bytes = (size_t*)(calloc(db->capacity_rec,sizeof(size_t))); + SLOW5_MALLOC_CHK_LAZY_EXIT(db->mem_bytes); + + db->slow5_rec = (slow5_rec_t**)calloc(db->capacity_rec,sizeof(slow5_rec_t*)); + SLOW5_MALLOC_CHK_LAZY_EXIT(db->slow5_rec); + + return db; +} + +/* load a data batch from disk */ +static int slow5_load_db(slow5_core_t* core, slow5_db_t* db) { + + db->n_rec = 0; + + int32_t i = 0; + while (db->n_rec < db->capacity_rec) { + i=db->n_rec; + db->mem_records[i] = (char *)slow5_get_next_mem(&(db->mem_bytes[i]), core->sf); + + if (db->mem_records[i] == NULL) { + if (slow5_errno != SLOW5_ERR_EOF) { + SLOW5_ERROR("Error reading from SLOW5 file %d\n", slow5_errno); + exit(EXIT_FAILURE); + } + else { + SLOW5_LOG_DEBUG("%s","Last Batch!\n"); + break; + } + } + else { + db->n_rec++; + } + } + + return db->n_rec; +} + + +static int slow5_write_db(slow5_core_t* core, slow5_db_t* db) { + + + int32_t i = 0; + for(i=0;i<db->n_rec;i++) { + + size_t n = fwrite(db->mem_records[i], db->mem_bytes[i], 1, core->sf->fp); + if (n != 1) { + SLOW5_ERROR("Writing failed for read id %s!\n", db->slow5_rec[i]->read_id); + } + + } + + return i; +} + + +static void slow5_parse_single(slow5_core_t* core,slow5_db_t* db, int32_t i){ + + assert(db->mem_bytes[i]>0); + assert(db->mem_records[i]!=NULL); + int ret=slow5_rec_depress_parse(&db->mem_records[i], &db->mem_bytes[i], NULL, &db->slow5_rec[i], core->sf); + if(ret!=0){ + SLOW5_ERROR("Error parsing the record %s",db->slow5_rec[i]->read_id); + exit(EXIT_FAILURE); + } + +} + + +static void slow5_work_per_single_read(slow5_core_t* core,slow5_db_t* db, int32_t i){ + slow5_parse_single(core,db,i); +} + +static void slow5_work_per_single_read2(slow5_core_t* core,slow5_db_t* db, int32_t i){ + assert(db->rid[i]!=NULL); + int ret = slow5_get(db->rid[i],&db->slow5_rec[i], core->sf); + if(ret<0){ + SLOW5_ERROR("Error when fetching the read %s\n",db->rid[i]); + exit(EXIT_FAILURE); + } + db->mem_bytes[i]=ret; + +} + +static void slow5_work_per_single_read3(slow5_core_t* core,slow5_db_t* db, int32_t i){ + assert(db->slow5_rec[i]!=NULL); + slow5_file_t *sf = core->sf; + //fprintf(stderr,"Here %d\n",i); + slow5_press_method_t press_out = {SLOW5_COMPRESS_ZLIB, SLOW5_COMPRESS_SVB_ZD}; + slow5_press_t *press_ptr = slow5_press_init(press_out); + if(!press_ptr){ + SLOW5_ERROR("Could not initialize the slow5 compression method%s",""); + exit(EXIT_FAILURE); + } + db->mem_records[i] = slow5_rec_to_mem(db->slow5_rec[i], sf->header->aux_meta, sf->format, press_ptr, &(db->mem_bytes[i])); + //fprintf(stderr,"Here 2 %d\n",i); + slow5_press_free(press_ptr); + + if(db->mem_records[i] == NULL){ + SLOW5_ERROR("Error when converting the read %d to memory\n",i); + exit(EXIT_FAILURE); + } + +} + + +/* partially free a data batch - only the read dependent allocations are freed */ +static void slow5_free_db_tmp(slow5_db_t* db) { + int32_t i = 0; + for (i = 0; i < db->n_rec; ++i) { + free(db->mem_records[i]); + } +} + +/* completely free a data batch */ +static void slow5_free_db(slow5_db_t* db) { + + free(db->mem_records); + free(db->mem_bytes);; + + free(db); +} + + +static inline int32_t steal_work(slow5_pt_arg_t* all_args, int32_t num_thread) { + int32_t i, c_i = -1; + int32_t k; + for (i = 0; i < num_thread; ++i){ + slow5_pt_arg_t args = all_args[i]; + //fprintf(stderr,"endi : %d, starti : %d\n",args.endi,args.starti); + if (args.endi-args.starti > SLOW5_STEAL_THRESH) { + //fprintf(stderr,"gap : %d\n",args.endi-args.starti); + c_i = i; + break; + } + } + if(c_i<0){ + return -1; + } + k = __sync_fetch_and_add(&(all_args[c_i].starti), 1); + //fprintf(stderr,"k : %d, end %d, start %d\n",k,all_args[c_i].endi,all_args[c_i].starti); + return k >= all_args[c_i].endi ? -1 : k; +} + + +static void* slow5_pthread_single(void* voidargs) { + int32_t i; + slow5_pt_arg_t* args = (slow5_pt_arg_t*)voidargs; + slow5_db_t* db = args->db; + slow5_core_t* core = args->core; + +#ifndef SLOW5_WORK_STEAL + for (i = args->starti; i < args->endi; i++) { + args->func(core,db,i); + } +#else + slow5_pt_arg_t* all_args = (slow5_pt_arg_t*)(args->all_pthread_args); + //adapted from kthread.c in minimap2 + for (;;) { + i = __sync_fetch_and_add(&args->starti, 1); + if (i >= args->endi) { + break; + } + args->func(core,db,i); + } + while ((i = steal_work(all_args,core->num_thread)) >= 0){ + args->func(core,db,i); + } +#endif + + //fprintf(stderr,"Thread %d done\n",(myargs->position)/THREADS); + pthread_exit(0); +} + +static void slow5_pthread_db(slow5_core_t* core, slow5_db_t* db, void (*func)(slow5_core_t*,slow5_db_t*,int)){ + //create threads + pthread_t tids[core->num_thread]; + slow5_pt_arg_t pt_args[core->num_thread]; + int32_t t, ret; + int32_t i = 0; + int32_t num_thread = core->num_thread; + int32_t step = (db->n_rec + num_thread - 1) / num_thread; + //todo : check for higher num of threads than the data + //current works but many threads are created despite + + SLOW5_LOG_DEBUG("Creating %d threads\n",num_thread); + //set the data structures + for (t = 0; t < num_thread; t++) { + pt_args[t].core = core; + pt_args[t].db = db; + pt_args[t].starti = i; + i += step; + if (i > db->n_rec) { + pt_args[t].endi = db->n_rec; + } else { + pt_args[t].endi = i; + } + pt_args[t].func=func; + #ifdef SLOW5_WORK_STEAL + pt_args[t].all_pthread_args = (void *)pt_args; + #endif + //fprintf(stderr,"t%d : %d-%d\n",t,pt_args[t].starti,pt_args[t].endi); + + } + + //create threads + for(t = 0; t < core->num_thread; t++){ + ret = pthread_create(&tids[t], NULL, slow5_pthread_single, + (void*)(&pt_args[t])); + if(ret < 0){ + SLOW5_ERROR("Error creating thread %d\n",t); + exit(EXIT_FAILURE); + } + } + + //pthread joining + for (t = 0; t < core->num_thread; t++) { + int ret = pthread_join(tids[t], NULL); + if(ret < 0){ + SLOW5_ERROR("Error creating thread %d\n",t); + exit(EXIT_FAILURE); + } + } +} + +/* process all reads in the given batch db */ +static void slow5_work_db(slow5_core_t* core, slow5_db_t* db, void (*func)(slow5_core_t*,slow5_db_t*,int)){ + + if (core->num_thread == 1) { + int32_t i=0; + for (i = 0; i < db->n_rec; i++) { + func(core,db,i); + } + + } + + else { + slow5_pthread_db(core,db,func); + } +} + +int slow5_get_batch(slow5_rec_t ***read, slow5_file_t *s5p, char **rid, int num_rid, int num_threads){ + + slow5_core_t *core = slow5_init_core(s5p,num_rid,num_threads); + slow5_db_t* db = slow5_init_db(core); + + db->rid = rid; + db->n_rec = num_rid; + slow5_work_db(core,db,slow5_work_per_single_read2); + SLOW5_LOG_DEBUG("loaded and parsed %d recs\n",num_rid); + + *read = db->slow5_rec; + + slow5_free_db_tmp(db); + slow5_free_db(db); + slow5_free_core(core); + + return num_rid; +} + + +int slow5_get_next_batch(slow5_rec_t ***read, slow5_file_t *s5p, int batch_size, int num_threads){ + + slow5_core_t *core = slow5_init_core(s5p,batch_size,num_threads); + slow5_db_t* db = slow5_init_db(core); + + int num_read=slow5_load_db(core,db); + SLOW5_LOG_DEBUG("Loaded %d recs\n",num_read); + slow5_work_db(core,db,slow5_work_per_single_read); + SLOW5_LOG_DEBUG("Parsed %d recs\n",num_read); + + *read = db->slow5_rec; + + slow5_free_db_tmp(db); + slow5_free_db(db); + slow5_free_core(core); + + return num_read; +} + + +int slow5_write_batch(slow5_rec_t **read, slow5_file_t *s5p, int batch_size, int num_threads){ + + slow5_core_t *core = slow5_init_core(s5p,batch_size,num_threads); + slow5_db_t* db = slow5_init_db(core); + + db->n_rec = batch_size; + free(db->slow5_rec); //stupid lazy for now + db->slow5_rec = read; + slow5_work_db(core,db,slow5_work_per_single_read3); + SLOW5_LOG_DEBUG("Processed %d recs\n",batch_size); + + int num_wr=slow5_write_db(core,db); + SLOW5_LOG_DEBUG("Written %d recs\n",num_wr); + + db->slow5_rec = NULL; + slow5_free_db_tmp(db); + slow5_free_db(db); + slow5_free_core(core); + + return num_wr; +} + + + +void slow5_free_batch(slow5_rec_t ***read, int num_rec){ + + slow5_rec_t **reads = *read; + for(int i=0;i<num_rec;i++){ + slow5_rec_free(reads[i]); + } + + free(reads); + *read = NULL; +} + +#ifdef PYSLOW5_DEBUG_THREAD + +#define FILE_PATH "test.blow5" //for reading +#define FILE_PATH_WRITE "test.blow5" +//#define FILE_PATH "/home/jamfer/Data/SK/multi_fast5/s5/FAK40634_d1cc054609fe2c5fcdeac358864f9dc81c8bb793_95.blow5" + +int read_func(){ + + slow5_file_t *sp = slow5_open(FILE_PATH,"r"); + if(sp==NULL){ + fprintf(stderr,"Error in opening file\n"); + exit(EXIT_FAILURE); + } + slow5_rec_t **rec = NULL; + int ret=0; + int batch_size = 4096; + int num_thread = 8; + while((ret = slow5_get_next_batch(&rec,sp,batch_size,num_thread)) > 0){ + + for(int i=0;i<ret;i++){ + uint64_t len_raw_signal = rec[i]->len_raw_signal; + printf("%s\t%ld\n",rec[i]->read_id,len_raw_signal); + } + slow5_free_batch(&rec,ret); + + if(ret<batch_size){ //this indicates nothing left to read //need to handle errors + break; + } + } + + slow5_close(sp); + + + //now random read fun + sp = slow5_open(FILE_PATH,"r"); + if(sp==NULL){ + fprintf(stderr,"Error in opening file\n"); + exit(EXIT_FAILURE); + } + rec = NULL; + + ret = slow5_idx_load(sp); + if(ret<0){ + fprintf(stderr,"Error in loading index\n"); + exit(EXIT_FAILURE); + } + + int num_rid = 4; + num_thread = 2; + char *rid[num_rid]; + rid[0]="read_id_50"; + rid[1]="read_id_3999", + rid[2]="read_id_0"; + rid[3]="read_id_4"; + + ret = slow5_get_batch(&rec, sp, rid, num_rid, num_thread); + assert(ret==num_rid); + for(int i=0;i<ret;i++){ + uint64_t len_raw_signal = rec[i]->len_raw_signal; + printf("%s\t%ld\n",rec[i]->read_id,len_raw_signal); + } + slow5_free_batch(&rec,ret); + + slow5_idx_unload(sp); + slow5_close(sp); + + return 0; +} + + +int write_func(){ + + slow5_file_t *sf = slow5_open_write(FILE_PATH_WRITE,"w"); + if(sf==NULL){ + fprintf(stderr,"Error in opening file\n"); + exit(EXIT_FAILURE); + } + + /*********************** Header ******************/ + + slow5_hdr_t *header=sf->header; + //add a header group attribute called run_id + if (slow5_hdr_add_attr("run_id", header) != 0){ + fprintf(stderr,"Error adding run_id attribute\n"); + exit(EXIT_FAILURE); + } + //add another header group attribute called asic_id + if (slow5_hdr_add_attr("asic_id", header) != 0){ + fprintf(stderr,"Error adding asic_id attribute\n"); + exit(EXIT_FAILURE); + } + + //set the run_id attribute to "run_0" for read group 0 + if (slow5_hdr_set("run_id", "run_0", 0, header) != 0){ + fprintf(stderr,"Error setting run_id attribute in read group 0\n"); + exit(EXIT_FAILURE); + } + //set the asic_id attribute to "asic_0" for read group 1 + if (slow5_hdr_set("asic_id", "asic_id_0", 0, header) != 0){ + fprintf(stderr,"Error setting asic_id attribute in read group 0\n"); + exit(EXIT_FAILURE); + } + + //add auxilliary field: channel number + if (slow5_aux_meta_add(sf->header->aux_meta, "channel_number", SLOW5_STRING)!=0){ + fprintf(stderr,"Error adding channel_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + + //add axuilliary field: median_before + if (slow5_aux_meta_add(sf->header->aux_meta, "median_before", SLOW5_DOUBLE)!=0){ + fprintf(stderr,"Error adding median_before auxilliary field\n"); + exit(EXIT_FAILURE); + } + + //add axuilliary field: read_number + if(slow5_aux_meta_add_wrapper(sf->header, "read_number", SLOW5_INT32_T)!=0){ + fprintf(stderr,"Error adding read_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + //add axuilliary field: start_mux + if(slow5_aux_meta_add_wrapper(sf->header, "start_mux", SLOW5_UINT8_T)!=0){ + fprintf(stderr,"Error adding start_mux auxilliary field\n"); + exit(EXIT_FAILURE); + } + //add auxilliary field: start_time + if(slow5_aux_meta_add_wrapper(sf->header, "start_time", SLOW5_UINT64_T)!=0){ + fprintf(stderr,"Error adding start_time auxilliary field\n"); + exit(EXIT_FAILURE); + } + + if(slow5_header_write(sf) < 0){ + fprintf(stderr,"Error writing header!\n"); + exit(EXIT_FAILURE); + } + + + slow5_rec_t *rec[4000]; + int ret=0; + int batch_size = 4000; + int num_thread = 8; + + + /******************* SLOW5 records ************************/ + for(int i=0;i<batch_size;i++){ + + + slow5_rec_t *slow5_record = rec[i] = slow5_rec_init(); + + if(slow5_record == NULL){ + fprintf(stderr,"Could not allocate space for a slow5 record."); + exit(EXIT_FAILURE); + } + + //primary fields + char tmp_read_id[100]; + sprintf(tmp_read_id,"read_id_%d",i); + slow5_record -> read_id = strdup(tmp_read_id); + if(slow5_record->read_id == NULL){ + fprintf(stderr,"Could not allocate space for strdup."); + exit(EXIT_FAILURE); + } + slow5_record -> read_id_len = strlen(slow5_record -> read_id); + slow5_record -> read_group = 0; + slow5_record -> digitisation = 4096.0; + slow5_record -> offset = 3.0+i; + slow5_record -> range = 10.0+i; + slow5_record -> sampling_rate = 4000.0; + slow5_record -> len_raw_signal = 10+i; + slow5_record -> raw_signal = malloc(sizeof(int16_t)*(10+i)); + if(slow5_record->raw_signal == NULL){ + fprintf(stderr,"Could not allocate space for raw signal."); + exit(EXIT_FAILURE); + } + for(int j=0;j<10+i;j++){ + slow5_record->raw_signal[j] = j+i; + } + + //auxiliary fileds + char *channel_number = "channel_number"; + double median_before = 0.1+i; + int32_t read_number = 10+i; + uint8_t start_mux = (1+i)%4; + uint64_t start_time = 100+i; + + if(slow5_rec_set_string_wrapper(slow5_record, sf->header, "channel_number", channel_number)!=0){ + fprintf(stderr,"Error setting channel_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + if(slow5_rec_set_wrapper(slow5_record, sf->header, "median_before", &median_before)!=0){ + fprintf(stderr,"Error setting median_before auxilliary field\n"); + exit(EXIT_FAILURE); + } + if(slow5_rec_set_wrapper(slow5_record, sf->header, "read_number", &read_number)!=0){ + fprintf(stderr,"Error setting read_number auxilliary field\n"); + exit(EXIT_FAILURE); + } + + if(slow5_rec_set_wrapper(slow5_record, sf->header, "start_mux", &start_mux)!=0){ + fprintf(stderr,"Error setting start_mux auxilliary field\n"); + exit(EXIT_FAILURE); + } + + if(slow5_rec_set_wrapper(slow5_record, sf->header, "start_time", &start_time)!=0){ + fprintf(stderr,"Error setting start_time auxilliary field\n"); + exit(EXIT_FAILURE); + } + } + //end of record setup + + ret = slow5_write_batch(rec,sf,batch_size,num_thread); + + if(ret<batch_size){ + fprintf(stderr,"Writing failed\n"); + exit(EXIT_FAILURE); + } + + slow5_close_write(sf); + + for(int i=0;i<batch_size;i++){ + slow5_rec_free(rec[i]); + } + + return 0; +} + +int main(){ + + write_func(); + read_func(); + + + return 0; +} + +//gcc -Wall python/slow5threads.c python/slow5_write.c -I include/ lib/libslow5.a -lpthread -lz -DPYSLOW5_DEBUG_THREAD=1 -O2 -g + +#endif \ No newline at end of file diff --git a/python/slow5threads.h b/python/slow5threads.h new file mode 100644 index 00000000..2c09c48f --- /dev/null +++ b/python/slow5threads.h @@ -0,0 +1,17 @@ +/* @file slow5threads.h +** +******************************************************************************/ + +#ifndef SLOW5THREADS_H +#define SLOW5THREADS_H + +//these functions will lazily exit on error (need to do proper error handling, but a bit too much work at the moment) +//also these functions are not optimised for cases that are unlikely to be bottlenecks +//that is they do superfluous mallocs and free and computations in cases which are unlikely to be bottlenecks +//also each batch call will create and destruct threads rather than using a thread pool +int slow5_get_batch(slow5_rec_t ***read, slow5_file_t *s5p, char **rid, int num_rid, int num_threads); +int slow5_get_next_batch(slow5_rec_t ***read, slow5_file_t *s5p, int batch_size, int num_threads); +int slow5_write_batch(slow5_rec_t **read, slow5_file_t *s5p, int batch_size, int num_threads); +void slow5_free_batch(slow5_rec_t ***read, int num_rec); + +#endif diff --git a/python/valgrind-python.supp b/python/valgrind-python.supp new file mode 100644 index 00000000..487f8dc8 --- /dev/null +++ b/python/valgrind-python.supp @@ -0,0 +1,499 @@ +# +# This is a valgrind suppression file that should be used when using valgrind. +# +# Here's an example of running valgrind: +# +# cd python/dist/src +# valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \ +# ./python -E ./Lib/test/regrtest.py -u gui,network +# +# You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER +# to use the preferred suppressions with address_in_range. +# +# If you do not want to recompile Python, you can uncomment +# suppressions for _PyObject_Free and _PyObject_Realloc. +# +# See Misc/README.valgrind for more information. + +# all tool names: Addrcheck,Memcheck,cachegrind,helgrind,massif +{ + ADDRESS_IN_RANGE/Invalid read of size 4 + Memcheck:Addr4 + fun:address_in_range +} + +{ + ADDRESS_IN_RANGE/Invalid read of size 4 + Memcheck:Value4 + fun:address_in_range +} + +{ + ADDRESS_IN_RANGE/Invalid read of size 8 (x86_64 aka amd64) + Memcheck:Value8 + fun:address_in_range +} + +{ + ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value + Memcheck:Cond + fun:address_in_range +} + +# +# Leaks (including possible leaks) +# Hmmm, I wonder if this masks some real leaks. I think it does. +# Will need to fix that. +# + +{ + Suppress leaking the GIL. Happens once per process, see comment in ceval.c. + Memcheck:Leak + fun:malloc + fun:PyThread_allocate_lock + fun:PyEval_InitThreads +} + +{ + Suppress leaking the GIL after a fork. + Memcheck:Leak + fun:malloc + fun:PyThread_allocate_lock + fun:PyEval_ReInitThreads +} + +{ + Suppress leaking the autoTLSkey. This looks like it shouldn't leak though. + Memcheck:Leak + fun:malloc + fun:PyThread_create_key + fun:_PyGILState_Init + fun:Py_InitializeEx + fun:Py_Main +} + +{ + Hmmm, is this a real leak or like the GIL? + Memcheck:Leak + fun:malloc + fun:PyThread_ReInitTLS +} + +{ + Handle PyMalloc confusing valgrind (possibly leaked) + Memcheck:Leak + fun:realloc + fun:_PyObject_GC_Resize + fun:COMMENT_THIS_LINE_TO_DISABLE_LEAK_WARNING +} + +{ + Handle PyMalloc confusing valgrind (possibly leaked) + Memcheck:Leak + fun:malloc + fun:_PyObject_GC_New + fun:COMMENT_THIS_LINE_TO_DISABLE_LEAK_WARNING +} + +{ + Handle PyMalloc confusing valgrind (possibly leaked) + Memcheck:Leak + fun:malloc + fun:_PyObject_GC_NewVar + fun:COMMENT_THIS_LINE_TO_DISABLE_LEAK_WARNING +} + +# +# Non-python specific leaks +# + +{ + Handle pthread issue (possibly leaked) + Memcheck:Leak + fun:calloc + fun:allocate_dtv + fun:_dl_allocate_tls_storage + fun:_dl_allocate_tls +} + +{ + Handle pthread issue (possibly leaked) + Memcheck:Leak + fun:memalign + fun:_dl_allocate_tls_storage + fun:_dl_allocate_tls +} + +{ + ADDRESS_IN_RANGE/Invalid read of size 4 + Memcheck:Addr4 + fun:_PyObject_Free +} + +{ + ADDRESS_IN_RANGE/Invalid read of size 4 + Memcheck:Value4 + fun:_PyObject_Free +} + +{ + ADDRESS_IN_RANGE/Use of uninitialised value of size 8 + Memcheck:Addr8 + fun:_PyObject_Free +} + +{ + ADDRESS_IN_RANGE/Use of uninitialised value of size 8 + Memcheck:Value8 + fun:_PyObject_Free +} + +{ + ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value + Memcheck:Cond + fun:_PyObject_Free +} + +{ + ADDRESS_IN_RANGE/Invalid read of size 4 + Memcheck:Addr4 + fun:_PyObject_Realloc +} + +{ + ADDRESS_IN_RANGE/Invalid read of size 4 + Memcheck:Value4 + fun:_PyObject_Realloc +} + +{ + ADDRESS_IN_RANGE/Use of uninitialised value of size 8 + Memcheck:Addr8 + fun:_PyObject_Realloc +} + +{ + ADDRESS_IN_RANGE/Use of uninitialised value of size 8 + Memcheck:Value8 + fun:_PyObject_Realloc +} + +{ + ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value + Memcheck:Cond + fun:_PyObject_Realloc +} + +### +### All the suppressions below are for errors that occur within libraries +### that Python uses. The problems to not appear to be related to Python's +### use of the libraries. +### + +{ + Generic ubuntu ld problems + Memcheck:Addr8 + obj:/lib/ld-2.4.so + obj:/lib/ld-2.4.so + obj:/lib/ld-2.4.so + obj:/lib/ld-2.4.so +} + +{ + Generic gentoo ld problems + Memcheck:Cond + obj:/lib/ld-2.3.4.so + obj:/lib/ld-2.3.4.so + obj:/lib/ld-2.3.4.so + obj:/lib/ld-2.3.4.so +} + +{ + DBM problems, see test_dbm + Memcheck:Param + write(buf) + fun:write + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + fun:dbm_close +} + +{ + DBM problems, see test_dbm + Memcheck:Value8 + fun:memmove + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + fun:dbm_store + fun:dbm_ass_sub +} + +{ + DBM problems, see test_dbm + Memcheck:Cond + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + fun:dbm_store + fun:dbm_ass_sub +} + +{ + DBM problems, see test_dbm + Memcheck:Cond + fun:memmove + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + obj:/usr/lib/libdb1.so.2 + fun:dbm_store + fun:dbm_ass_sub +} + +{ + GDBM problems, see test_gdbm + Memcheck:Param + write(buf) + fun:write + fun:gdbm_open + +} + +{ + Uninitialised byte(s) false alarm, see bpo-35561 + Memcheck:Param + epoll_ctl(event) + fun:epoll_ctl + fun:pyepoll_internal_ctl +} + +{ + ZLIB problems, see test_gzip + Memcheck:Cond + obj:/lib/libz.so.1.2.3 + obj:/lib/libz.so.1.2.3 + fun:deflate +} + +{ + Avoid problems w/readline doing a putenv and leaking on exit + Memcheck:Leak + fun:malloc + fun:xmalloc + fun:sh_set_lines_and_columns + fun:_rl_get_screen_size + fun:_rl_init_terminal_io + obj:/lib/libreadline.so.4.3 + fun:rl_initialize +} + +# Valgrind emits "Conditional jump or move depends on uninitialised value(s)" +# false alarms on GCC builtin strcmp() function. The GCC code is correct. +# +# Valgrind bug: https://bugs.kde.org/show_bug.cgi?id=264936 +{ + bpo-38118: Valgrind emits false alarm on GCC builtin strcmp() + Memcheck:Cond + fun:PyUnicode_Decode +} + + +### +### These occur from somewhere within the SSL, when running +### test_socket_sll. They are too general to leave on by default. +### +###{ +### somewhere in SSL stuff +### Memcheck:Cond +### fun:memset +###} +###{ +### somewhere in SSL stuff +### Memcheck:Value4 +### fun:memset +###} +### +###{ +### somewhere in SSL stuff +### Memcheck:Cond +### fun:MD5_Update +###} +### +###{ +### somewhere in SSL stuff +### Memcheck:Value4 +### fun:MD5_Update +###} + +# Fedora's package "openssl-1.0.1-0.1.beta2.fc17.x86_64" on x86_64 +# See http://bugs.python.org/issue14171 +{ + openssl 1.0.1 prng 1 + Memcheck:Cond + fun:bcmp + fun:fips_get_entropy + fun:FIPS_drbg_instantiate + fun:RAND_init_fips + fun:OPENSSL_init_library + fun:SSL_library_init + fun:init_hashlib +} + +{ + openssl 1.0.1 prng 2 + Memcheck:Cond + fun:fips_get_entropy + fun:FIPS_drbg_instantiate + fun:RAND_init_fips + fun:OPENSSL_init_library + fun:SSL_library_init + fun:init_hashlib +} + +{ + openssl 1.0.1 prng 3 + Memcheck:Value8 + fun:_x86_64_AES_encrypt_compact + fun:AES_encrypt +} + +# +# All of these problems come from using test_socket_ssl +# +{ + from test_socket_ssl + Memcheck:Cond + fun:BN_bin2bn +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:BN_num_bits_word +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:BN_num_bits_word +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:BN_mod_exp_mont_word +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:BN_mod_exp_mont +} + +{ + from test_socket_ssl + Memcheck:Param + write(buf) + fun:write + obj:/usr/lib/libcrypto.so.0.9.7 +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:RSA_verify +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:RSA_verify +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:DES_set_key_unchecked +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:DES_encrypt2 +} + +{ + from test_socket_ssl + Memcheck:Cond + obj:/usr/lib/libssl.so.0.9.7 +} + +{ + from test_socket_ssl + Memcheck:Value4 + obj:/usr/lib/libssl.so.0.9.7 +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:BUF_MEM_grow_clean +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:memcpy + fun:ssl3_read_bytes +} + +{ + from test_socket_ssl + Memcheck:Cond + fun:SHA1_Update +} + +{ + from test_socket_ssl + Memcheck:Value4 + fun:SHA1_Update +} + +{ + test_buffer_non_debug + Memcheck:Addr4 + fun:PyUnicodeUCS2_FSConverter +} + +{ + test_buffer_non_debug + Memcheck:Addr4 + fun:PyUnicode_FSConverter +} + +{ + wcscmp_false_positive + Memcheck:Addr8 + fun:wcscmp + fun:_PyOS_GetOpt + fun:Py_Main + fun:main +} + +# Additional suppressions for the unified decimal tests: +{ + test_decimal + Memcheck:Addr4 + fun:PyUnicodeUCS2_FSConverter +} + +{ + test_decimal2 + Memcheck:Addr4 + fun:PyUnicode_FSConverter +} + diff --git a/setup.py b/setup.py index f5c3a5b7..642ad355 100644 --- a/setup.py +++ b/setup.py @@ -36,13 +36,17 @@ def build_ext(*args, ** kwargs ): #adapted from https://github.com/lh3/minimap2/blob/master/setup.py sources=['python/pyslow5.pyx', 'src/slow5.c', 'src/slow5_press.c', 'src/slow5_misc.c', 'src/slow5_idx.c', + 'python/slow5_write.c', 'python/slow5threads.c', 'thirdparty/streamvbyte/src/streamvbyte_zigzag.c', 'thirdparty/streamvbyte/src/streamvbyte_decode.c', 'thirdparty/streamvbyte/src/streamvbyte_encode.c'] depends=['python/pyslow5.pxd', 'python/pyslow5.h', + 'python/slow5_write.h', 'python/slow5threads.h', 'slow5/slow5.h', 'slow5/slow5_defs.h', 'slow5/slow5_error.h', 'slow5/slow5_press.h', 'slow5/klib/khash.h', 'slow5/klib/kvec.h', - 'src/slow5_extra.h', 'src/slow5_idx.h', 'src/slow5_misc.h', 'src/klib/ksort.h' , + 'src/slow5_extra.h', 'src/slow5_idx.h', 'src/slow5_misc.h', 'src/klib/ksort.h', 'thirdparty/streamvbyte/include/streamvbyte.h', 'thirdparty/streamvbyte/include/streamvbyte_zigzag.h'] extra_compile_args = ['-g', '-Wall', '-O2', '-std=c99'] +# extra_compile_args = [] +# os.environ["CFLAGS"] = '-g -Wall -O2 -std=c99' arch=platform.machine() if arch in ["aarch64", "arm64"]:
initial implementation of getting a random batch
2022-04-21T03:19:35
0.0
[]
[]
cdklabs/awscdk-appsync-utils
cdklabs__awscdk-appsync-utils-10
79152454be2e98a3374fecf6bfe2c995eca89c12
diff --git a/.projen/deps.json b/.projen/deps.json index 9253ad2..d3c3d20 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -1,10 +1,5 @@ { "dependencies": [ - { - "name": "@aws-cdk/aws-appsync-alpha", - "version": "2.55.1-alpha.0", - "type": "build" - }, { "name": "@types/jest", "version": "^27", @@ -27,7 +22,7 @@ }, { "name": "aws-cdk-lib", - "version": "2.55.1", + "version": "2.60.0", "type": "build" }, { @@ -115,14 +110,9 @@ "version": "2.6.0", "type": "override" }, - { - "name": "@aws-cdk/aws-appsync-alpha", - "version": "2.55.1-alpha.0", - "type": "peer" - }, { "name": "aws-cdk-lib", - "version": "^2.55.1", + "version": "^2.60.0", "type": "peer" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index 1f474a6..7d5c99f 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -295,19 +295,19 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='@aws-cdk/aws-appsync-alpha,aws-cdk-lib,constructs'" + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='aws-cdk-lib,constructs'" }, { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='@aws-cdk/aws-appsync-alpha,aws-cdk-lib,constructs'" + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='aws-cdk-lib,constructs'" }, { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='@aws-cdk/aws-appsync-alpha,aws-cdk-lib,constructs'" + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='aws-cdk-lib,constructs'" }, { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='@aws-cdk/aws-appsync-alpha,aws-cdk-lib,constructs'" + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='aws-cdk-lib,constructs'" }, { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='@aws-cdk/aws-appsync-alpha,aws-cdk-lib,constructs'" + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='aws-cdk-lib,constructs'" }, { "exec": "yarn install --check-files" diff --git a/.projenrc.js b/.projenrc.js index 65c2a9a..f742254 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -1,13 +1,9 @@ const { awscdk } = require('projen'); -// CDK and alpha package versions need to be in sync -const CDK_VERSION = '2.55.1'; -const APPSYNC_ALPHA_VERSION = `${CDK_VERSION}-alpha.0`; - const project = new awscdk.AwsCdkConstructLibrary({ author: 'Mitchell Valine', authorAddress: '[email protected]', - cdkVersion: CDK_VERSION, + cdkVersion: '2.60.0', defaultReleaseBranch: 'main', name: 'awscdk-appsync-utils', repositoryUrl: 'https://github.com/cdklabs/awscdk-appsync-utils.git', @@ -15,10 +11,6 @@ const project = new awscdk.AwsCdkConstructLibrary({ // deps: [], /* Runtime dependencies of this module. */ // description: undefined, /* The description is just a string that helps people understand the purpose of the package. */ - devDeps: [ - '@aws-cdk/aws-appsync-alpha', - ], - peerDeps: [`@aws-cdk/aws-appsync-alpha@${APPSYNC_ALPHA_VERSION}`], publishToMaven: { javaPackage: 'io.github.cdklabs.awscdk.appsync.utils', mavenGroupId: 'io.github.cdklabs', diff --git a/API.md b/API.md index 970edce..ebc2091 100644 --- a/API.md +++ b/API.md @@ -413,10 +413,10 @@ const resolvableFieldOptions: ResolvableFieldOptions = { ... } | <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.returnType">returnType</a></code> | <code><a href="#awscdk-appsync-utils.GraphqlType">GraphqlType</a></code> | The return type for this field. | | <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.args">args</a></code> | <code>{[ key: string ]: <a href="#awscdk-appsync-utils.GraphqlType">GraphqlType</a>}</code> | The arguments for this field. | | <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.directives">directives</a></code> | <code><a href="#awscdk-appsync-utils.Directive">Directive</a>[]</code> | the directives for this field. | -| <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.dataSource">dataSource</a></code> | <code>@aws-cdk/aws-appsync-alpha.BaseDataSource</code> | The data source creating linked to this resolvable field. | -| <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.pipelineConfig">pipelineConfig</a></code> | <code>@aws-cdk/aws-appsync-alpha.IAppsyncFunction[]</code> | configuration of the pipeline resolver. | -| <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.requestMappingTemplate">requestMappingTemplate</a></code> | <code>@aws-cdk/aws-appsync-alpha.MappingTemplate</code> | The request mapping template for this resolver. | -| <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.responseMappingTemplate">responseMappingTemplate</a></code> | <code>@aws-cdk/aws-appsync-alpha.MappingTemplate</code> | The response mapping template for this resolver. | +| <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.dataSource">dataSource</a></code> | <code>aws-cdk-lib.aws_appsync.BaseDataSource</code> | The data source creating linked to this resolvable field. | +| <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.pipelineConfig">pipelineConfig</a></code> | <code>aws-cdk-lib.aws_appsync.IAppsyncFunction[]</code> | configuration of the pipeline resolver. | +| <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.requestMappingTemplate">requestMappingTemplate</a></code> | <code>aws-cdk-lib.aws_appsync.MappingTemplate</code> | The request mapping template for this resolver. | +| <code><a href="#awscdk-appsync-utils.ResolvableFieldOptions.property.responseMappingTemplate">responseMappingTemplate</a></code> | <code>aws-cdk-lib.aws_appsync.MappingTemplate</code> | The response mapping template for this resolver. | --- @@ -468,7 +468,7 @@ the directives for this field. public readonly dataSource: BaseDataSource; ``` -- *Type:* @aws-cdk/aws-appsync-alpha.BaseDataSource +- *Type:* aws-cdk-lib.aws_appsync.BaseDataSource - *Default:* no data source The data source creating linked to this resolvable field. @@ -481,7 +481,7 @@ The data source creating linked to this resolvable field. public readonly pipelineConfig: IAppsyncFunction[]; ``` -- *Type:* @aws-cdk/aws-appsync-alpha.IAppsyncFunction[] +- *Type:* aws-cdk-lib.aws_appsync.IAppsyncFunction[] - *Default:* no pipeline resolver configuration An empty array or undefined prop will set resolver to be of type unit configuration of the pipeline resolver. @@ -494,7 +494,7 @@ configuration of the pipeline resolver. public readonly requestMappingTemplate: MappingTemplate; ``` -- *Type:* @aws-cdk/aws-appsync-alpha.MappingTemplate +- *Type:* aws-cdk-lib.aws_appsync.MappingTemplate - *Default:* No mapping template The request mapping template for this resolver. @@ -507,7 +507,7 @@ The request mapping template for this resolver. public readonly responseMappingTemplate: MappingTemplate; ``` -- *Type:* @aws-cdk/aws-appsync-alpha.MappingTemplate +- *Type:* aws-cdk-lib.aws_appsync.MappingTemplate - *Default:* No mapping template The response mapping template for this resolver. @@ -550,7 +550,7 @@ the object types for this union type. ### CodeFirstSchema <a name="CodeFirstSchema" id="awscdk-appsync-utils.CodeFirstSchema"></a> -- *Implements:* @aws-cdk/aws-appsync-alpha.ISchema +- *Implements:* aws-cdk-lib.aws_appsync.ISchema #### Initializers <a name="Initializers" id="awscdk-appsync-utils.CodeFirstSchema.Initializer"></a> @@ -715,7 +715,7 @@ Called when the GraphQL Api is initialized to allow this object to bind to the s ###### `api`<sup>Required</sup> <a name="api" id="awscdk-appsync-utils.CodeFirstSchema.bind.parameter.api"></a> -- *Type:* @aws-cdk/aws-appsync-alpha.IGraphqlApi +- *Type:* aws-cdk-lib.aws_appsync.IGraphqlApi The binding GraphQL Api. @@ -723,7 +723,7 @@ The binding GraphQL Api. ###### `_options`<sup>Optional</sup> <a name="_options" id="awscdk-appsync-utils.CodeFirstSchema.bind.parameter._options"></a> -- *Type:* @aws-cdk/aws-appsync-alpha.SchemaBindOptions +- *Type:* aws-cdk-lib.aws_appsync.SchemaBindOptions --- @@ -874,7 +874,7 @@ the mutation fields to link to. | **Name** | **Type** | **Description** | | --- | --- | --- | -| <code><a href="#awscdk-appsync-utils.Directive.property.mode">mode</a></code> | <code>@aws-cdk/aws-appsync-alpha.AuthorizationType</code> | The authorization type of this directive. | +| <code><a href="#awscdk-appsync-utils.Directive.property.mode">mode</a></code> | <code>aws-cdk-lib.aws_appsync.AuthorizationType</code> | The authorization type of this directive. | | <code><a href="#awscdk-appsync-utils.Directive.property.mutationFields">mutationFields</a></code> | <code>string[]</code> | Mutation fields for a subscription directive. | --- @@ -885,7 +885,7 @@ the mutation fields to link to. public readonly mode: AuthorizationType; ``` -- *Type:* @aws-cdk/aws-appsync-alpha.AuthorizationType +- *Type:* aws-cdk-lib.aws_appsync.AuthorizationType - *Default:* not an authorization directive The authorization type of this directive. @@ -1079,7 +1079,7 @@ Generate the directives for this field. ###### `modes`<sup>Optional</sup> <a name="modes" id="awscdk-appsync-utils.Field.directivesToString.parameter.modes"></a> -- *Type:* @aws-cdk/aws-appsync-alpha.AuthorizationType[] +- *Type:* aws-cdk-lib.aws_appsync.AuthorizationType[] --- @@ -1557,7 +1557,7 @@ Generate the directives for this field. ###### `_modes`<sup>Optional</sup> <a name="_modes" id="awscdk-appsync-utils.GraphqlType.directivesToString.parameter._modes"></a> -- *Type:* @aws-cdk/aws-appsync-alpha.AuthorizationType[] +- *Type:* aws-cdk-lib.aws_appsync.AuthorizationType[] --- @@ -2302,7 +2302,7 @@ Generate the string of this object type. | <code><a href="#awscdk-appsync-utils.ObjectType.property.name">name</a></code> | <code>string</code> | the name of this type. | | <code><a href="#awscdk-appsync-utils.ObjectType.property.directives">directives</a></code> | <code><a href="#awscdk-appsync-utils.Directive">Directive</a>[]</code> | the directives for this object type. | | <code><a href="#awscdk-appsync-utils.ObjectType.property.interfaceTypes">interfaceTypes</a></code> | <code><a href="#awscdk-appsync-utils.InterfaceType">InterfaceType</a>[]</code> | The Interface Types this Object Type implements. | -| <code><a href="#awscdk-appsync-utils.ObjectType.property.resolvers">resolvers</a></code> | <code>@aws-cdk/aws-appsync-alpha.Resolver[]</code> | The resolvers linked to this data source. | +| <code><a href="#awscdk-appsync-utils.ObjectType.property.resolvers">resolvers</a></code> | <code>aws-cdk-lib.aws_appsync.Resolver[]</code> | The resolvers linked to this data source. | --- @@ -2362,7 +2362,7 @@ The Interface Types this Object Type implements. public readonly resolvers: Resolver[]; ``` -- *Type:* @aws-cdk/aws-appsync-alpha.Resolver[] +- *Type:* aws-cdk-lib.aws_appsync.Resolver[] The resolvers linked to this data source. @@ -2423,7 +2423,7 @@ Generate the directives for this field. ###### `modes`<sup>Optional</sup> <a name="modes" id="awscdk-appsync-utils.ResolvableField.directivesToString.parameter.modes"></a> -- *Type:* @aws-cdk/aws-appsync-alpha.AuthorizationType[] +- *Type:* aws-cdk-lib.aws_appsync.AuthorizationType[] --- @@ -2991,7 +2991,7 @@ Generate the directives for this field. ###### `modes`<sup>Optional</sup> <a name="modes" id="awscdk-appsync-utils.IField.directivesToString.parameter.modes"></a> -- *Type:* @aws-cdk/aws-appsync-alpha.AuthorizationType[] +- *Type:* aws-cdk-lib.aws_appsync.AuthorizationType[] the authorization modes of the graphql api. @@ -3158,7 +3158,7 @@ Generate the string of this object type. | <code><a href="#awscdk-appsync-utils.IIntermediateType.property.directives">directives</a></code> | <code><a href="#awscdk-appsync-utils.Directive">Directive</a>[]</code> | the directives for this object type. | | <code><a href="#awscdk-appsync-utils.IIntermediateType.property.interfaceTypes">interfaceTypes</a></code> | <code><a href="#awscdk-appsync-utils.InterfaceType">InterfaceType</a>[]</code> | The Interface Types this Intermediate Type implements. | | <code><a href="#awscdk-appsync-utils.IIntermediateType.property.intermediateType">intermediateType</a></code> | <code><a href="#awscdk-appsync-utils.IIntermediateType">IIntermediateType</a></code> | the intermediate type linked to this attribute (i.e. an interface or an object). | -| <code><a href="#awscdk-appsync-utils.IIntermediateType.property.resolvers">resolvers</a></code> | <code>@aws-cdk/aws-appsync-alpha.Resolver[]</code> | The resolvers linked to this data source. | +| <code><a href="#awscdk-appsync-utils.IIntermediateType.property.resolvers">resolvers</a></code> | <code>aws-cdk-lib.aws_appsync.Resolver[]</code> | The resolvers linked to this data source. | --- @@ -3231,7 +3231,7 @@ the intermediate type linked to this attribute (i.e. an interface or an object). public readonly resolvers: Resolver[]; ``` -- *Type:* @aws-cdk/aws-appsync-alpha.Resolver[] +- *Type:* aws-cdk-lib.aws_appsync.Resolver[] The resolvers linked to this data source. diff --git a/package.json b/package.json index 8e2f002..a0600fc 100644 --- a/package.json +++ b/package.json @@ -39,12 +39,11 @@ "organization": false }, "devDependencies": { - "@aws-cdk/aws-appsync-alpha": "2.55.1-alpha.0", "@types/jest": "^27", "@types/node": "^14", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "aws-cdk-lib": "2.55.1", + "aws-cdk-lib": "2.60.0", "constructs": "10.0.5", "eslint": "^8", "eslint-import-resolver-node": "^0.3.6", @@ -64,8 +63,7 @@ "typescript": "^4.9.4" }, "peerDependencies": { - "@aws-cdk/aws-appsync-alpha": "2.55.1-alpha.0", - "aws-cdk-lib": "^2.55.1", + "aws-cdk-lib": "^2.60.0", "constructs": "^10.0.5" }, "keywords": [ diff --git a/src/index.ts b/src/index.ts index 449fa24..fea5a56 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,5 @@ -import { SchemaBindOptions, ISchema, ISchemaConfig, IGraphqlApi } from '@aws-cdk/aws-appsync-alpha'; import { Lazy } from 'aws-cdk-lib'; +import { SchemaBindOptions, ISchema, ISchemaConfig, IGraphqlApi } from 'aws-cdk-lib/aws-appsync'; import { shapeAddition } from './private'; import { IIntermediateType } from './schema-base'; import { Field, ResolvableField } from './schema-field'; diff --git a/src/private.ts b/src/private.ts index 48cac09..99b25ca 100644 --- a/src/private.ts +++ b/src/private.ts @@ -1,4 +1,4 @@ -import { AuthorizationType } from '@aws-cdk/aws-appsync-alpha'; +import { AuthorizationType } from 'aws-cdk-lib/aws-appsync'; import { Directive } from './schema-base'; import { InterfaceType } from './schema-intermediate'; diff --git a/src/schema-base.ts b/src/schema-base.ts index d4780e6..ca85782 100644 --- a/src/schema-base.ts +++ b/src/schema-base.ts @@ -1,4 +1,4 @@ -import { Resolver, AuthorizationType, IGraphqlApi } from '@aws-cdk/aws-appsync-alpha'; +import { Resolver, AuthorizationType, IGraphqlApi } from 'aws-cdk-lib/aws-appsync'; import { BaseTypeOptions, GraphqlType, ResolvableFieldOptions } from './schema-field'; import { InterfaceType } from './schema-intermediate'; diff --git a/src/schema-field.ts b/src/schema-field.ts index ed1d8de..6538989 100644 --- a/src/schema-field.ts +++ b/src/schema-field.ts @@ -1,4 +1,4 @@ -import { IAppsyncFunction, BaseDataSource, AuthorizationType, MappingTemplate } from '@aws-cdk/aws-appsync-alpha'; +import { IAppsyncFunction, BaseDataSource, AuthorizationType, MappingTemplate } from 'aws-cdk-lib/aws-appsync'; import { Type, IField, IIntermediateType, Directive } from './schema-base'; /** diff --git a/src/schema-intermediate.ts b/src/schema-intermediate.ts index 6def1ad..4c71a54 100644 --- a/src/schema-intermediate.ts +++ b/src/schema-intermediate.ts @@ -1,4 +1,4 @@ -import { Resolver, IGraphqlApi, AuthorizationType, GraphqlApi } from '@aws-cdk/aws-appsync-alpha'; +import { Resolver, IGraphqlApi, AuthorizationType, GraphqlApi } from 'aws-cdk-lib/aws-appsync'; import { shapeAddition } from './private'; import { Directive, IField, IIntermediateType, AddFieldOptions } from './schema-base'; import { BaseTypeOptions, GraphqlType, ResolvableFieldOptions, ResolvableField } from './schema-field'; diff --git a/yarn.lock b/yarn.lock index 40643f8..4a46ca0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,7 +10,7 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@aws-cdk/asset-awscli-v1@^2.2.30": +"@aws-cdk/asset-awscli-v1@^2.2.49": version "2.2.49" resolved "https://registry.yarnpkg.com/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.49.tgz#af7618a3a39bf103f82d7aa396efa50e6ae79092" integrity sha512-Qd5bdLlC/sphWQQPNn7etKXWCh+fij7DWxtkIwvhhZ+LM6UEApGLS8sBLBQcRO2ZQdEuNb+zeClUy+3DNojfeg== @@ -25,11 +25,6 @@ resolved "https://registry.yarnpkg.com/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.38.tgz#6765bef55f95220c52decb4adba8f75c1817b0f7" integrity sha512-BBwAjORhuUkTGO3CxGS5Evcp5n20h9v06Sftn2R1DuSm8zIoUlPsNlI1HUk8XqYuoEI4aD7IKRQBLglv09ciJQ== -"@aws-cdk/[email protected]": - version "2.55.1-alpha.0" - resolved "https://registry.yarnpkg.com/@aws-cdk/aws-appsync-alpha/-/aws-appsync-alpha-2.55.1-alpha.0.tgz#d38bd350553e6c5ebb6d3c9d95be2ff55d000419" - integrity sha512-mUTBnXY6Dz3ZtvC8APA8MHlgj5a/lG/dLeaCoz66VBTI0Gq80NZEJVZjpiS50k/rgJRIVTksH2CfBwqjuJcDfw== - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" @@ -1244,18 +1239,18 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== [email protected]: - version "2.55.1" - resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.55.1.tgz#4044118ff7a38952abf7f10035bcec5dd1a6f8e9" - integrity sha512-v0MhL6RqazQ2HKj9TXJvXKQcQNIDYeRzcOJ2xB2Usz56xodArc2goLu2P51X5J84xOO4w2AgNaWMCBzd7MbyOQ== [email protected]: + version "2.60.0" + resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.60.0.tgz#e96400640aca6cf326bd01b02866a157110e6432" + integrity sha512-AttvwGmS1TDiOgkskrRw4lQoDwoyzjb+M0iMzHEa75xDz7hkykudNVEvWOfcbid+rzkgfLQyElwtf/oz6m+O9A== dependencies: - "@aws-cdk/asset-awscli-v1" "^2.2.30" + "@aws-cdk/asset-awscli-v1" "^2.2.49" "@aws-cdk/asset-kubectl-v20" "^2.1.1" "@aws-cdk/asset-node-proxy-agent-v5" "^2.0.38" "@balena/dockerignore" "^1.0.2" case "1.6.3" fs-extra "^9.1.0" - ignore "^5.2.1" + ignore "^5.2.4" jsonschema "^1.4.1" minimatch "^3.1.2" punycode "^2.1.1" @@ -3133,7 +3128,7 @@ ignore-walk@^6.0.0: dependencies: minimatch "^5.0.1" -ignore@^5.2.0, ignore@^5.2.1: +ignore@^5.2.0, ignore@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
Compatibility to aws-cdk v2.56+ I really liked the CodeFirst approach which allows us to do certain things which is not easily possible with a schema file. As this library was separated from the appsync package per this [PR](https://github.com/aws/aws-cdk/pull/23250) I find myself in a situation where the library is not in sync anymore with the CDK constructs. The package does not seem to be released with the rest of the CDK packages anymore. The package.json shows a dependency for aws cdk v 2.55.1 [here](https://github.com/cdklabs/awscdk-appsync-utils/blob/main/package.json#L67) without a semver range. How is the future of this package planned? Can it be re-integrated with the aws-cdk releases? Best Friedrich
So since you can't express semver ranges across multiple pre-release versions of a package as far as I can tell, we will have to release as new versions of the appsync alpha package are released. I can figure out how to include cdk dependencies in our automated package upgrades as part of the projen workflows and then it should all happen automatically.
2023-01-12T18:14:15
0.0
[]
[]
machow/siuba
machow__siuba-459
99127df2a6bd4f0c71c624842916a2824e22ecf2
diff --git a/siuba/dply/verbs.py b/siuba/dply/verbs.py index f138df8d..9ff7545a 100644 --- a/siuba/dply/verbs.py +++ b/siuba/dply/verbs.py @@ -154,7 +154,7 @@ def _mutate_cols(__data, args, kwargs): def _make_groupby_safe(gdf): - return gdf.obj.groupby(gdf.grouper, group_keys=False) + return gdf.obj.groupby(gdf.grouper, group_keys=False, dropna=False) MSG_TYPE_ERROR = "The first argument to {func} must be one of: {types}" @@ -363,9 +363,9 @@ def group_by(__data, *args, add = False, **kwargs): # ensures group levels are recalculated if varname was in transmute groupings[varname] = varname - return tmp_df.groupby(list(groupings.values())) + return tmp_df.groupby(list(groupings.values()), dropna=False, group_keys=True) - return tmp_df.groupby(by = by_vars) + return tmp_df.groupby(by = by_vars, dropna=False, group_keys=True) @singledispatch2((pd.DataFrame, DataFrameGroupBy)) @@ -563,6 +563,19 @@ def summarize(__data, *args, **kwargs): @summarize.register(DataFrameGroupBy) def _summarize(__data, *args, **kwargs): + if __data.dropna or not __data.group_keys: + warnings.warn( + f"Grouped data passed to summarize must have dropna=False and group_keys=True." + " Regrouping with these arguments set." + ) + + if __data.grouper.dropna: + # will need to recalculate groupings, otherwise it ignores dropna + group_cols = [ping.name for ping in __data.grouper.groupings] + else: + group_cols = __data.grouper.groupings + __data = __data.obj.groupby(group_cols, dropna=False, group_keys=True) + df_summarize = summarize.registry[pd.DataFrame] df = __data.apply(df_summarize, *args, **kwargs)
Grouped summarize fails when a grouping col has NAs and < 2 other levels For a grouped summarize, when a grouping column... * has all NA values, it raises an error. * has 1 level aside from all NAs, it does not put grouping column back on the result. AFAICT setting `groupby(..., dropna=False)` resolves this (cf https://github.com/machow/siuba/issues/251) ### Example: all NA levels raises an error, since grouping columns on result and index ```python cars6 = cars.copy() cars6["cyl"] = np.nan cars6 >> group_by(_.cyl, _.hp) >> summarize(res = _.mpg.mean()) ``` **Raises** ``` ValueError: cannot insert cyl, already exists ``` <details> <summary>Full traceback</summary> ```python ValueError Traceback (most recent call last) Cell In [23], line 4 1 cars6 = cars.copy() 2 cars6["cyl"] = np.nan ----> 4 cars6 >> group_by(_.cyl, _.hp) >> summarize(res = _.mpg.mean()) File ~/.virtualenvs/siuba/lib/python3.8/site-packages/siuba/siu/calls.py:214, in Call.__rrshift__(self, x) 210 if isinstance(strip_symbolic(x), (Call)): 211 # only allow non-calls (i.e. data) on the left. 212 raise TypeError() --> 214 return self(x) File ~/.virtualenvs/siuba/lib/python3.8/site-packages/siuba/siu/calls.py:189, in Call.__call__(self, x) 187 return operator.getitem(inst, *rest) 188 elif self.func == "__call__": --> 189 return getattr(inst, self.func)(*rest, **kwargs) 191 # in normal case, get method to call, and then call it 192 f_op = getattr(operator, self.func) File ~/.pyenv/versions/3.8.12/lib/python3.8/functools.py:875, in singledispatch.<locals>.wrapper(*args, **kw) 871 if not args: 872 raise TypeError(f'{funcname} requires at least ' 873 '1 positional argument') --> 875 return dispatch(args[0].__class__)(*args, **kw) File ~/.virtualenvs/siuba/lib/python3.8/site-packages/siuba/dply/verbs.py:564, in _summarize(__data, *args, **kwargs) 561 df = __data.apply(df_summarize, *args, **kwargs) 563 group_by_lvls = list(range(df.index.nlevels - 1)) --> 564 out = df.reset_index(group_by_lvls) 565 out.index = pd.RangeIndex(df.shape[0]) 567 return out File ~/.virtualenvs/siuba/lib/python3.8/site-packages/pandas/util/_decorators.py:331, in deprecate_nonkeyword_arguments.<locals>.decorate.<locals>.wrapper(*args, **kwargs) 325 if len(args) > num_allow_args: 326 warnings.warn( 327 msg.format(arguments=_format_argument_list(allow_args)), 328 FutureWarning, 329 stacklevel=find_stack_level(), 330 ) --> 331 return func(*args, **kwargs) File ~/.virtualenvs/siuba/lib/python3.8/site-packages/pandas/core/frame.py:6350, in DataFrame.reset_index(self, level, drop, inplace, col_level, col_fill, allow_duplicates, names) 6344 if lab is not None: 6345 # if we have the codes, extract the values with a mask 6346 level_values = algorithms.take( 6347 level_values, lab, allow_fill=True, fill_value=lev._na_value 6348 ) -> 6350 new_obj.insert( 6351 0, 6352 name, 6353 level_values, 6354 allow_duplicates=allow_duplicates, 6355 ) 6357 new_obj.index = new_index 6358 if not inplace: File ~/.virtualenvs/siuba/lib/python3.8/site-packages/pandas/core/frame.py:4806, in DataFrame.insert(self, loc, column, value, allow_duplicates) 4800 raise ValueError( 4801 "Cannot specify 'allow_duplicates=True' when " 4802 "'self.flags.allows_duplicate_labels' is False." 4803 ) 4804 if not allow_duplicates and column in self.columns: 4805 # Should this be a different kind of error?? -> 4806 raise ValueError(f"cannot insert {column}, already exists") 4807 if not isinstance(loc, int): 4808 raise TypeError("loc must be int") ValueError: cannot insert cyl, already exists ``` </details> ### Example: 1 non NA level outputs a table w/o grouping columns ```python cars5 = cars.copy() cars5["cyl"] = [1] + [np.nan] * (len(cars) - 1) cars5 >> group_by(_.cyl, _.hp) >> summarize(res = _.mpg.mean()) ``` **Output** Note there's no cyl or hp column on the result <img width="892" alt="image" src="https://user-images.githubusercontent.com/2574498/202226129-3bc8d7cb-80a8-4f9c-ad7b-94a96171552d.png">
2022-11-16T17:25:38
0.0
[]
[]
machow/siuba
machow__siuba-451
ce979d90bd549176a8cb7e66547d0a02ed8c6bc4
diff --git a/siuba/dply/verbs.py b/siuba/dply/verbs.py index 401698b0..36781fdc 100644 --- a/siuba/dply/verbs.py +++ b/siuba/dply/verbs.py @@ -1833,17 +1833,15 @@ def gather(__data, key = "key", value = "value", *args, drop_na = False, convert if convert: raise NotImplementedError("convert not yet implemented") - if isinstance(__data, DataFrameGroupBy): - __data = __data.obj - # TODO: copied from nest and select - var_list = var_create(*args) + var_list = var_create(*(args or __data.columns)) od = var_select(__data.columns, *var_list) - value_vars = list(od) or None + if not od: + return __data id_vars = [col for col in __data.columns if col not in od] - long = pd.melt(__data, id_vars, value_vars, key, value) + long = pd.melt(__data, id_vars, list(od), key, value) if drop_na: return long[~long[value].isna()].reset_index(drop = True) @@ -1851,6 +1849,24 @@ def gather(__data, key = "key", value = "value", *args, drop_na = False, convert return long [email protected](DataFrameGroupBy) +def _gather(__data, key = "key", value = "value", *args, **kwargs): + group_cols = [ping.name for ping in __data.grouper.groupings] + + res = gather(__data.obj, key, value, *args, **kwargs) + + # regroup on any grouping vars we did not gather ---- + candidates = set(res.columns) - {key, value} + regroup_cols = [name for name in group_cols if name in candidates] + + if res is __data.obj: + # special case where nothing happened + return __data + elif regroup_cols: + return res.groupby(regroup_cols) + + return res + # Spread ======================================================================
Bug: gather does not select anything if `*args` is unspecified The docs for [`gather`](https://github.com/machow/siuba/blob/d155e6bb2c2342065747f38b6a78ccded34f1a22/siuba/dply/verbs.py#L1699) state for `*args`: > If unspecified, all columns are selected. However, if not `*args` are specified, nothing is selected. Code to reproduce this: ``` # %% import pandas as pd from siuba import gather # %% df = pd.DataFrame( { "id": [1, 2], "price_x": [0.1, 0.2], "price_y": [0.4, 0.5], "price_z": [0.7, 0.8], } ) print(df) # id price_x price_y price_z # 0 1 0.1 0.4 0.7 # 1 2 0.2 0.5 0.8 # %% res = df >> gather() print(res) # Empty DataFrame # Columns: [id, price_x, price_y, price_z, key, value] # Index: [] ```
This would be the fix: `var_list = var_create(*args or __data.columns)`. And with some context and a doctest: ```python @singledispatch2(pd.DataFrame) def gather(__data, key, value, *args, drop_na=False, convert=False): """Reshape table by gathering it in to long format. Examples -------- >>> import pandas as pd >>> from siuba import _, gather >>> df = pd.DataFrame({"x": [1, 2], "y": [3, None]}) >>> gather(df, key="key", value="value") key value 0 x 1.0 1 x 2.0 2 y 3.0 3 y NaN """ # TODO: implement var selection over *args if convert: raise NotImplementedError("convert not yet implemented") # TODO: copied from nest and select var_list = var_create(*args or __data.columns) # <-- this is the fix od = var_select(__data.columns, *var_list) value_vars = list(od) or None id_vars = [col for col in __data.columns if col not in od] long = pd.melt(__data, id_vars, value_vars, key, value) if drop_na: return long[~long[value].isna()].reset_index(drop=True) return long ``` However there is a TODO and maybe you want to implement a more systematic solution.
2022-09-27T23:49:03
0.0
[]
[]
machow/siuba
machow__siuba-440
73f9a2f53b57759b32c44d0f82448da5a05d1c1b
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b353102..43322db1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,11 +23,11 @@ jobs: # historical requirements - name: "2020-mid dependencies" python-version: 3.8 - requirements: numpy~=1.19.1 pandas~=1.1.0 SQLAlchemy~=1.3.18 psycopg2~=2.8.5 PyMySQL==1.0.2 + requirements: numpy~=1.19.1 pandas~=1.2.0 SQLAlchemy~=1.3.18 psycopg2~=2.8.5 PyMySQL==1.0.2 pytest_flags: "-o addopts='' -m 'not bigquery and not snowflake'" - name: "2021-mid dependencies" python-version: 3.8 - requirements: numpy~=1.19.1 pandas~=1.1.0 SQLAlchemy~=1.4.13 psycopg2~=2.8.5 PyMySQL==1.0.2 + requirements: numpy~=1.19.1 pandas~=1.2.0 SQLAlchemy~=1.4.13 psycopg2~=2.8.5 PyMySQL==1.0.2 pytest_flags: "-o addopts='' -m 'not bigquery and not snowflake'" - name: "2022-early dependencies" python-version: 3.8 diff --git a/Makefile b/Makefile index 9355368c..008c0522 100644 --- a/Makefile +++ b/Makefile @@ -13,11 +13,11 @@ SPHINX_BUILDARGS=-j auto test: py.test --nbval $(NOTEBOOK_TESTS) - pytest --dbs="sqlite,postgresql" siuba/ + pytest siuba/ test-travis: py.test --nbval-lax $(filter-out %postgres.ipynb, $(NOTEBOOK_TESTS)) - pytest --dbs="sqlite,postgresql" $(PYTEST_FLAGS) siuba/ + pytest $(PYTEST_FLAGS) siuba/ examples/%.ipynb: jupyter nbconvert --to notebook --inplace --execute $@ diff --git a/requirements.txt b/requirements.txt index 5e4d0f58..dc10fd64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ numpy==1.19.1 -pandas==1.1.0 +pandas==1.2.0 psycopg2==2.8.5 PyMySQL==1.0.2 python-dateutil==2.8.1 diff --git a/siuba/data/__init__.py b/siuba/data/__init__.py index 71ec9ed6..5b84052d 100644 --- a/siuba/data/__init__.py +++ b/siuba/data/__init__.py @@ -7,6 +7,9 @@ "band_members", "band_instruments", "band_instruments2", + "fish_encounters", + "us_rent_income", + "warpbreaks", ] def __dir__(): diff --git a/siuba/data/fish_encounters.csv.gz b/siuba/data/fish_encounters.csv.gz new file mode 100644 index 00000000..d1057ea9 Binary files /dev/null and b/siuba/data/fish_encounters.csv.gz differ diff --git a/siuba/data/us_rent_income.csv.gz b/siuba/data/us_rent_income.csv.gz new file mode 100644 index 00000000..f14564a4 Binary files /dev/null and b/siuba/data/us_rent_income.csv.gz differ diff --git a/siuba/data/warpbreaks.csv.gz b/siuba/data/warpbreaks.csv.gz new file mode 100644 index 00000000..bdae5837 Binary files /dev/null and b/siuba/data/warpbreaks.csv.gz differ diff --git a/siuba/dply/verbs.py b/siuba/dply/verbs.py index a8cd8efa..f5412515 100644 --- a/siuba/dply/verbs.py +++ b/siuba/dply/verbs.py @@ -1830,6 +1830,32 @@ def _spread_gdf(__data, *args, **kwargs): # Expand/Complete ==================================================================== from pandas.core.reshape.util import cartesian_product + +def _unique_name(prefix: str, names: "set[str]"): + names = set(names) + + ii = 0 + while prefix in names: + prefix = prefix + str(ii) + + ii += 1 + + return prefix + + +def _expand_column(x): + from pandas.api.types import is_categorical_dtype + + if is_categorical_dtype(x): + if x.isna().any(): + return [*x.cat.categories, None] + + return x.cat.categories + + return x.unique() + + + @singledispatch2(pd.DataFrame) def expand(__data, *args, fill = None): """Return table with unique crossings of specified columns. @@ -1862,30 +1888,48 @@ def expand(__data, *args, fill = None): 3 2 b >>> df >> right_join(_, combos) - x y z - 0 1.0 a 1.0 - 1 1 b NaN - 2 2.0 a 1.0 - 3 2.0 b 1.0 + x y z + 0 1 a 1.0 + 1 1 b NaN + 2 2 a 1.0 + 3 2 b 1.0 >>> combos >> anti_join(_, df) x y 1 1 b + Note that expand will also cross missing values: + + >>> df2 = pd.DataFrame({"x": [1, None], "y": [3, 4]}) + >>> expand(df2, _.x, _.y) + x y + 0 1.0 3 + 1 1.0 4 + 2 NaN 3 + 3 NaN 4 + + It will also cross all levels of a categorical (even those not in the data): + + >>> df3 = pd.DataFrame({"x": pd.Categorical(["a"], ["a", "b"])}) + >>> expand(df3, _.x) + x + 0 a + 1 b + """ + var_names = list(map(simple_varname, args)) - cols = [__data[name].unique() for name in var_names] - # see https://stackoverflow.com/a/25636395/1144523 - cprod = cartesian_product(cols) - expanded = pd.DataFrame(np.array(cprod).T) - expanded.columns = var_names + cols = [_expand_column(__data.loc[:, name]) for name in var_names] + + if fill is not None: + raise NotImplementedError() - return expanded + return pd.MultiIndex.from_product(cols, names=var_names).to_frame(index=False) @singledispatch2(pd.DataFrame) -def complete(__data, *args, fill = None): +def complete(__data, *args, fill = None, explicit=True): """Add rows to fill in missing combinations in the data. This is a wrapper around expand(), right_join(), along with filling NAs. @@ -1899,58 +1943,88 @@ def complete(__data, *args, fill = None): fill: A dictionary specifying what to use for missing values in each column. If a column is not specified, missing values are left as is. + explicit: + Should both NAs created by the complete and pre-existing NAs be filled + by the fill argument? Defaults to True (filling both). When set to False, + it will only fill newly created NAs. Examples -------- >>> import pandas as pd >>> from siuba import _, expand, count, anti_join, right_join - >>> df = pd.DataFrame({"x": [1, 2, 2], "y": ["a", "a", "b"], "z": 1}) + >>> df = pd.DataFrame({"x": [1, 2, 2], "y": ["a", "a", "b"], "z": [8, 9, None]}) >>> df - x y z - 0 1 a 1 - 1 2 a 1 - 2 2 b 1 + x y z + 0 1 a 8.0 + 1 2 a 9.0 + 2 2 b NaN >>> df >> complete(_.x, _.y) - x y z - 0 1.0 a 1.0 - 1 1 b NaN - 2 2.0 a 1.0 - 3 2.0 b 1.0 + x y z + 0 1 a 8.0 + 1 1 b NaN + 2 2 a 9.0 + 3 2 b NaN Use the fill argument to replace missing values: >>> df >> complete(_.x, _.y, fill={"z": 999}) - x y z - 0 1.0 a 1.0 - 1 1 b 999.0 - 2 2.0 a 1.0 - 3 2.0 b 1.0 + x y z + 0 1 a 8.0 + 1 1 b 999.0 + 2 2 a 9.0 + 3 2 b 999.0 A common use of complete is to make zero counts explicit (e.g. for charting): >>> df >> count(_.x, _.y) >> complete(_.x, _.y, fill={"n": 0}) - x y n - 0 1.0 a 1.0 - 1 1 b 0.0 - 2 2.0 a 1.0 - 3 2.0 b 1.0 + x y n + 0 1 a 1.0 + 1 1 b 0.0 + 2 2 a 1.0 + 3 2 b 1.0 + + Use explicit=False to only fill the NaNs introduced by complete (implicit missing), + and not those already in the original data (explicit missing): + + >>> df >> complete(_.x, _.y, fill={"z": 999}, explicit=False) + x y z + 0 1 a 8.0 + 1 1 b 999.0 + 2 2 a 9.0 + 3 2 b NaN + """ - expanded = expand(__data, *args, fill = fill) + if explicit: + indicator = False + else: + indicator = _unique_name("__merge_indicator", {*__data.columns}) + + + expanded = expand(__data, *args) # TODO: should we attempt to coerce cols back to original types? # e.g. NAs will turn int -> float on_cols = list(expanded.columns) - df = __data.merge(expanded, how = "right", on = on_cols) + df = expanded.merge(__data, how = "outer", on = on_cols, indicator = indicator) if fill is not None: - for col_name, val in fill.items(): - df[col_name].fillna(val, inplace = True) + if explicit: + for col_name, val in fill.items(): + df[col_name].fillna(val, inplace = True) + else: + fill_cols = list(fill) + indx = df[indicator] == "left_only" + df.loc[indx, fill_cols] = df.loc[indx, fill_cols].fillna(fill) + + if indicator: + return df.drop(columns=indicator) return df + # Separate/Unit/Extract ============================================================ import warnings @@ -2019,7 +2093,16 @@ def separate(__data, col, into, sep = r"[^a-zA-Z0-9]", elif n_split_cols > n_into: # Extra argument controls how we deal with too many splits if extra == "warn": - warnings.warn("some warning about too many splits", UserWarning) + df_extra_cols = all_splits.iloc[:, n_into].reset_index(drop=True) + bad_rows = df_extra_cols.dropna(how="all") + n_extra = bad_rows.shape[0] + + warnings.warn( + f"Expected {n_into} pieces." + f"Additional pieces discarded in {n_extra} rows." + f"Row numbers: {bad_rows.index.values}", + UserWarning + ) elif extra == "drop": pass elif extra == "merge": @@ -2027,11 +2110,13 @@ def separate(__data, col, into, sep = r"[^a-zA-Z0-9]", else: raise ValueError("Invalid extra argument: %s" %extra) - # end up with only the into columns, correctly named ---- - new_names = dict(zip(range(n_into), into)) - keep_splits = all_splits.iloc[:, :n_into].rename(columns = new_names) + # create new columns in data ---- + out = __data.copy() + + for ii, name in enumerate(into): + out[name] = all_splits.iloc[:, ii] - out = pd.concat([__data, keep_splits], axis = 1) + #out = pd.concat([__data, keep_splits], axis = 1) # attempt to convert columns to numeric ---- if convert: @@ -2042,7 +2127,7 @@ def separate(__data, col, into, sep = r"[^a-zA-Z0-9]", except ValueError: pass - if remove: + if remove and col_name not in into: return out.drop(columns = col_name) return out @@ -2174,22 +2259,19 @@ def extract( if n_split_cols != n_into: raise ValueError("Split into %s pieces, but expected %s" % (n_split_cols, n_into)) - # end up with only the into columns, correctly named ---- - new_names = dict(zip(all_splits.columns, into)) - keep_splits = all_splits.rename(columns = new_names) - # attempt to convert columns to numeric ---- if convert: # TODO: better strategy here? - for k in keep_splits: + for k in all_splits: try: - keep_splits[k] = pd.to_numeric(keep_splits[k]) + all_splits[k] = pd.to_numeric(all_splits[k]) except ValueError: pass + out = __data.copy() + for ii, name in enumerate(into): + out[name] = all_splits.iloc[:, ii] - out = pd.concat([__data, keep_splits], axis = 1) - if remove: return out.drop(columns = col_name) diff --git a/siuba/experimental/pivot/__init__.py b/siuba/experimental/pivot/__init__.py index 38ac1f47..11a04d8b 100644 --- a/siuba/experimental/pivot/__init__.py +++ b/siuba/experimental/pivot/__init__.py @@ -1,156 +1,5 @@ -import pandas as pd -import numpy as np +from .pivot_long import pivot_longer, build_longer_spec, pivot_longer_spec +from .pivot_wide import pivot_wider, build_wider_spec, pivot_wider_spec -from typing import Union, Tuple, Dict, Optional -from pandas.core.groupby import DataFrameGroupBy - -from siuba.dply.verbs import gather, var_create, var_select -from siuba.siu import singledispatch2 - - -def pivot_longer_spec(data, - spec, - names_repair: Optional[str] = "check_unique", - values_drop_na: bool = False): - raise NotImplementedError("TODO: see https://github.com/machow/siuba/issues/293") - - -@singledispatch2(pd.DataFrame) -def pivot_longer( - __data, - *args, - names_to: Union[str, Tuple[str, ...]] = "name", - names_prefix: Optional[str] = None, - names_sep: Optional[str] = None, - names_pattern: Optional[str] = None, - names_ptypes: Optional[Tuple] = None, - names_repair: str = "check_unique", - values_to: str = "value", - values_drop_na: bool = False, - values_ptypes: Optional[Union[str, Tuple[str, ...]]] = None, - values_transform: Optional[Dict] = dict(), - ): - - if names_sep is not None and names_pattern is not None: - raise ValueError("You may only use either `names_sep` or " - "`names_pattern`.") - - if isinstance(names_to, str): - names_to = (names_to,) - - # Copied selection over from gather, maybe this can be compartmentalised? - var_list = var_create(*args) - od = var_select(__data.columns, *var_list) - - value_vars = list(od) or None - - id_vars = [col for col in __data.columns if col not in od] - - keep_data = __data.loc[:,id_vars] - if value_vars is None: - # While stack works in this case, it will later on merge in to the - # original dataframe. To copy tidyr behaviour, we need to raise a - # ValueError - # stacked = __data.stack(dropna=values_drop_na) - raise ValueError("Please provide at least 1 column or all columns " - "(shorthand: _[:]).") - elif names_sep is not None or names_pattern is not None: - to_stack = __data.loc[:,value_vars] - column_index = ( - to_stack.columns.str.split(names_sep).map(tuple) - if names_sep is not None - # Split by names_pattern, and remove empty strings using filter - else to_stack.columns.str.split(names_pattern).map( - lambda x: tuple(list(filter(None, x))) - ) - ) - split_lengths = np.array(column_index.map(len)) - - if not np.all(split_lengths == split_lengths[0]): - raise ValueError( - "Splitting by {} leads to unequal lengths ({}).".format( - names_sep if names_sep is not None else names_pattern - ) - ) - - if split_lengths[0] != len(names_to): - raise ValueError("Splitting provided more values than provided in " - "`names_to`") - - # TODO: To set names for the new index, we need to feed in a list. - # There's no particular reason to use a tuples as input in the first - # place, might be worth reconsidering the choice of input format? - # TODO: What if we don't use '_value' in the tuple? Need to check tidyr - stack_idx = ( - [i for i, x in enumerate(list(names_to)) if x != "_value"] - if names_to != ('_value',) - else -1 - ) - names_to = [x if x != "_value" else None for x in names_to] - - column_index = column_index.set_names(names_to) - - to_stack.columns = column_index - stacked = to_stack.stack(stack_idx) - stacked = stacked.reset_index(level=stacked.index.nlevels - 1) - - if stack_idx == -1: - stacked = stacked.drop(columns='level_1') - if np.nan in names_to: - stacked = stacked.drop(columns=[np.nan]) - if values_drop_na: - stacked = stacked.dropna(axis = 1) - else: - stacked = __data.loc[:,value_vars].stack(dropna=values_drop_na) - # Set column names for stack - # As in tidyr `values_to` is ignored if `names_sep` or `names_pattern` - # is provided. - stacked.index.rename(names_to[0], level=1, inplace=True) - stacked.name = values_to - - # values_transform was introduced in tidyr 1.1.0 - if values_to in values_transform: - # TODO: error handling -- this won't work for dictionaries - # list needs special handling, as it can only be applied to iterables, - # not integers. - if values_transform[values_to] == list: - stacked = stacked.apply(lambda x: [x]) - else: - stacked = stacked.apply(lambda x: values_transform[values_to](x)) - - stacked_df = ( - # if `names_sep` or `names_pattern` are not provided `stacked` will - # be a pd.Series and needs its index reset. - stacked.reset_index(1) - if names_sep is None and names_pattern is None - else stacked - ) - - # If we want to pivot all but one, we are left with a `pd.Series`. - # This needs to be converted to a DataFrame to serve as left element in a - # merge - if isinstance(keep_data, pd.Series): - output_df = keep_data.to_frame().merge(stacked_df, left_index=True, right_index=True) - elif keep_data.empty: - output_df = stacked_df - else: - output_df = keep_data.merge(stacked_df, left_index=True, right_index=True) - - return output_df - -@pivot_longer.register(DataFrameGroupBy) -def _pivot_longer_gdf(__data, *args, **kwargs): - # TODO: consolidate all verbs that punt to DataFrame version (#118) - prior_groups = [el.name for el in __data.grouper.groupings] - - df = __data.obj - res = pivot_longer(df, *args, **kwargs) - - missing_groups = set(prior_groups) - set(res.columns) - if missing_groups: - raise ValueError( - "When using pivot_longer on grouped data, the result must contain " - "original grouping columns. Missing group columns: %s" %missing_groups - ) - - return res.groupby(prior_groups) +from . import sql_pivot_long +from . import sql_pivot_wide diff --git a/siuba/experimental/pivot/pivot_long.py b/siuba/experimental/pivot/pivot_long.py new file mode 100644 index 00000000..2d83eb04 --- /dev/null +++ b/siuba/experimental/pivot/pivot_long.py @@ -0,0 +1,359 @@ +import pandas as pd +import numpy as np +import re + +from typing import Union, Tuple, Dict, Optional, Callable +from pandas.core.groupby import DataFrameGroupBy + +from siuba.dply.verbs import gather, var_create, var_select, separate, extract +from siuba.siu import singledispatch2 + +from .utils import vec_as_names, reconstruct_tibble, check_dict_of_functions + +# Utilities =================================================================== + +def spec_to_multiindex(df_spec): + # _value will be the outer column index, and split name columns the inner. + # this allows us to stack the inner part, while that _values stays as columns. + internal = {".value", ".name"} + + #other_cols = [name for name in df_spec.columns if name not in internal] + #df_spec[other_cols].apply(lambda ser: tuple(ser), axis=1) + other_cols = [nm for nm in df_spec.columns if nm not in internal] + + # get final columns together + indx_cols = [".value", *other_cols] + indx_names = [None] + other_cols + + df_final = df_spec.loc[:, indx_cols] + + # ensure levels of _value in multi-index are in first-observed order + # otherwise, their final columns come out alphabetically in pivot_longer. + val = df_final[".value"] + df_final[".value"] = pd.Categorical(val, val.dropna().unique()) + + return pd.MultiIndex.from_frame(df_final, names=indx_names) + + +def _drop_cols_by_position(df, locations): + return df.loc[:, ~np.array([x in locations for x in range(df.shape[1])])] + + +# Pivot longer ================================================================ + +@singledispatch2(pd.DataFrame) +def pivot_longer( + __data, + *cols, + names_to: Union[str, Tuple[str, ...]] = "name", + names_prefix: Optional[str] = None, + names_sep: Optional[str] = None, + names_pattern: Optional[str] = None, + names_ptypes: Optional[Tuple] = None, + names_repair: str = "check_unique", + values_to: str = "value", + values_drop_na: bool = False, + values_ptypes: Optional[Union[str, Tuple[str, ...]]] = None, + values_transform: Optional[Dict] = None, +): + """Pivot data from wide to long format. + + This function stacks columns of data, turning them into rows. + + Parameters + ---------- + __data: + The input data. + *cols: + Columns to pivot into longer format. This uses tidyselect + (e.g. `_[_.some_col, _.another_col]`). + names_to: + A list specifying the new column or columns to create from the information + stored in the column names of data specified by cols. + names_prefix: + A regular expression to strip off from the start of column selected by `*cols`. + names_sep: + If names_to is a list of name parts, this is a separater the name is split on. + This is the same as the sep argument in the separate() function. + names_pattern: + If names_to is a list of name parts, this is a pattern to extract parts + This is the same as the regex argument in the extract() function. + names_ptypes, values_ptypes: + Not implemented. + names_transform: + TODO + names_repair: + Strategy for fixing of invalid column names. "minimal" leaves them as is. + "check_unique" raises an error if there are duplicate names. "unique" + de-duplicates names by appending "___{position}" to them. + values_to: + A string specifying the name of the column created to hold the stacked + values of the selected `*cols`. If names_to is a list with the entry ".value", + then this argument is ignored. + + + Examples + -------- + >>> from siuba import _ + + >>> df = pd.DataFrame({"id": [1, 2], "x": [5, 6], "y": [7, 8]}) + >>> pivot_longer(df, ~_.id, names_to="variable", values_to="number") + id variable number + 0 1 x 5 + 0 1 y 7 + 1 2 x 6 + 1 2 y 8 + + >>> weeks = pd.DataFrame({"id": [1], "year": [2020], "wk1": [5], "wk2": [6]}) + >>> pivot_longer(weeks, _.startswith("wk"), names_to="week", names_prefix="wk") + id year week value + 0 1 2020 1 5 + 0 1 2020 2 6 + + >>> df2 = pd.DataFrame({"id": [1], "a_x1": [2], "b_x2": [3], "a_y1": [4]}) + >>> names = ["condition", "group", "number"] + >>> pat = "(.*)_(.)(.*)" + >>> pivot_longer(df2, _["a_x1":"a_y1"], names_to = names, names_pattern = pat) + id condition group number value + 0 1 a x 1 2 + 0 1 b x 2 3 + 0 1 a y 1 4 + + >>> names = ["x1", "x2", "y1", "y2"] + >>> wide = pd.DataFrame({ + ... "x1": [1, 11], "x2": [2, 22], "y1": [3, 33], "y2": [4, 44] + ... }) + >>> pivot_longer(wide, _[:], names_to = [".value", "set"], names_pattern = "(.)(.)") + set x y + 0 1 1 3 + 0 2 2 4 + 1 1 11 33 + 1 2 22 44 + + """ + + df_spec = build_longer_spec( + __data, + *cols, + names_to=names_to, + values_to=values_to, + names_prefix=names_prefix, + names_sep=names_sep, + names_pattern=names_pattern, + names_ptypes=names_ptypes, + ) + + return pivot_longer_spec( + __data, + df_spec, + names_repair, + values_drop_na, + values_ptypes, + values_transform + ) + + +@pivot_longer.register(DataFrameGroupBy) +def _pivot_longer_gdf(__data, *args, **kwargs): + # TODO: consolidate all verbs that punt to DataFrame version (#118) + prior_groups = [el.name for el in __data.grouper.groupings] + + df = __data.obj + res = pivot_longer(df, *args, **kwargs) + + missing_groups = set(prior_groups) - set(res.columns) + if missing_groups: + raise ValueError( + "When using pivot_longer on grouped data, the result must contain " + "original grouping columns. Missing group columns: %s" %missing_groups + ) + + return res.groupby(prior_groups) + + +@singledispatch2((pd.DataFrame, DataFrameGroupBy)) +def build_longer_spec( + __data, + *cols, + names_to="name", + values_to="value", + names_prefix: "str | None"=None, + names_sep=None, + names_pattern=None, + names_ptypes=None, + names_transform: "dict[str, Callable] | None"=None +): + if names_sep is not None and names_pattern is not None: + raise ValueError("You may only use either `names_sep` or " + "`names_pattern`.") + + if isinstance(names_to, str): + names_to = (names_to,) + + # select id columns and measure data -------------------------------------- + + var_list = var_create(*cols) + od = var_select(__data.columns, *var_list) + + value_vars = list(od) + + if not value_vars: + raise ValueError( + "Please select at least 1 column of values in pivot_longer.\n\n" + "E.g. pivot_longer(data, _.some_col, _.another_col, ...)" + ) + + # note that this will include repeats in the data (e.g. two columns named "a") + wide_values = __data.loc[:,value_vars] + wide_cols = list(wide_values.columns) + + # strip prefix ------------------------------------------------------------ + if names_prefix is None: + names = wide_cols + elif isinstance(names_prefix, str): + names = [re.sub(f"^{names_prefix}", "", name) for name in wide_cols] + else: + raise TypeError("names_prefix must be a string or None.") + + # start spec and split name into parts ------------------------------------ + # note that we set .name to be the names with names_prefix removed, do all + # of the part splitting off that name, then set .name to the original values + # at the very end. + df_spec = pd.DataFrame({".name": names, ".value": values_to}) + + if names_sep: + df_spec = separate(df_spec, ".name", names_to, names_sep, remove=False) + elif names_pattern: + df_spec = extract(df_spec, ".name", names_to, names_pattern, remove=False) + else: + if len(names_to) == 1: + df_spec = df_spec.assign(**{names_to[0]: df_spec[".name"]}) + else: + raise TypeError( + "pivot_longer either needs names_to to be string, or to receive " + "names_sep or names_pattern arguments." + ) + + # setting names back to original + df_spec[".name"] = wide_cols + + # transform columns ------------------------------------------------------- + if names_transform: + _cols = list(df_spec.columns[2:]) + transforms = check_dict_of_functions(names_transform, _cols, "names_transform") + + for col_name, func in transforms.items(): + df_spec[col_name] = func(df_spec[col_name]) + + return df_spec + + +@singledispatch2((pd.DataFrame, DataFrameGroupBy)) +def pivot_longer_spec( + __data, + spec, + names_repair: Optional[str] = "check_unique", + values_drop_na: bool = False, + values_ptypes = None, + values_transform = None +): + + column_index = spec_to_multiindex(spec) + + wide_values = __data.loc[:,spec[".name"].unique()] + wide_ids = __data.loc[:,~__data.columns.isin(wide_values.columns)] + + + # reshape to long --------------------------------------------------------- + inner_levels_na = pd.isna(column_index.names[1:]) + indx_to_drop = np.where(inner_levels_na)[0] + + if len(column_index.levels[0]) == 1: + # simple case: only creating a single value column. in this case we use pd.melt, + # since it can handle duplicate single and multi-index columns. + _value_name = column_index.levels[0][0] + + wide_values.columns = column_index.droplevel(0) + + long_values = pd.melt( + wide_values, + value_vars=None, + value_name=_value_name, + ignore_index=False + ).sort_index(level=-1).pipe(_drop_cols_by_position, indx_to_drop) + + else: + # complex case: multiple value columns. Note that pandas throws an error if the + # columns being unstacked contain duplicate column parts. E.g. if you split + # duplicate columns x_1_1 and x_1_1 on "_". + # (this behavior is fairly funky in dplyr, so probably okay to error) + n_orig_levels = wide_values.index.nlevels + + if column_index.nlevels > 1: + inner_levels = np.array(range(1, column_index.nlevels)) + else: + # edge case, where only _values exists and is defined from matching + # patterns in the columns. we can stack this only multiindex level, and it + # will still set the _values as columns. + inner_levels = np.array([0]) + indx_to_drop = np.array([0]) + + wide_values.columns = column_index + + # note that levels named NA should not be in the final result, but are + # needed for stacking. + long_values_almost = (wide_values + .stack(inner_levels.tolist()) + .droplevel(list(n_orig_levels + indx_to_drop)) + ) + + # note: this is necessary for pandas <1.3 backwards compat. our column + # index is a categorical, so reset_index is seen as trying to add a category + # that doesn't exist to it... :/ + long_values_almost.columns = list(long_values_almost.columns) + + # once we drop earlier pandas versions, can cut out piece above + long_values = (long_values_almost + .reset_index(inner_levels[~inner_levels_na].tolist()) + ) + + if values_drop_na: + value_column_names = list(column_index.levels[0]) + long_values = long_values.dropna(subset=value_column_names, how="all") + + # transform values -------------------------------------------------------- + + # TODO: names_transform for names, values_transform for values (including .value in names_to) + + transformed = long_values + + if values_transform: + value_names = list(spec[".value"].unique()) + transforms = check_dict_of_functions( + values_transform, + value_names, + "values_transform" + ) + + for col_name, f_transform in transforms.items(): + # TODO: error handling -- this won't work for dictionaries + # list needs special handling, as it can only be applied to iterables, + # not integers. + long_values[col_name] = f_transform(long_values[col_name]) + + # merge in id variables --------------------------------------------------- + + if wide_ids.shape[1] == 0: + # no id columns, just return long values + output_df = transformed + else: + output_df = pd.merge(wide_ids, transformed, left_index=True, right_index=True) + + # note that the pandas merge above has to add a suffix to duplicate columns, + # so we need to use the original column names when repairing/validating. + repaired_names = vec_as_names([*wide_ids.columns, *transformed.columns], repair=names_repair) + output_df.columns = repaired_names + + return output_df + + diff --git a/siuba/experimental/pivot/pivot_wide.py b/siuba/experimental/pivot/pivot_wide.py new file mode 100644 index 00000000..a65d93bb --- /dev/null +++ b/siuba/experimental/pivot/pivot_wide.py @@ -0,0 +1,526 @@ +import pandas as pd +import numpy as np + +from pandas.core.groupby import DataFrameGroupBy +from siuba.dply.tidyselect import var_create, var_select +from siuba.dply.verbs import gather, separate, extract, expand, complete +from siuba.siu import singledispatch2, Call +from siuba.dply.forcats import fct_inorder + +from .utils import vec_as_names, reconstruct_tibble + +from typing import Any + + +def _select_expr_slice(x: "tuple[str]") -> Call: + from operator import getitem + from siuba.siu import strip_symbolic, Symbolic + + return strip_symbolic( + getitem(Symbolic(), x) + ) + +def _tidy_select(__data, cols, arg_name): + if cols is None: + return {} + + var_list = var_create(cols) + od = var_select(__data.columns, *var_list) + + # TODO: where in tidyselect package does this check happen? + missing = set(od) - set(__data.columns) + + if missing: + raise ValueError( + f"{arg_name} must select columns present in the data. " + f"Could not find these columns: {missing}" + ) + + return od + +def _maybe_list(seq): + if seq is None: + return None + + return list(seq) + + +def _collapse_index_names(index, sep : "str | None" = None, glue = None): + if glue is not None: + if index.nlevels == 1: + tmp_index = [[x, ""] for x in index] + else: + tmp_index = index + + return [glue.format(variable=entry[0], value=entry[1]) for entry in tmp_index] + elif sep is not None: + if index.nlevels == 1: + return list(index) + return [sep.join(map(str, entry)) for entry in index] + else: + raise NotImplementedError() + + +def _unique_col_name(df): + base = "__TMP_COL__" + test = base + ii = 0 + + df_cols = set(df.columns) + while test in df.columns: + test = base + str(ii) + ii += 1 + + return test + + +def _is_select_everything(expr): + # this is crazy but probably fine for now. + if (isinstance(expr, Call) and expr.func == "__getitem__"): + sub_expr = expr.args[1] + return ( + isinstance(sub_expr, Call) + and sub_expr.func == "__siu_slice__" + and len(sub_expr.args) == 1 and + sub_expr.args[0] == slice(None, None, None) + ) + return False + + +def _names_from_spec(spec, multi_index): + # dict mapping name parts to the final names + d_spec = dict(zip(spec.iloc[:, 1:].itertuples(index=False, name=None), spec[".name"])) + + return [d_spec[x] for x in multi_index] + + +@singledispatch2((pd.DataFrame, DataFrameGroupBy)) +def pivot_wider( + __data, + id_cols=None, + id_expand=False, + names_from="name", + names_prefix="", + names_sep="_", + names_glue=None, + names_sort=None, + names_vary="fastest", + names_expand=False, + names_repair="check_unique", + values_from="value", + values_fill=None, + values_fn=None, + unused_fn=None + ): + """Pivot data from long to wide format. + + This function splits a column, putting the pieces side-by-side based on an index. + + Parameters + ---------- + __data: + The input data. + id_cols: + A selection of columns that uniquely identify each observation. + id_expand: + Whether to ensure each unique combination of id_cols is a row in the data + before pivoting, using `expand()`. This results in more rows. When True, + this also sorts the final result by the `id_cols`. + names_from, values_from: + A pair fo arguments describing which column (or columns) to get the name of + the output column (names_from), and which column (or columns) to get the + cell values from (values_from). + names_prefix: + String added to the start of every variable name. + names_sep: + If names_from or values_from contains multiple values, this will be used + to join their values together into a single string to use as a column name. + names_glue: + Instead of names_sep and names_prefix, supply a string template that uses + the names_from columns (and a special .value variable) to create custom + column names. + names_sort: + Should the column names be sorted? The default is False, which results + in column names ordered by first appearance. + names_vary: + Option specifying how columns are ordered when names_from and values_from + both identify new columns. "fastest" varies names_from fastest, while "slowest" + varies names_from slowest. + names_expand: + Whether to ensure all combinations of names_from columns are in the result + using the `expand()` function. This results in more columns in the output. + names_repair: + Strategy for fixing of invalid column names. "minimal" leaves them as is. + "check_unique" raises an error if there are duplicate names. "unique" + de-duplicates names by appending "___{position}" to them. + values_fill: + A scalar value used to fill in any missing values. Alternatively, a + dictionary mapping column names to fill values. + values_fn: + An optional function to apply to each cell of the output. This is useful + when each cell would contain multiple values. E.g. values_fn="max" would + calculate the max value. + unused_fn: + Not implemented. + + Examples + -------- + >>> from siuba import _ + + >>> df = pd.DataFrame( + ... {"id": ["a", "b", "a"], "name": ["x", "x", "y"], "value": [1, 2, 3]} + ... ) + >>> df + id name value + 0 a x 1 + 1 b x 2 + 2 a y 3 + + >>> pivot_wider(df, names_from=_.name, values_from=_.value) + id x y + 0 a 1.0 3.0 + 1 b 2.0 NaN + + >>> pivot_wider(df, names_from=_.name, values_from=_.value, values_fill=0) + id x y + 0 a 1 3 + 1 b 2 0 + + >>> many = pd.DataFrame({ + ... "id": [1, 1, 2, 2], + ... "var": ["one", "two", "one", "two"], + ... "x": [1, 2, 3, 4], + ... "y": [6, 7, 8, 9] + ... }) + >>> pivot_wider(many, names_from=_.var, values_from=_[_.x, _.y]) + id x_one x_two y_one y_two + 0 1 1 2 6 7 + 1 2 3 4 8 9 + + >>> pivot_wider(many, names_from=_.var, values_from=_[_.x, _.y], names_vary="slowest") + id x_one y_one x_two y_two + 0 1 1 6 2 7 + 1 2 3 8 4 9 + + >>> pivot_wider(many, names_from=_.var, values_from=_[_.x, _.y], names_sep=".") + id x.one x.two y.one y.two + 0 1 1 2 6 7 + 1 2 3 4 8 9 + + >>> glue = "{variable}_X_{value}" + >>> pivot_wider(many, names_from=_.var, values_from=_[_.x, _.y], names_glue=glue) + id x_X_one x_X_two y_X_one y_X_two + 0 1 1 2 6 7 + 1 2 3 4 8 9 + + >>> from siuba.data import warpbreaks + >>> warpbreaks.head() + breaks wool tension + 0 26 A L + 1 30 A L + 2 54 A L + 3 25 A L + 4 70 A L + + >>> pivot_wider(warpbreaks, names_from=_.wool, values_from=_.breaks, values_fn="mean") + tension A B + 0 H 24.555556 18.777778 + 1 L 44.555556 28.222222 + 2 M 24.000000 28.777778 + + """ + input_ = __data + + if isinstance(__data, DataFrameGroupBy): + __data = __data.obj + + # create spec ---- + spec = build_wider_spec( + __data, + names_from = names_from, + values_from = values_from, + names_prefix = names_prefix, + names_sep = names_sep, + names_glue = names_glue, + names_sort = names_sort, + names_vary = names_vary, + names_expand = names_expand + ) + + # select id columns --- + # necessary here, since if the spec is 0 rows you cannot know values_from + # TODO: clean up symbolic handling of slices + if id_cols is None: + name_vars = _tidy_select(__data, names_from, "names_from") + val_vars = _tidy_select(__data, values_from, "values_from") + others = {*name_vars, *val_vars} + + id_cols = tuple([col for col in __data.columns if col not in others]) + id_vars = _select_expr_slice(id_cols) + else: + id_vars = id_cols + + out = pivot_wider_spec( + input_, + spec, + names_repair = names_repair, + id_cols = id_vars, + id_expand = id_expand, + values_fill = values_fill, + values_fn = values_fn, + unused_fn = unused_fn + ) + + return out + +@singledispatch2((pd.DataFrame, DataFrameGroupBy)) +def pivot_wider_spec( + __data, + spec, + names_repair = "check_unique", + id_cols = None, + id_expand = False, + values_fill = None, + values_fn = None, + unused_fn = None +): + + input_ = __data + + # guards ---- + + if isinstance(__data, DataFrameGroupBy): + __data = __data.obj + + if _is_select_everything(id_cols): + # restores id_cols to the default, which uses all remaining cols + id_cols = None + + if unused_fn is not None: + raise NotImplementedError() + + if not isinstance(id_expand, bool): + raise TypeError("`id_expand` argument must be True or False.") + + # handle tidyselection ---------------------------------------------------- + + name_vars = spec.columns[~spec.columns.isin([".name", ".value"])].tolist() + val_vars = spec.loc[:, ".value"].unique().tolist() + + # select id columns + if id_cols is None: + others = {*name_vars, *val_vars} + id_vars = [col for col in __data.columns if col not in others] + else: + id_vars = _tidy_select(__data, id_cols, "id_cols") + + id_var_bad = set(id_vars) & set([*name_vars, *val_vars]) + if id_var_bad: + raise ValueError( + "id_cols contains columns that are in " + f"names_from or values_from: {id_var_bad}." + ) + + # use a categoricals for name columns, to ensure their order in wide format + # is first-observed order (pandas by default uses alphabetical) + tmp = __data.copy() + for name in name_vars: + tmp[name] = fct_inorder(tmp[name]) + + # pivot to wide ----------------------------------------------------------- + + if values_fn is None: + # this block is essentially pd.pivot (which also uses unstack), but also + # supports filing NAs, and resets indexes + if not len(id_vars): + # without id_vars we try to pivot to a frame with 1 row + n_id_vars = 1 + tmp = tmp.set_index([np.zeros(len(tmp.index)), *name_vars]) + else: + n_id_vars = len(id_vars) + tmp = tmp.set_index([*id_vars, *name_vars]) + + to_unstack = list(range(n_id_vars, n_id_vars + len(name_vars))) + wide = (tmp + .loc[:, list(val_vars)] + .unstack(to_unstack, fill_value=values_fill) + ) + + else: + # pivot_table requires a values_fn, so we only use it when one is provided. + if not len(id_vars): + # pivot_table without an index var is equivalent to the index being constant. + # normally the index vars are the index of the pivot_table result, but without + # an index column explicitly named, the value vars become the rows. + # so we need to create an explicit index column... + index_cols = [_unique_col_name(tmp)] + tmp.loc[:, index_cols[0]] = np.zeros(len(tmp.index)) + + else: + index_cols = list(id_vars) + + # this ensures a single value column won't be used when constructing names + # since a list creates a new index dimension + _values = list(val_vars) if len(val_vars) > 1 else list(val_vars)[0] + + wide = pd.pivot_table( + tmp, + index=index_cols, + columns=list(name_vars), + values=list(val_vars), + fill_value=values_fill, + aggfunc=values_fn, + ) + + if wide.index.names != index_cols: + raise ValueError( + "pivot_wider produced a result with incorrect index variables. " + "There is a bug in pandas when attempting to aggregate by a values_fn " + "that is not an aggregate.\n\n" + f"Do all the values_fn arguments return single values?: {values_fn}" + ) + + + # flatten / reset indexes ------------------------------------------------- + + # flatten column index ---- + if isinstance(wide, pd.Series): + # the .unstack approach returns a Series when there are no id cols. + # in this case we make it a frame and don't sort the two columns. + wide = wide.reset_index() + + collapsed_names = _names_from_spec(spec, wide.columns) + wide.columns = collapsed_names + + # add missing columns and reorder to spec ---- + missing_cols = list(spec[".name"][~spec[".name"].isin(wide.columns)]) + + if missing_cols: + wide[missing_cols] = values_fill + + wide = wide.loc[:, list(spec[".name"])] + + # validate names and move id vars to columns ---- + # note: in pandas 1.5+ we can use the allow_duplicates option to reset, even + # when index and column names overlap. for now, repair names, rename, then reset. + unique_names = vec_as_names([*id_vars, *wide.columns], repair="unique") + repaired_names = vec_as_names([*id_vars, *wide.columns], repair=names_repair) + + uniq_id_vars = unique_names[:len(id_vars)] + uniq_val_vars = unique_names[len(id_vars):] + + final_id_vars = repaired_names[:len(id_vars)] + final_val_vars = repaired_names[len(id_vars):] + + wide.columns = uniq_val_vars + + if id_vars: + wide.rename_axis(uniq_id_vars, inplace=True) + wide.reset_index(drop=False, inplace=True) + else: + wide.reset_index(drop=True, inplace=True) + + wide.columns = repaired_names + + # expand id levels -------------------------------------------------------- + + if id_expand: + if values_fill is not None and not isinstance(values_fill, dict): + values_fill = {k: values_fill for k in final_val_vars} + + wide = complete(wide, *final_id_vars, fill=values_fill, explicit=False) + + # reconstruct with groupings + return reconstruct_tibble(input_, wide) + + +@singledispatch2((pd.DataFrame, DataFrameGroupBy)) +def build_wider_spec( + __data, + names_from = "name", + values_from = "value", + names_prefix = "_", + names_sep = "_", + names_glue = None, + names_sort = False, + names_vary = "fastest", + names_expand = False +): + if isinstance(__data, DataFrameGroupBy): + __data = __data.obj + + # guards ---- + if names_vary not in {"fastest", "slowest"}: + raise ValueError( + "names_vary must be one of 'fastest', 'slowest', but received " + f"argument: {repr(names_vary)}" + ) + + if names_sort: + raise NotImplementedError() + + if not isinstance(names_expand, bool): + raise TypeError( + "names_expand must be set to True or False. " + f"Received type: {type(names_expand)}." + ) + + # validate tidy selections ------------------------------------------------ + orig_vars = __data.columns + + name_vars = _tidy_select(__data, names_from, "names_from") + val_vars = _tidy_select(__data, values_from, "values_form") + + if not name_vars: + raise ValueError("`names_from` must select at least one column.") + + if not val_vars: + raise ValueError("`values_from` must select at least one column.") + + # get unique variable levels from names_from columns ---------------------- + + name_data = __data.loc[:, list(name_vars)] + if names_expand: + # cartesian product of unique level names + # TODO: should nan values be turned into "NA" to match dplyr? + row_ids = expand(name_data, *name_vars) + else: + # distinct rows of variables + row_ids = name_data.drop_duplicates() + + # cross with value var names ---------------------------------------------- + + value_levels = pd.Series(list(val_vars), name = ".value") + if names_vary == "fastest": + spec = pd.merge( + value_levels, + row_ids, + how="cross" + ) + else: + # the left arg varies slowest, so use names on the left, then relocate. + spec = ( + pd.merge( + row_ids, + value_levels, + how="cross" + ) + .loc[:, lambda d: [".value", *d.columns[:-1]]] + ) + + # get columns used to construct .name + if len(value_levels) > 1: + df_name_parts = spec + else: + df_name_parts = spec.drop(columns=".value") + + # TODO: remove use of multiindex, which is unnecessary + if len(df_name_parts.columns) > 1: + spec_as_multi = pd.MultiIndex.from_frame(df_name_parts) + name_col = _collapse_index_names(spec_as_multi, sep=names_sep, glue=names_glue) + else: + name_col = list(df_name_parts.iloc[:, 0]) + + spec.insert(0, ".name", name_col) + + return spec diff --git a/siuba/experimental/pivot/sql_pivot_long.py b/siuba/experimental/pivot/sql_pivot_long.py new file mode 100644 index 00000000..e0e73a26 --- /dev/null +++ b/siuba/experimental/pivot/sql_pivot_long.py @@ -0,0 +1,134 @@ +import pandas as pd + +from sqlalchemy import sql +from sqlalchemy import types as sqla_types + +from siuba.dply.verbs import spread +from siuba.sql import LazyTbl +from siuba.sql.utils import ( + _sql_select, + _sql_column_collection, + _sql_add_columns, + _sql_with_only_columns, +) + + +from .pivot_long import pivot_longer, pivot_longer_spec, build_longer_spec, spec_to_multiindex + + +def unpack_spec_row(d): + internal = {".name", ".value"} + return d[".name"], d[".value"], {k:v for k,v in d.items() if k not in internal} + + +def _safe_to_dict(df, *args, **kwargs): + """Return something like df.to_dict(), but ensure t contains no numpy types. + + For context on this pandas issue, see issues linked in this PR: + https://github.com/pandas-dev/pandas/issues/13258 + + """ + import json + return json.loads(df.to_json(*args, **kwargs)) + + +def _values_to_select(sel_columns, spec_row: dict, value_vars: "list[str]"): + final_cols = [] + for long_name in value_vars: + wide_name = spec_row[long_name] + if pd.isna(wide_name): + final_cols.append(sql.null().label(long_name)) + else: + final_cols.append(sel_columns[wide_name].label(long_name)) + + return final_cols + + +@build_longer_spec.register +def _build_longer_spec(__data: LazyTbl, *args, **kwargs): + # building the spec only really needs the columns names. however, because we + # matched tidyr behavior, we just pass a DataFrame in for now. + df_data = pd.DataFrame(columns = list(__data.last_op.alias().columns.keys())) + + return build_longer_spec(df_data, *args, **kwargs) + + +@pivot_longer_spec.register +def _pivot_longer_spec( + __data: LazyTbl, + spec, + names_repair = "check_unique", + values_drop_na: bool = False, + values_ptypes = None, + values_transform = None +) -> LazyTbl: + + if values_ptypes is not None: + raise NotImplementedError() + + if values_transform is not None: + raise NotImplementedError() + + + sel = __data.last_op + sel_alias = sel.alias() + + + # extract info from spec ---- + + column_index = spec_to_multiindex(spec) + + wide_names = list(spec[".name"].unique()) + wide_ids = [name for name in sel_alias.columns.keys() if name not in wide_names] + + long_name_vars = [k for k in spec.columns if k not in {".name", ".value"}] + long_val_vars = list(spec[".value"].unique()) + + + # guard against bad specifications ---- + + bad_names = set(wide_names) - set(sel_alias.columns.keys()) + if bad_names: + raise ValueError(f"Pivot spec contains columns not in the data: {bad_names}") + + + # reshape to long (via union all) ---- + + sel_cols = sel_alias.columns + + # each row maps <new_name>: literal for name vars, or <new_name>: column + aligned_vars = spread(spec, ".value", ".name") + + union_parts = [] + for row in _safe_to_dict(aligned_vars, orient="records"): + id_cols = [sel_cols[_id] for _id in wide_ids] + + # TODO: handle when value name (row[k]) is NULL + value_cols = _values_to_select(sel_cols, row, long_val_vars) + name_cols = [ + sql.literal(row[k]).label(k) + for k in long_name_vars + ] + + union_parts.append(_sql_select([*id_cols, *name_cols, *value_cols])) + + # TODO: what is the base class we are willing to let the select type be? + # this is a CompoundSelect. Shares GenerativeSelect with sql.select() + sel_union = sql.union_all(*union_parts) + + if values_drop_na: + alias = sel_union.alias() + + # TODO: sqlalchemy 1.4+ prefers .is_not() + bool_clause = sql.and_(*[alias.columns[k].isnot(None) for k in long_val_vars]) + + return __data.append_op(alias.select().where(bool_clause)) + + return __data.append_op(sel_union) + + +# simply calls build_longer_spec and pivot_longer_spec +pivot_longer.register(LazyTbl, pivot_longer.dispatch(pd.DataFrame)) + + + diff --git a/siuba/experimental/pivot/sql_pivot_wide.py b/siuba/experimental/pivot/sql_pivot_wide.py new file mode 100644 index 00000000..1406134b --- /dev/null +++ b/siuba/experimental/pivot/sql_pivot_wide.py @@ -0,0 +1,214 @@ +import pandas as pd +import siuba.ops + +from sqlalchemy import sql +from sqlalchemy import types as sqla_types + +from siuba.dply.verbs import collect, distinct +from siuba.sql import LazyTbl +from siuba.sql.utils import ( + _sql_select, + _sql_column_collection, + _sql_add_columns, + _sql_with_only_columns, + _sql_case +) + +from .pivot_wide import ( + pivot_wider, + pivot_wider_spec, + build_wider_spec, + _is_select_everything, + _tidy_select, + _select_expr_slice +) + +from .utils import vec_as_names +from .sql_pivot_long import _safe_to_dict + +_OPS_DEFAULT=siuba.ops.max + +@build_wider_spec.register +def _build_wider_spec(__data: LazyTbl, *args, **kwargs): + # building the spec only really needs the columns names. however, because we + # matched tidyr behavior, we just pass a DataFrame in for now. + raise NotImplementedError( + "build_wider_spec currently requires a DataFrame. Please collect() your " + f"data first. Received type: {type(__data)}" + ) + + +@pivot_wider_spec.register +def _pivot_wider_spec( + __data: LazyTbl, + spec, + names_repair = "check_unique", + id_cols = None, + id_expand = False, + values_fill = None, + values_fn = _OPS_DEFAULT, + unused_fn = None +): + # Key differences: + # * values_fn by default is "MAX" + + lazy_tbl = __data + __data = pd.DataFrame(columns = list(__data.last_op.alias().columns.keys())) + + if id_expand: + raise NotImplementedError() + + if values_fill is not None: + raise NotImplementedError() + + if isinstance(values_fn, str): + _f = lazy_tbl.translator.aggregate.local.get(values_fn) + if _f is None: + raise ValueError( + f"values_fn={repr(values_fn)} does not have a SQL translation." + ) + values_fn = _f + elif not hasattr(values_fn, "dispatch"): + raise NotImplementedError( + "values_fn currently must be column operation function. For example:\n\n" + "from siuba.ops import mean\n" + "pivot_wider(..., values_fn=mean)" + ) + + # TODO: all of this down to "pivot to wide" taken from original func ------ + if _is_select_everything(id_cols): + id_cols = None + + if unused_fn is not None: + raise NotImplementedError() + + if not isinstance(id_expand, bool): + raise TypeError("`id_expand` argument must be True or False.") + + + # tidyselect ---- + + name_vars = spec.columns[~spec.columns.isin([".name", ".value"])].tolist() + val_vars = spec.loc[:, ".value"].unique().tolist() + + # select id columns + if id_cols is None: + others = {*name_vars, *val_vars} + id_vars = [col for col in __data.columns if col not in others] + else: + id_vars = _tidy_select(__data, id_cols, "id_cols") + + id_var_bad = set(id_vars) & set([*name_vars, *val_vars]) + if id_var_bad: + raise ValueError( + "id_cols contains columns that are in " + f"names_from or values_from: {id_var_bad}." + ) + + + # pivot to wide ----------------------------------------------------------- + + # each row of spec becomes a CASE_WHEN. + # spec columns: .name, .value, <name_cols...> + # SELECT + # FN(CASE + # WHEN {<name_col_key1>} == {<name_col_val1>} and [...] THEN {.value1} + # ) AS .name1, + # ... AS .name2, + # ... AS .name3 + sel_alias = lazy_tbl.last_op.alias() + sel_cols = sel_alias.columns + dispatch_cls = lazy_tbl.translator.aggregate.dispatch_cls + + wide_name_cols = [] + for row in _safe_to_dict(spec, orient="records"): + when_clause = sql.and_(sel_cols[k] == row[k] for k in name_vars) + when_then = (when_clause, sel_cols[row[".value"]]) + + col = values_fn(dispatch_cls(), _sql_case(when_then)) + + wide_name_cols.append(col) + + wide_id_cols = [sel_cols[id_] for id_ in id_vars] + + repaired_names = vec_as_names([*id_vars, *spec[".name"]], repair=names_repair) + labeled_cols = [ + col.label(name) for name, col in + zip(repaired_names, [*wide_id_cols, *wide_name_cols]) + ] + + final_sel = _sql_select(labeled_cols).group_by(*wide_id_cols) + + return lazy_tbl.append_op(final_sel) + + +# simply calls build_wider_spec and pivot_wider_spec +@pivot_wider.register +def _pivot_wider( + __data: LazyTbl, + id_cols=None, + id_expand=False, + names_from="name", + names_prefix="", + names_sep="_", + names_glue=None, + names_sort=None, + names_vary="fastest", + names_expand=False, + names_repair="check_unique", + values_from="value", + values_fill=None, + values_fn=_OPS_DEFAULT, + unused_fn=None +): + # note that we use three forms of the data: __data for tidyselect, + # distinct_data for spec creation, and lazy_tbl for the actual pivot + lazy_tbl = __data + __data = pd.DataFrame(columns = list(__data.last_op.alias().columns.keys())) + + # tidyselect variable names ----------------------------------------------- + # adapted from pivot_wide + name_vars = _tidy_select(__data, names_from, "names_from") + val_vars = _tidy_select(__data, values_from, "values_from") + if id_cols is None: + others = {*name_vars, *val_vars} + + id_cols = tuple([col for col in __data.columns if col not in others]) + id_vars = _select_expr_slice(id_cols) + else: + id_vars = id_cols + + + # create dummy data with all names_from levels ---------------------------- + distinct_data = collect(distinct(lazy_tbl, *name_vars)).copy() + distinct_data[list(val_vars)] = True + + vec_as_names(list(distinct_data.columns), repair="check_unique") + + + # build spec and pivot ---------------------------------------------------- + spec = build_wider_spec( + distinct_data, + names_from = names_from, + values_from = values_from, + names_prefix = names_prefix, + names_sep = names_sep, + names_glue = names_glue, + names_sort = names_sort, + names_vary = names_vary, + names_expand = names_expand + ) + + + out = pivot_wider_spec( + lazy_tbl, + spec, + names_repair = names_repair, + id_cols = id_vars, + id_expand = id_expand, + values_fill = values_fill, + values_fn = values_fn, + unused_fn = unused_fn + ) + + return out diff --git a/siuba/experimental/pivot/utils.py b/siuba/experimental/pivot/utils.py new file mode 100644 index 00000000..3d44e7c8 --- /dev/null +++ b/siuba/experimental/pivot/utils.py @@ -0,0 +1,110 @@ +import re +import pandas as pd + +from collections import Counter +from typing import Callable + + + +def group_vars(df: pd.DataFrame) -> "list[str]": + groupings = df.grouper.groupings + group_cols = [ping.name for ping in groupings] + return group_cols + + +def reconstruct_tibble( + input_: pd.DataFrame, + output: pd.DataFrame, + ungrouped_vars: "tuple[str]" = tuple() +): + if isinstance(input_, pd.core.groupby.DataFrameGroupBy): + old_groups = group_vars(input_) + new_groups = list((set(old_groups) - set(ungrouped_vars)) & set(output.columns)) + + return output.groupby(new_groups) + + return output + + +def check_dict_of_functions(d_funcs: "Callable | dict[str, Callable]", names, arg_name): + if isinstance(d_funcs, dict): + missing = set(d_funcs) - set(names) + if missing: + raise ValueError( + f"`{arg_name}=` is a dictionary of functions, so must corresponding to " + "column names in the data. No matching column names found for these " + f"entries: {missing}" + ) + return d_funcs + elif callable(d_funcs): + return {k: d_funcs for k in names} + + raise TypeError( + f"{arg_name} must be a dictionary mapping column names to functions, or " + "a single function." + ) + + +# vec_as_names ---------------------------------------------------------------- + +SEPERATOR = "___" + +def _make_unique(name): + pass + +def _strip_suffix(name): + return re.sub("(___?[0-9]*)+$", "", name) + +def vec_as_names(names, *, repair: "str | Callable"): + """Validate and repair column names. + + Parameters + ---------- + names: + A list-like of column names + repair: + + """ + # minimal, unique, universal, check_unique + # minimal: names can be accessed using df[<name>], e.g. "x", np.nan + # unique: names are minimal and no duplicates. Can be accessed using df[name] + # check_unique: + # universal: accessible by attribute (may throw an error if its a pandas method) + + if repair not in {"unique", "check_unique", "minimal"} and not callable(repair): + raise NotImplementedError() + + validate_unique = callable(repair) or repair == "check_unique" + + # minimal --- + if repair == "minimal": + return names + + # custom function --- + if callable(repair): + names = repair(names) + + # check_unique ---- + raw_uniq = Counter(names) + if len(raw_uniq) < len(names) and validate_unique: + duplicates = [entry for entry, n in raw_uniq.items() if n > 1] + + raise ValueError( + f"Names must be unique, but detected {len(duplicates)} duplicate name(s).\n\n" + f"Duplicated names: {duplicates}" + ) + + + stripped_names = list(map(_strip_suffix, names)) + uniq = Counter(stripped_names) + + # name repair unique ---- + result = [] + for ii, name in enumerate(stripped_names): + if uniq[name] > 1: + result.append(f"{name}___{ii}") + else: + result.append(name) + + return result + diff --git a/siuba/sql/utils.py b/siuba/sql/utils.py index 41f54834..ed5b6a1a 100644 --- a/siuba/sql/utils.py +++ b/siuba/sql/utils.py @@ -139,6 +139,14 @@ def _sql_with_only_columns(select, columns): return select.with_only_columns(*columns) +def _sql_case(*args, **kwargs): + from sqlalchemy import sql + if is_sqla_12() or is_sqla_13(): + return sql.case(args, **kwargs) + + return sql.case(*args, **kwargs) + + # Simplify option in show_query ----------------------------------------------- def _sql_refresh(el):
Implement pivot_longer_spec See PR #238 with current work. Merging it into master, so I (or anyone interested ;) can work on translating the tidyr vignette (#291), at the same time as this issue is being worked on :).
2022-09-10T05:02:18
0.0
[]
[]
laixintao/flameshow
laixintao__flameshow-58
0834cfdd5079b582b38e7e408a79cbacddd82e5d
diff --git a/flameshow/render/framedetail.py b/flameshow/render/framedetail.py index 16dc306..251624b 100644 --- a/flameshow/render/framedetail.py +++ b/flameshow/render/framedetail.py @@ -232,12 +232,15 @@ def frame_all_self_value(self): total_value = 0 i = self.sample_index for instance in frames_same_name: - if not instance.children: - continue - child_total = sum(child.values[i] for child in instance.children) self_value = instance.values[i] - total_value += self_value - child_total + if instance.children: + child_total = sum( + child.values[i] for child in instance.children + ) + self_value -= child_total + + total_value += self_value return total_value
bug: when a frame has no more children, self should be considered as 100%
2023-10-19T03:50:06
0.0
[]
[]
laixintao/flameshow
laixintao__flameshow-35
db14a48daa556de8517a47d44eaf8fa29c03c244
diff --git a/flameshow/main.py b/flameshow/main.py index ea31f07..66d9426 100644 --- a/flameshow/main.py +++ b/flameshow/main.py @@ -2,6 +2,8 @@ import os import time +import sys + import click from flameshow import __version__ @@ -36,6 +38,15 @@ def setup_log(enabled, level, loglocation): } +def ensure_tty(): + if os.isatty(0): + return + + logger.info("stdin is not a tty, replace it to fd=2") + sys.stdin.close() + sys.stdin = os.fdopen(2) + + def run_app(verbose, log_to, profile_f, _debug_exit_after_rednder): log_level = LOG_LEVEL[verbose] setup_log(log_to is not None, log_level, log_to) @@ -48,6 +59,7 @@ def run_app(verbose, log_to, profile_f, _debug_exit_after_rednder): t01 = time.time() logger.info("Parse profile, took %.3fs", t01 - t0) + ensure_tty() app = FlameshowApp( profile, _debug_exit_after_rednder, diff --git a/flameshow/render/flamegraph.py b/flameshow/render/flamegraph.py index 5d326b0..7afa195 100644 --- a/flameshow/render/flamegraph.py +++ b/flameshow/render/flamegraph.py @@ -116,7 +116,6 @@ def generate_frame_maps(self, width, focused_stack_id): logger.info("frame maps: %s", frame_maps) def _generate_for_children(frame): - logger.debug("generate frame_maps for %s", frame) # generate for children my_maps = frame_maps[frame._id] for sample_i, my_map in enumerate(my_maps): @@ -248,13 +247,6 @@ def render_line(self, y: int) -> Strip: ) cursor += my_width - logger.debug( - "%s in line %d, frame_map=%s", - frame, - y, - frame_map, - ) - strip = Strip(segments) return strip
support reading pprof direct from stdin ``` curl http://localhost:6060/debug/pprof/goroutine | flameshow - ``` Currently not working, because when flameshow starts, its `stdin` is from PIPE, so all of users' input, like `hjkl` zoom in, etc, will be ignored. Maybe we can close the `fd=0` after reading, then reopen it using `/dev/tty` and bind it to `sys.stdin`? but seems not working on my macOS.
2023-10-04T14:32:59
0.0
[]
[]
mcneel/compute.rhino3d
mcneel__compute.rhino3d-184
ef49eb4c9889ba52de3b6d8abcd4bdb54f78c0f1
diff --git a/src/compute.components/RemoteDefinition.cs b/src/compute.components/RemoteDefinition.cs index c24635ca..d2208159 100644 --- a/src/compute.components/RemoteDefinition.cs +++ b/src/compute.components/RemoteDefinition.cs @@ -149,6 +149,8 @@ public void SetComponentOutputs(Schema schema, IGH_DataAccess DA, List<IGH_Param } var structure = new Grasshopper.Kernel.Data.GH_Structure<Grasshopper.Kernel.Types.IGH_Goo>(); + Grasshopper.Kernel.Types.IGH_Goo singleGoo = null; + bool setSingleItem = datatree.InnerTree.Count == 1; foreach (var kv in datatree.InnerTree) { var tokens = kv.Key.Trim(new char[] { '{', '}' }).Split(';'); @@ -160,14 +162,21 @@ public void SetComponentOutputs(Schema schema, IGH_DataAccess DA, List<IGH_Param elements.Add(int.Parse(token)); } } + if (setSingleItem && (elements.Count != 1 || elements[0] != 0)) + setSingleItem = false; + var path = new Grasshopper.Kernel.Data.GH_Path(elements.ToArray()); for (int gooIndex = 0; gooIndex < kv.Value.Count; gooIndex++) { var goo = GooFromReshopperObject(kv.Value[gooIndex]); + singleGoo = goo; structure.Insert(goo, path, gooIndex); } } - DA.SetDataTree(paramIndex, structure); + if (setSingleItem && singleGoo!=null) + DA.SetData(paramIndex, singleGoo); + else + DA.SetDataTree(paramIndex, structure); } foreach (var error in schema.Errors) @@ -212,6 +221,8 @@ static Grasshopper.Kernel.Types.IGH_Goo GooFromReshopperObject(ResthopperObject switch (obj.Type) { + case "System.Double": + return new Grasshopper.Kernel.Types.GH_Number(double.Parse(data)); case "System.String": return new Grasshopper.Kernel.Types.GH_String(data); case "System.Int32":
Write sample that communicates with 3rd party app Hops doesn't specifically need a compute instance to talk to for solving. Provide a simple example that shows this off.
Linked with [COMPUTE-164](https://mcneel.myjetbrains.com/youtrack/issue/COMPUTE-164) Preferably a local CPython 3 sample
2021-01-31T23:46:55
0.0
[]
[]
CS-SI/eodag-cube
CS-SI__eodag-cube-38
5a31f7aad011377c063f192cf1494e4c793fe50f
diff --git a/eodag_cube/api/product/drivers/stac_assets.py b/eodag_cube/api/product/drivers/stac_assets.py index 48dead4..2d32a20 100644 --- a/eodag_cube/api/product/drivers/stac_assets.py +++ b/eodag_cube/api/product/drivers/stac_assets.py @@ -15,6 +15,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import re + from eodag.api.product.drivers.base import DatasetDriver from eodag.utils.exceptions import AddressNotFound @@ -28,11 +30,47 @@ def get_data_address(self, eo_product, band): See :func:`~eodag.api.product.drivers.base.DatasetDriver.get_data_address` to get help on the formal parameters. """ - if band in eo_product.assets: - return eo_product.assets[band]["href"] - elif band.upper() in [b.upper() for b in eo_product.assets.keys()]: - for k, v in eo_product.assets.items(): - if k.upper() == band.upper(): - return v["href"] + error_message = "" + + # try using exact + p = re.compile(rf"^{band}$", re.IGNORECASE) + matching_keys = [ + s + for s in eo_product.assets.keys() + if ( + ( + "roles" in eo_product.assets[s] + and "data" in eo_product.assets[s]["roles"] + ) + or ("roles" not in eo_product.assets[s]) + ) + and p.match(s) + ] + if len(matching_keys) == 1: + return eo_product.assets[matching_keys[0]]["href"] + else: + error_message += ( + rf"{len(matching_keys)} assets keys found matching {p} AND " + ) - raise AddressNotFound + # try to find keys containing given band + p = re.compile(rf"^.*{band}.*$", re.IGNORECASE) + matching_keys = [ + s + for s in eo_product.assets.keys() + if ( + ( + "roles" in eo_product.assets[s] + and "data" in eo_product.assets[s]["roles"] + ) + or ("roles" not in eo_product.assets[s]) + ) + and p.match(s) + ] + if len(matching_keys) == 1: + return eo_product.assets[matching_keys[0]]["href"] + else: + raise AddressNotFound( + rf"Please adapt given band parameter ('{band}') to match only one asset: {error_message}" + rf"{len(matching_keys)} assets keys found matching {p}" + )
standardize band identification mechanism Use the same band identification mechanism between drivers: first readable found in case-insensitive `**/*{band}*`
2023-11-14T16:32:40
0.0
[]
[]
metomi/isodatetime
metomi__isodatetime-222
7b260fc2398a079b6792b5f722fc5a9702ccb239
diff --git a/CHANGES.md b/CHANGES.md index 062a33d..d767f30 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,11 @@ creating a new release entry be sure to copy & paste the span tag with the `actions:bind` attribute, which is used by a regex to find the text to be updated. Only the first match gets replaced, so it's fine to leave the old ones in. --> +-------------------------------------------------------------------------------- + +## isodatetime 3.1.0 (<span actions:bind='release-date'>Pending</span>) + +Requires Python 3.7+ -------------------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 8cf70e5..c97eece 100644 --- a/setup.py +++ b/setup.py @@ -92,7 +92,7 @@ def run(self): install_requires=install_requires, tests_require=tests_require, extras_require=extras_require, - python_requires='>=3.6', + python_requires='>=3.7', classifiers=[ "Development Status :: 5 - Production/Stable", "Environment :: Other Environment", @@ -100,10 +100,11 @@ def run(self): ("License :: OSI Approved" + " :: GNU Lesser General Public License v3 (LGPLv3)"), "Operating System :: OS Independent", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3 :: Only", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Utilities"
python: drop 3.6 support 3.6 is EOL, time to drop support.
2022-12-15T11:24:30
0.0
[]
[]
metomi/isodatetime
metomi__isodatetime-204
593d8b021f93659313193abc0df730ba8fd98ba7
diff --git a/.codecov.yml b/.codecov.yml index 3c72e51..9c932d3 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -58,7 +58,7 @@ coverage: # files to ignore ignore: - - "isodatetime/tests*" + - "metomi/isodatetime/tests*" # turn off comments to pull requests comment: off diff --git a/metomi/isodatetime/main.py b/metomi/isodatetime/main.py index 708b6e6..aeb06bc 100644 --- a/metomi/isodatetime/main.py +++ b/metomi/isodatetime/main.py @@ -174,7 +174,7 @@ from .datetimeoper import DateTimeOperator -def parse_args(): +def parse_args(sys_args=None): arg_parser = ArgumentParser( prog='isodatetime', formatter_class=RawDescriptionHelpFormatter, @@ -282,10 +282,17 @@ def parse_args(): ], ]: arg_parser.add_argument(*o_args, **o_kwargs) + + if sys_args is None: + sys_args = sys.argv[1:] + sys_args = [ + rf'\{arg}' if arg.startswith('-P') else arg + for arg in sys_args + ] if hasattr(arg_parser, 'parse_intermixed_args'): - args = arg_parser.parse_intermixed_args() + args = arg_parser.parse_intermixed_args(sys_args) else: - args = arg_parser.parse_args() + args = arg_parser.parse_args(sys_args) if args.offsets1: args.offsets1 = [item.replace("\\", "") for item in args.offsets1] @@ -296,9 +303,9 @@ def parse_args(): return args -def main(): +def main(sys_args=None): """Implement "isodatetime" command.""" - args = parse_args() + args = parse_args(sys_args) if args.version_mode: print(__version__)
Support second recurrence format We should support the second ISO 8601 recurrence format (see e.g. ISO 8601:2000 5.6.1b): ``` R/P2D ``` which must be supplied (somewhere) with a context start time in order to work.
2022-03-29T12:55:19
0.0
[]
[]
giotto-ai/giotto-tda
giotto-ai__giotto-tda-602
afb931462bf619ca8c634923d376d0f62937ff6f
diff --git a/doc/modules/index.rst b/doc/modules/index.rst index 899224c6b..4896b2863 100644 --- a/doc/modules/index.rst +++ b/doc/modules/index.rst @@ -10,6 +10,7 @@ This pages contains a list of available features in the library. mapper.rst homology.rst + local_homology.rst diagrams.rst curves.rst point_clouds.rst diff --git a/doc/modules/local_homology.rst b/doc/modules/local_homology.rst new file mode 100644 index 000000000..a1a34ae69 --- /dev/null +++ b/doc/modules/local_homology.rst @@ -0,0 +1,17 @@ +:mod:`gtda.local_homology`: Persistent local homology +===================================================== + +.. automodule:: gtda.local_homology + :no-members: + :no-inherited-members: + +Local simplicial homology +------------------------- +.. currentmodule:: gtda + +.. autosummary:: + :toctree: generated/local_homology/ + :template: class.rst + + local_homology.KNeighborsLocalVietorisRips + local_homology.RadiusLocalVietorisRips diff --git a/doc/notebooks/examples.rst b/doc/notebooks/examples.rst index 39e655cda..c34a33240 100644 --- a/doc/notebooks/examples.rst +++ b/doc/notebooks/examples.rst @@ -11,6 +11,7 @@ This page contains examples of use of ``giotto-tda``. classifying_shapes lorenz_attractor MNIST_classification + local_hom_NLP_disambiguation voids_on_the_plane .. diff --git a/doc/notebooks/tutorials.rst b/doc/notebooks/tutorials.rst index 2d01b1f49..64deb324f 100644 --- a/doc/notebooks/tutorials.rst +++ b/doc/notebooks/tutorials.rst @@ -14,6 +14,7 @@ by Lewis Tunstall provides a friendly introduction to the philosophy of ``giotto topology_time_series time_series_forecasting persistent_homology_graphs + local_homology .. include:: vietoris_rips_quickstart.rst diff --git a/examples/data/note.n.xml b/examples/data/note.n.xml new file mode 100644 index 000000000..6f73557f2 --- /dev/null +++ b/examples/data/note.n.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<note.n.train><note.n.1>One of the properties is a print history. This will detail the most recent printing activity concerning the file ( although it only records the printing requests , it is not absolute proof that a print was actually produced ) . Note that it only allows a maximum of 250 characters and may therefore not provide a complete history; in the event of the history exceeding this volume , it can only guarantee details of the most recent activity . </note.n.1><note.n.2>Lacking absolute pitch , most of us ca n't make that connection-labelling a note as " D " , for example. But do the connections and labels get hammered in during music lessons , or are some babies just born with a flair for identifying pitch ? That 's a hard question to answer , since musical parents often pass a passion for music-as well as their genes-on to their children . </note.n.2><note.n.3>From what I read in this thread , I gather that many SSPX faithful are frustrated by this note from the Secretariat of State. They expected the Vatican to say nothing more , and interpret the note as a bow to pressure . </note.n.3><note.n.4>Part of the collection of images from Great Smoky Mountains National Park. These selections are from almost 30 years of photography in the park. Richard began shooting early on in his career here , mostly in black &amp;white. Later he began shooting more and more of his signature color work. We are pleased to be able to offer some of these exquisite images as note cards - for what better way to stay in touch ! </note.n.4><note.n.5>It is called the Tartini tone. It is most often noticeable when the two notes being played are sustained , about equally loud , not too low in pitch ( say treble clef and above ) and moderately loud. I 've put a section about it on a page called Interference beats and Tartini tones where you can hear sound files made with pure sine waves that show the effect quite well. If you listen for it , you can use it to tune your chords : the tuning you will arrive at is Just Intonation , and not Equal Temperament. In sustained chords , the former usually sounds better . </note.n.5><note.n.6>described in the Constitution for the united States of America , and the other officers and agents of government do not immediately bring him or her under control , then the breach of contract with the public makes the official , the accessory officers and agents of the official of the government , and the government itself , all liable to the public for the damage specified in the U.S. Code , and the damage must be rebated back to the public from the U.S. Treasury out of the taxes paid into the government by the public , by the use of a Public Contract Tax Rebate Note , </note.n.6><note.n.7>Voicing statements specifies the harmonic continuity of the music and control the voice leading between chords. The entry of a particular voicing position specifies the structure note of the next chord which the note in the current structure component must move to. An example is </note.n.7><note.n.8>... I thought it best that I quote the following passage in full : ( Please note that Richard Dearlove , the head of MI6 - CIA equivalent - is the one referred to as C . ) </note.n.8><note.n.9>Bowen argued that the notes had " serious flaws. " He was disturbed that the adviser described him as embracing the " New Historian " narrative; insisted that Martin Gilbert and Michael Oren should not be seen as " mainstream , " apparently due to their " support of the Jewish state " and Zionism; and cast the controversy about the New Historians ' revisionist historiography as being driven by " right wingers. " </note.n.9><note.n.10>The US government -- enh , the Federal Reserve -- does not promise to redeem your money with gold. Instead , the notes are backed , ultimately , by the full faith and credit of the US government.'' I think this means that they 'll redeem your worn-out dollars for crisp new ones. Sounds kinda wishy-washy , but it seems to work. To be fair , it 's a little more magical than that. A dollar is worth a dollar because Congress says it is legal tender : if a debt is denominated in dollars , then federal reserve bank notes have to be accepted in payment of it. It 's really beautiful when you think of -- an entire economy held together by an abstract set of mutual obligations to honor a money concept only symbolically and rather incompletely backed by anything of value.'' Of course , the value of the dollar in terms of anything other than dollars is variable . </note.n.10><note.n.11>Can anyone in a serious , straightforward way write an intellectually honest paragraph to back that up ? In other words , can anyone make the case that John Kerry has thrown caution to the wind in any meaningful sense to fight for " what 's right " ? I follow politics fairly closely and I 've been doing my reading about John Kerry but I have n't a clue as to how he 's talking about his own political career. Note : if you 're going to try , you should know that I do n't consider the case against Bush to be the case for Kerry in this regard. This is about how Kerry has conducted himself since Vietnam. I just want to know how a Kerry supporter could honestly take this statement at face value . </note.n.11><note.n.12>Document 13 : CIA , Draft Presidential Finding , " Scope : Hostage Rescue - Middle East , " ( with cover note from William J. Casey ) , November 26 , 1985 </note.n.12><note.n.13>Usually , we have reason to consider only some of the possible ways of analyzing a given set of notes into lines. We may , however , wish to consider different parsings of the same notes for different purposes. Lines , in fact , can be of a number of different types. As Westergaard says ( ITT , p. 289 ) : </note.n.13><note.n.14>" I do n't believe that most of the agents that sold this stuff knew it was a sham company , " said Dave Sutton , assistant statewide prosecutor. " That 's the reason they should n't have been out there selling it. They did n't see audited financial statements. They did n't know whether the insurance company guaranteeing the notes was legitimate. " </note.n.14><note.n.15>n194. See generally Cost of Credit , supra note 22 , 10.3.2.1.1 , at 339 ( discussing retail installment sales acts in historical context ); Curran , supra note 196 , at 13 . </note.n.15><note.n.16>The systems contain all our musical data. Each system is a group of related staves , normally bracketed together and separated vertically from other systems. Each staff contains the actual notes and whatnot. If no system is given explicitly , one is created automatically. Similarly , if no staff is given , one is provided automatically. Here 's an example of a score with two systems , one of which has two staves : </note.n.16><note.n.17>Scoop : Beginning a note beneath it 's pitch , then sliding up to the correct pitch. Scooping was the prominent feature of " crooners " in the 1920s-50s; Bing Crosby , Frank Sinatra , and Perry Como were among the singers famous for this style. Today , scooping should be used infrequently and only to achieve a specific quality or emotion . </note.n.17><note.n.18>Use of labels. Labels and label paper ( adhesive-backed paper ) are used for a variety of reasons including patient demographics , transcription of dictated progress notes , printing of physician orders for telephone orders , medication , or treatment records. When labels are used in the record , a number of issues or concerns must be considered and addressed before implementation. Organization policies and practices should address how and where labels will be placed. Information may not be obscured by the label , and the adhesiveness of the label must be adequate for the retention period of the document . </note.n.18><note.n.19>183. See supra notes 43-47 and accompanying text ( describing the factors to consider ) . In the instant case , Slovakia certainly should have appraised the following factors : 1 ) the physical extent of the Danube River and interconnected groundwater aquifers lying within the territory of Hungary; 2 ) the relationship and dependency of the region 's environment upon the river and aquifers and the impact the scheme would have on the flora and fauna and ecology of the region; 3 ) Hungary 's reliance on the water resources for agricultural needs and potable water supplies; 4 ) the means for conserving and protecting water quality and quantity; and 5 ) possible alternatives to the planned project. Id . </note.n.19><note.n.20>The category or categories of headings after which a free-floating heading can be used are encoded in the 073 field of subject subdivision ( 180 and 185 ) authority records. $ a contains the section of the Subject Cataloging Manual that discusses that type of heading , such as H 1100 , and $ z contains lcsh. If more than one section applies , each section is given in a separate $ a. The instructions for use are also given as notes in 680 $ i in the form Use as a topical subdivision under classes of persons. </note.n.20><note.n.21>The Bank of England was purported to be designed to protect the public by preventing fraud and economic chaos , yet this is exactly what it caused by enabling private banks to engage in fractional reserve banking. In less than three years after its inception , the bank was unable to meet depositor demand to redeem bank notes with precious metal , but it did not matter because the government simply declared that the bank was not required to do so . </note.n.21><note.n.22>Bank Notes are a horse of another color , because they always draw interest. ( Federal Reserve Notes are not bank notes. ) However , this is only the superficial difference from United States Notes. Federal Reserve Notes , series 1963 , 1969 , 1974 are not redeemable into specie , as the prior series were , nor into anything but more of the same. Surely that has a meaning beyond the obvious one. The only other thing that these Notes are convertible into is United States government bonds. So , in effect , the Notes are merely " small change " for the bonds. They are the " till money " used by the banks to balance up the demand deposit accounts at the end of the day. If you have a large enough bundle of Federal Reserve Notes you can convert them into a bond by simply purchasing the bond , but never into specie , as that would defeat the scheme of liability on credit for filing an income tax return levied not at law but in equity , and executive equity at that . </note.n.22><note.n.23>Only the person who owes the money needs to sign it. There is no requirement that the note be witnessed or notarized. Thomas Moens </note.n.23><note.n.24>[ CB-547-548 , note 2 ] Some courts admit expert testimony concerning the trauma suffered by victims of rape or child abuse , and such testimony sometimes has the effect of bolstering credibility. See Notes on Proving Truthfulness ( Chapter 8C2 , infra ) . </note.n.24><note.n.25>When spelling the other Major scales , like G Major , D Major , F Major , etc. , sharped or flatted notes are needed to keep that half-step spacing between the 3-4 and 7-8 scale degrees. That interval spacing is what gives us the Major scale , and its particular sound. No big mystery . </note.n.25><note.n.26>The following table details the frequency and note value for each musical note in a single octave. Double the values to raise the frequency and note values by one octave. Divide the values by two to reduce the frequency and note values by one octave. For example , C in the next higher octave is 523.2 Hz , while C in the next lower octave is 130.8 Hz. Note that C4 ( Middle C ) and SILENCE have both been defined as constants . </note.n.26><note.n.27>Q. What is a demand promissory note ? A. The balance owing in a demand promissory note does not need to be paid until the Lender demands to be repaid. In other words , the loan is repayable 'on demand'. There is no fixed end date for the repayment of the note. Upon demand , the Borrower is given a certain period of time to repay the outstanding balance of the note . </note.n.27><note.n.28>ENTERING NOTES : See Exhibit 2.11.1-21. is an example of possible notes. A total of 70 lines are allowed for notes. " [ ] " should be on the very last line of the workfile. If there are no notes for this record , then the ending brackets should be on line 49. It is not necessary to enter asterisks or dotted lines between notes as program CRX09 will provide them . </note.n.28><note.n.29>The datatype " string " is defined in " XML Schema Part 2 : Datatypes " Specification [ 11 ] . Note that this is not identical to the type called " string " in many database or programming languages , and in particular may forbid some characters those languages would permit. ( Those values must be represented by using some datatype other than xsd : string . ) </note.n.29><note.n.30>Once you transfer a certain amount of private IOU debt obligations you are subject to the liability that comes from using the private scrip in the trade or business of the United States. Why are they debt obligations ? Now you see why they are first liens on all property that you think you own , but do not. This comes directly from the Federal Reserve page itself where they say the notes are worthless. Here are a few excerpts : </note.n.30><note.n.31>Death Note ( Desu Nto ) is a Japanese manga series created by writer Tsugumi Ohba and illustrator Takeshi Obata. The series centers around a high school student who discovers a supernatural notebook that allows him to kill anyone by writing the victim 's name and picturing his face. The plot follows his attempt to create and lead a world cleansed of evil using the book , and the complex conflict between himself and those assailing him that results . </note.n.31><note.n.32>- thus obligating all parties to accept them as payment-in-full for contracted debt. While this debate was on-going the cash needs of the government called and the Act of February 12 , 1862 authorized an additional $ 10 , 000 , 000 in Demand Notes. This act brought the final possible amount of Demand Notes that could be issued to a sum of $ 60 , 000 , 000 ( by April the full $ 60 , 000 , 000 in Demand Notes had been issued ) . </note.n.32><note.n.33>3. Using Jonathan Bennett 's " Berkeley and God " as a critical foil , critically consider Berkeley 's arguments for a deity. Bennett 's essay is on reserve in the Library in Locke and Berkeley , eds. Martin and Armstrong ( Notre Dame : Univ of Notre Dame , 1968 ) , pp. 380-399 ( available from the Reserve Desk in the Library ) . In writing your paper , indicate what Bennett has to say about Berkeley 's arguments for God. In addition to discussing Bennett , of course , you will have to clarify Berkeley 's views. Critically evaluate the views you discuss. Note : you may find E.J. Furlong 's " Berkeley and the Tree in the Quad " which is in the same volume to be helpful . </note.n.33><note.n.34>Installments , or payment ( if single payment Note ) , not paid within 5 days of due date shall incur a fee of 15 of the installment or payment , but not less than $ 10.00. The Holder shall be entitled to all costs of collection should this Note , or any part of the indebtedness evidenced hereby , be accelerated and not paid. Should this note be collected at law or by an attorney at law , an Attorney/Collection Fee of 15 of the balance due , but not less than $ 100.00 , plus any costs and administration fees , shall be added . </note.n.34><note.n.35>Specifies the note transposition table to be used for source pattern transposition : " Bypass " , " Melody " , " Chord " , " Bass " ( Replaced by " Melody " in newer models ) , " Melodic Minor " , " Melodic Minor 5th Var. " , " Harmonic Minor " , " Harmonic Minor 5th Var. " , " Natural Minor " , " Natural Minor 5th Var. " , " Dorian " or " Dorian 5th Var. " </note.n.35><note.n.36>Each Noney note has the same denomination : zero. This doesn ' t mean each note has no value just relative value. There ' s no fixed exchange rate or location of operation. Noney ' s worth as both art and currency is something to negotiate through each individual transaction - anywhere . </note.n.36><note.n.37>Arrays are structures pitch class sets where each PC is a member of at least two dimensions at the same time. Two-dimensional arrays are written out as boxes in which the horizontal dimension represents " voices " and the vertical dimension " chords " . The designation of a two-dimensional array gives the number of notes in the voices followed by " x " and the number of notes in the chords ( i.e. , a 5 x 4 array ) . Arrays of a higher number of dimensions include sets of arrays of a smaller number of dimensions. In my system , I only consider higher numbers of sets of the same sizes : three-dimensional arrays consist of two-dimensional arrays of the same dimensions ( i.e. , four 5 x 4 arrays ) , and four-dimensional arrays sets of three-dimensional arrays ( i.e. four 4 x 5 x 4 arrays; in practice things rarely get this heavy ) . </note.n.37><note.n.38>The MIDI Monitor Filter window is very useful for focussing on specific types of MIDI events. You can set it to show input/output. You can specify which MIDI channels you want shown , which MIDI Events ( for example , Note On , Control Change , Program Change , MIDI Timing Clock , etc. ) , and which Controllers ( for example , Volume [ 7 ] , Pan [ 10 ] , etc. ) . It is easy to set up ANY combination of events you want to view . </note.n.38><note.n.39>Another method of adding messages to the folder is via the Pine composer 's Fcc : field. If you are sending a message that you expect to send in the same form again , you can enter the Form Letter Folder 's name in this field. Pine , as usual , will copy the message as it 's sent. Note , when you later select this message from your Form Letter Folder , it will have the same recipients as the original message . </note.n.39><note.n.40>Khaled ( formerly known as Cheb Khaled ) , the undisputed King of Rai , became internationally famous with the release of " Didi " ( Track 1 , Side A ) . ( Although it was recorded in Los Angeles , under the direction of U.S. pop producer Don Was , it was not as big a hit in the U.S. as it was in other countries. ) Rai has long been an eclectic genre , drawing on influences such as flamenco , Moroccan Gnawa music ( see notes below under Morocco ) , French cabaret , reggae , and Western pop influences. " Didi " opens with a darabuka solo that accompanies Khaled , who sings in Arabic. This introduction soon </note.n.40><note.n.41>Red-seal United States Notes represent labor value , meaning that they are backed by the positive value of the labor of American citizens actually performed in the past , and paid into the United States Treasury as U. S. taxes . </note.n.41><note.n.42>D &amp;B sticks to some basics and often thrives on complete repetition. One wonders if it is intentionally so in order to produce a more trance like state. 45 to 72 beats per minute are said to produce this , and evens a shaman said something around 60 bpm was used for lucid dreaming. This of course applies to trance music too but often it does n't keep up the repetitive beat. Despite it 's name drum and bass it has many layers on top of the smooth bass line. Drum and bass can use the same types of things as techno but also has more pad or string sounds using drawn out notes in the background . </note.n.42><note.n.43>The second main area for tweaking is the Control Track , which is found at the bottom of the screen ( see Fig. 1 , bottom ) . This area provides access to a large number of parameters , such as Velocity and Pitch Bend , but also to other , less-traditional note-shaping functions. The most familiar of these is a set of four resonance filters , each with a frequency , bandwidth , and gain control. As with other parameters , frequency values are in relative increments ( 0 to 127 ) , with no indication of actual Hertz values. You enter values using the same three data-entry tools found in the Vibrato dialog ( Dot , Free , and Line ) , and if you 've ever drawn a controller curve for notes in a sequencer , you 'll get the process immediately . </note.n.43><note.n.44>Lieberman Forum ( Rochford testimony ) , supra note 30 , at 19. This view is disputed. Others see little sign that user costs have declined in the AFS marketplace , even as it has grown. RTO and check cashing costs have not declined noticeably despite growth. See supra note 29 as to the rise in the cost of cashing a social security check even as competition increased. See also Lieberman Forum ( Fox testimony ) , supra note 121 , at 7 ( explaining why competition between lenders will not provide consumers with lower prices ) . It is critical to look at the actual track record before taking this rationale on faith in the AFS marketplace . </note.n.44><note.n.45>( 330. ) See , e.g. , To the Freemen of Pennsylvania , supra note 305 , at 365 ( " See , in Rhode-Island , the bonds of society and the obligations of morality dissolved by paper money and tender laws. " ); see also PA. HERALD ( Philadelphia ) , June 9 , 1787 , reprinted in 13 DOCUMENTARY HISTORY , infra note 344 , at 132 ( reporting incorrectly that the Constitutional Convention had " resolved that Rhode-Island should be considered as having virtually withdrawn herself from the union ... . [ S ] he shall be compelled to be responsible ... . " ) . </note.n.45><note.n.46>Solf ge is a way of assigning syllables to names of the musical scale. In order , they are today : Do , Re , Mi , Fa , Sol , La , Ti , and Do ( for the octave ) . The classic variation is : Do , Re , Mi , Fa , Sol , La , Si , Do. These functional names of the musical notes were introduced by Guido of Arezzo ( c.991 after 1033 ) using the beginning syllables of the first six musical lines of the Latin hymn Ut queant laxis. The original sequence was Ut , Re , Mi , Fa , Sol , La , where each verse would start a note higher. " Ut " later became " Do " . The equivalent syllables used in Indian music are : Sa , Ri , Ga , Ma , Pa , Dha , and Ni , while the 'bilinear music notation ' system offers a chromatic method : Li , ( Je ) , Ja , ( Bo ) , Baw , Zu , ( Zer or Fer ) , Fee , ( De ) , Da , ( Go ) , and Gaw. See also : solf ge , sargam , Kod ly Hand Signs. In China Qi is used instead of Ti ( Qi for , Chinese 7 ) . </note.n.46><note.n.47>This application note describes the operation of high-side Nchannel MOSFET switch drivers designed specifically for operation in battery-powered equipment , such as notebook and palmtop computers and portable medical instruments. A selection guide simplifies the proper choice of MOSFET and driver for a particular high-side switch application. Circuits to drive and protect load impedances ranging from large inductors to large capacitors are described and a section on surface mount and copper clad shunts is included . </note.n.47><note.n.48>During the period from 1863 to 1929 , the Government again permitted thousands of banks to issue their own notes under the National Banks Acts of 1863 and 1864. These were called " National Bank Notes , " but unlike the earlier " State Bank Notes , " they were produced on paper authorized by the U.S. Government and carried the same basic design . </note.n.48><note.n.49>Set those aside and drill a tiny hole in the flange of your NEW 195* thermostat to help bleed out air from the head. NOTE ! DO NOT USE A NAIL OR PUNCH TO DO THIS ! Punching a hole risks deforming the thermostat and impairing it 's ability to function. Be aware that some thermostats will already have this hole predrilled and you may be able to skip this step . </note.n.49><note.n.50>b. Harper investigated defendant 's claim , and discovered that the three $ 5 , 000.00 notes had been paid off prior to the December 14 , 1983 , transaction . </note.n.50><note.n.51>During 1814 federal finances deteriorated as the war dragged on , and banks outside New England suspended specie payment on August 31 , 1814. The value of the Treasury Notes fell below that of specie. New England states were unsympathetic to the war and when the government attempted to withdraw deposits from a Boston bank to make interest payments on October 1 , 1814 , the bank took the position that it could tender Treasury Notes to the government which were then rejected by the holders of the government bonds who expected payment in specie. These developments led to changes in the final Treasury Note act of the era signed on February 24 , 1815. These last notes were divided into large ( $ 100 and over ) and small ( under $ 100 ) denominations , and did not expire at any predetermined time. The large notes paid interest as before , at 5 2/5 per annum , but could also be used to purchase 6 percent interest bonds at par ( i.e. were fundable into the bonds ) as a way of supporting their value . </note.n.51><note.n.52>Special Note : A few users have had troubles with the drivers that come with this device and Andrea has posted updated drivers for the Pure Audio series of products at this location : Software Update for USB Audio Products. Scroll to the bottom of the page . </note.n.52><note.n.53>A side note : As speech communication with computers evolves , we 'll find that the machines can listen faster than we talk. Power users will learn to speak ( and listen ) faster with a varied diction , including faster consonants and click sounds. The development of a computer dialect seems like something out of science fiction , but it is actually no more far-fetched than watching a fast typist . </note.n.53><note.n.54>If this music video doesn ' t slap a huge grin on your face , then you have no soul ..There , I said it. The Sour Notes have been making some noise in Austin for some time now and are finally getting some much deserved recognition. They ' ll be playing a ridiculous amount of shows SXSW ( 6 shows ! ) while currently working on their 5th album , Write What You Know , expected to release later this year. Here ' s Do-ers &amp;Say-ers from their latest , It ' s Not Gon na Be Pretty . </note.n.54><note.n.55>Date and time when the file was written by the tool. Except the current document name , none of these values can be changed from within the tool. Note that by default the name of the document is equal to the file name when it is saved. When a document file is loaded and it contains a document name that is different from the file name ( because the file had been renamed ) , a question dialog is raised which gives the user the choice between these two names for the new document name . </note.n.55><note.n.56>How is the rhythmic pattern notated ? We have seen the oval-shaped symbols ( notes ) which are used to notate pitches. These same notes are also used to indicate rhythmic values by the use of certain alterations : </note.n.56><note.n.57>The promissory note below can be used as a sample for you to write one that fits your personal needs. Just COPY and PASTE to your word processor. NO NEED TO DOWNLOAD . </note.n.57><note.n.58>Numbers are written on the lines to show you where to fret the string with the left hand. If a zero appears , this means play the open string. Like standard musical notation , you read from left to right to find out what order to play the notes. The following piece of TAB would mean play the sequence of notes ( E F F G G A ) on the bottom E string by moving up a fret at a time , starting with the open string . </note.n.58><note.n.59>41. - 7. When a distress will be a waiver of a forfeiture of the lease. On this subject , see 1 B. &amp;Adol. 428. The right of distress , it seems , does not exist in the New England states. 4 Dane 's Ab. 126; 7 Pick. R. 105; 3 Griff. Reg 404; 4 Griff. Reg. 1143; Aik. Dig. 357 , nor in Alabama , Mississippi , North Carolina , nor Ohio; and in Kentucky , the right is limited to a distress for a pecuniary rent. 1 Hill. Ab. 156. Vide , generally , Bouv. Inst. Index , h . t.; Gilb. on Distr. by Hunt; Bradb. on Distr.; Com. Dig. h. t.; Bac. Ab. h. t.; Vin. Ab. h. t.; 2 Saund. Index , h. t.; Wilk. on Repl.; 3 Chit. Bl. Com. 6 , note; Crabb on R. P. 222 to 250 . </note.n.59><note.n.60>The governing law is the law of the jurisdiction in which the promissory note will be entered into. Often the parties select the jurisdiction where the Lender resides. If the promissory note relates to the purchase of certain assets , then the location of those assets is selected . </note.n.60><note.n.61>First , the one won note represented about l and l/3 months pay for the North Korean Army private. If he was found to be carrying one won , it would be cause for suspicion. The first message reaching the target audience would be one of disappointment. Half the leaflets could be expected to land with the money side up. The " finder " would think he had one won , only to be disappointed when he discovered the ROK flag on the other side . </note.n.61><note.n.62>'The Fed Note is essentially unsound. It is the worst currency and themost dangerous that this Country has ever known. When the proponents of the actsaw that the Democratic doctrine would not permit them to let the proposedbanks issue the new currency as bank notes , they should have stopped at that.They should not have foisted that kind of currency , namely , an asset currency , on the United States Government. They should not have made the Government [ liable on the private ] debts of individuals and corporations , and , least ofall , on the private debts of foreigners. 'As Kemerer says : 'The Fed Notes , therefore , in form , have some of the qualities of Government paper money , butin substance , are almost a pure asset currency possessing a Governmentguarantee against which contingency the Government has made no provisionwhatever . ' </note.n.62><note.n.63>Finally , structure your message to leave room for hope. Even when conveying bad news , include some positive note that allows your audience to continue listening. For example , if the company is suffering a downturn , project a note of optimism about the benefits the changes ahead might bring . </note.n.63><note.n.64>88. In contrast , in one incident , credit card information belonging to more than 20 , 000 customers that had been stored in an insecure database was compromised. See Jonathan Littman , The Fugitive Game 325 , 348 ( 1996 ) ( reporting apparent copying of credit card records by Kevin Mitnick ) . Back to text at note 88 </note.n.64><note.n.65>Text can be attached to any printable symbol , except for some global symbols ( such as a clef or instrument number ) . When attaching text to a note no comma is used , since the text is regarded as a part of the note structure. However , for all other symbols , one must insert a comma between the symbol and the text. In The Note Processor the default base line of the text syllable is -6. This may be altered by an explicit space code with global effect , e.g. , -10 ! . </note.n.65><note.n.66>Then , more recently , I was reading the various articles on the Noteworthy website about pitch bend and the penny finally dropped. Understand , I was always aware of the pitch bend wheel on my MIDI keyboard , I just had n't realised that it was something that Noteworthy provided a facility to control. So I started to do some number crunching , and I have come up with the required pitch bend setting for each note , to give you Just Intonation for any given keynote . </note.n.66><note.n.67>In keyboard music written for non-sustaining instruments like the piano and harpsichord , or plucked instruments like guitar , the chorale style does not work as well , since the sound dies away quickly. Music written for these instruments ( and also for larger ensembles ) often uses a technique called arpeggiation , where one voice or instrument plays the individual notes of the chord in succession , rather than all at once. When played rapidly enough , they are still perceived as all part of the same chord. Listen to the following two examples of the same chords , one in chorale style , the other in an arpeggiated style : </note.n.67><note.n.68>Banker ' s Note. A commercial instrument resembling a bank note ( a promissory note issued by a bank intended to circulate as money ) in every particular except that it is given by a private banker or unincorporated banking institution . </note.n.68><note.n.69>1995 collection with a lovely introduction and biography. Also , very helpful notes about each piece in particular with suggestions by group members. Quite the variety of material , from a two Beatles songs , Queen 's " Seaside Rendezvous , " traditional folk songs such as the Japanese " Takeda Lullaby , " Renaissance pieces such as " If Ye Love Me " by Tallis and so on. Mostly four voices , but with an SSATB version of " Sing And We Chant It. " </note.n.69><note.n.70>A technique whereby the notes are slurred directly from one to another , producing a continuous rise or fall in pitch. When performed on the piano , the pianist plays all the white notes or all the black notes together in rapid scales . </note.n.70><note.n.71>chromaticism , chromatic Use of notes not in the basic scale of a composition or passage. Harmonic style frequently using such notes . </note.n.71><note.n.72>Ten dollar Demand Notes feature a portrait of Abraham Lincoln at left and an allegorical figure representing art to the right. In the top center of the note is a vignette of a Bald Eagle perched on olive branches with a ribbon stating E PLURIBUS UNUM. Next to the Bald Eagle is a heraldic stars and stripes shield. Both the portrait of Lincoln and Bald Eagle vignette were stock elements used on previous banknotes issued by the American Bank Note Company . </note.n.72><note.n.73>37. Refer to the sources cited in note 35 above. See also Charles Jordan and Norman Wilson interviews , both of NAR , 2 Mar. 1971. An executive at North American who reviewed a draft of the manuscript maintained that over a period of time , the NASA welding concepts were not appreciably superior to North American techniques. Barton to author , with attachment , 18 June 1976 . </note.n.73><note.n.74>Another characteristic of a Harmonic tega-chord is the " low note " , which appears in the third tetra-chord , in the second note. The same note E appears twice in the scale but only in the higher register changes to a " low note " </note.n.74><note.n.75>B. A contingent liability is a potential liability that exists on a discounted note from the discount date until the maturity date. The contingency is not reported on the balance sheet , but rather in the footnotes . </note.n.75><note.n.76>The first three notes of the scale ( Do , Re , Me ) beginning with the note " C " are : " C " , " D " , and " E " . The second note , " D " , is 9/8 times the frequency of the first note , and the third note , " E " , is 5/4 times the frequency of the first. So , the frequencies of these three notes in the " C " scale are : </note.n.76><note.n.77>Michigan Lighthouses Note Pad - 5 1/2 " by 8 " writing pad. Full color cover features a collage of Michigan lighthouses and folds from the top. Inner pages tear off from the top , with each lined page featuring full color photographs of Whitefish Point , Copper Harbor , Grand Traverse , Point Betsie and Presque Isle lighthouses. MIP32 $ 5.00 </note.n.77><note.n.78>Please contact your network service provider. They will be able to help you with this. Please note that in most parts of the world you need to pay money to get a domain . </note.n.78><note.n.79>In this note , the State 's deposits and investments are classified in categories of " custodial credit risk " . This is the risk that the State will not be able ( a ) to recover deposits if the depository bank fails or ( b ) to recover the value of investments or collateral securities that are in the custody of an outside party if the counterparty to the investment or deposit transaction fails. Classification in category 1 means that the exposure of deposits or investments to potential custodial credit risk is low. The level of potential custodial credit risk is higher for those deposits or investments classified in category 2 , and highest for those in category 3 . </note.n.79><note.n.80>A. We work out a monthly amount that each client can afford to pay. That amount is electronically debited from their personal bank account and deposited into their " settlement account " in a trust account through Note World on the day of the month you choose . </note.n.80><note.n.81>Among the several issues of Treasury Notes , of special note are the " Small Treasury Notes " of 1815 which , like the Demand Notes , were intended to circulate as currency. However only $ 3 , 392 , 994 were issued , and these were rapidly exchanged for bonds. In witness to the limited circulation achieved by these notes , only two issued uncancelled examples of the Small Treasury Notes are known today . </note.n.81><note.n.82>&gt; " I Love Belgian Sheepdogs " Note Pad " I Love Belgian Sheepdogs " Note Pad These " I Love Belgian Sheepdogs " Note Pads are a great gift idea. The note pads are printed on 20 lb White paper , 100 sheets each , and have a cardboard backing with glued top edge. A clear storage bag with resealable adhesive strip is also included. Model : NP-DOG119b </note.n.82><note.n.83>132. See U.C.C. Sec. 2-102 ( Unless the context otherwise requires , this Article applies to transactions in goods . . . . ) . Proposed revisions to Article 2 may extend its coverage to include service contracts. See Raymond T. Nimmer , Intangible Contracts : Thoughts of Hubs , Spokes , and Reinvigorating Article 2 , 35 Wm. &amp;Mary L. Rev. 1337 , 1374 , 1389 ( 1994 ) . This change would greatly increase the likelihood that Article 2 applies to the provision of a certificate. Back to text at note 132 </note.n.83><note.n.84>Comments are created in the dedicated ' Comments ' tab , seen to the right of the ' Conversation ' tab. Much like sticky notes , jot down whatever information you want and save. All comments will appear in this tab in reverse chronological order , but are also shown in the ticket ' Conversation ' tab as well. They will filter in chronologically with the appropriate flow of the surrounding messages , whether it ' s newest to oldest or oldest to newest ( read all ) . </note.n.84><note.n.85>Given the preceding analyses a skeptical reader might conjecture that the introduction of any note would have a similar effect of reducing uncertainty -- and so produce positively valenced prediction and tension responses. As a control case , consider the concocted passage shown in Figure 33. This example shows a dominant-tonic progression with an " odd-ball " note interposed. A brief analysis follows . </note.n.85><note.n.86>Please Note : The National Resource Inventory ( NRI ) program acquires aerial photos of small 1/4 section sites nationwide. It is special purpose photography for government land-use studies and not available for reproduction or resale . </note.n.86><note.n.87>Boynton Beach , Florida , March 15 , 2010 The Women of Note Chorus has announced the retirement of musical and artistic director , Holly St. John. Ms. St. John is the founding director of the Women of Note , an exceptional women ' s a cappella barbershop chorus that was founded in 1996. The Women of Note Chorus has been entertaining South Florida audiences with their beautiful a cappella four-part harmony , innovative choreography and dazzling costumes since its inception. Under Ms. St. John ' s direction , the chorus has earned several 1st place medals in their division in regional competition as well as the distinction of World ' s Best Small Chorus in 2005 . </note.n.87><note.n.88>The note had a safe conduct pass on the back showing a photograph of a French soldier accepting a rifle from a smiling guerrilla and his comrade who are being paid cash. The text on back is in French and Arabic , and says in French : </note.n.88><note.n.89>Level-2 statistics upload. The data buffer contains the data structure x25l2stat_type ( defined in zcomx25.h ) . Note that the values in this structure are not absolute values , but the number of occurrences of each type of condition since the last time the statistics were uploaded . </note.n.89><note.n.90>State Bank of New Brunswick , 18__. Curly haired girl at left , dogs head upper left center , 2 maids and horse with shield lower right , green ornamentation , ornate green back. Boldly printed on bright , white paper , this well engraved note has excellent eye appeal. the back design iswonderfully detailed and very well done. Lots to like about this note ! </note.n.90><note.n.91>Lendvai also makes note of the use of the Pitch Axis , which may be viewed as a method of assigning functional harmonic significance to pitch classes. One of the pitches must be noted as the 'tonic ' , following this , the interval from tonic determines the functional role that each note performs. The remaining functions include the dominant and the subdominant. Each of these acts as a category , containing four notes that are functionally equivalent within the musical context . </note.n.91><note.n.92>Lump Sum Payment with ( or without ) Interest : These types of loans are frequently used when loans come from friends or family. They are best used for short term loans with duration of twelve months or less. With a lump sum repayment plan the borrower repays the entire amount of the loan on a specified date. If interest is included , the amount of both principal and interest should be clearly outlined in the promissory note , along with the repayment date . </note.n.92><note.n.93>Originally , the value of money was determined by the intrinsic value of the material the money was made of , such as silver or gold. However , carrying around a lot of precious metal was cumbersome and often dangerous. As an alternative , banknotes would be issued. In financial terms , a note is a promise to pay someone money. Banknotes were originally a promise to pay the bearer an amount of precious metal stored in a vault somewhere. In this way the stored value ( usually in gold or silver coins ) backing the banknote could transfer ownership in exchange for goods or services . </note.n.93><note.n.94>In 1863 , in order to help finance the Civil War , a system of national banks was instituted by the National Currency Act. The banks each had the power to issue standardized national bank notes based on United States bonds held by the bank. The early national banking system had two main weaknesses : an inelastic currency; and a lack of liquidity. [ 2 ] During the last quarter of the 19th century and the beginning of the 20th century the United States economy went through a series of financial panics. [ 2 ] A particularly severe panic in 1907 provided the motivation for renewed demands for banking and currency reform. [ 3 ] The following year Congress enacted the Aldrich-Vreeland Act which provided for an emergency currency and established the National Monetary Commission to study banking and currency reform. [ 4 ] </note.n.94><note.n.95>All that we have mentioned has made it easy for us to provoke and bait this administration. All that we have to do is to send two mujahidin to the furthest point east to raise a piece of cloth on which is written al-Qaida , in order to make the generals race there to cause America to suffer human , economic , and political losses without their achieving for it anything of note other than some benefits for their private companies . </note.n.95><note.n.96>was the Act of July 17 , 1861 which allowed for $ 250 , 000 , 000 to be borrowed on the credit of the United States. Of this sum , up to $ 50 , 000 , 000 was authorized as non-interest bearing Treasury Notes , payable upon demand , in denominations less than fifty dollars and not less than ten dollars. These were called Demand Notes to distinguish them from the interest-bearing Treasury Notes in existence at the time. The promise to pay " on demand " was a new obligation for Treasury Notes ( though common on private banknotes ) but would spare the cash-strapped Treasury the intermediate step of selling an equivalent amount of debt by allowing it to use the notes as a currency to pay creditors directly. The notes were to be redeemable through the Assistant Treasurers ' offices at Philadelphia </note.n.96><note.n.97>Installing Jot is rather easy , in spite of the PC-centric manual ( " Double-click the Palm Desktop icon on your Windows desktop ... " ) . There are two files to install : Jot.prc and Jotdata.pdb. For the Macintosh , dragging the two files onto the SimpleInst icon and synchronizing installs Jot. Note that the application takes a full 115k on the Palm Pilot. For PalmPilot Personal users , sacrificing more than one-fifth of the memory for a handwriting recognition program may not be worth it. Even for PP Professional users , 115k is a significant chunk of memory . </note.n.97><note.n.98>116 elegxou kai anatrophj thj yeudwnumou gnwsewj ( cf. 1 Tim. vi. 20 ) . This work of Irenaeus , which is commonly known under its Latin title , Adversus Haereses ( Against Heresies ) , is still extant in a barbarous Latin version , of which we possess three mss. The original Greek is lost , though a great part of the first book can be recovered by means of extensive quotations made from it by Hippolytus and Epiphanius. The work is directed against the various Gnostic systems , among which that of Valentinus is chiefly attacked. The first book is devoted to a statement of their doctrines , the second to a refutation of them , and the remaining three to a presentation of the true doctrines of Christianity as opposed to the false positions of the Gnostics. The best edition of the original is that of Harvey : S. Irenaei libros quinque adv. Haereses. , Cambr. 1857 , 2 vols.; English translation in the Ante-Nicene Fathers , I. p. 309 ff. For the literature of the subject , see Schaff , II. p. 746 ff. On Irenaeus himself , see Book IV. chap. 21 , note 9 . </note.n.98><note.n.99>You will find out , the Federal Reserve owns your sneakers. How is this ? If you look on your Federal Reserve Note , you will find out it has daddy 's signature on it. It says , " Treasurer of the United States " on one side , and " Secretary of the Treasury " on the other side. These are 2 different distinct jurisdictions. The person whose signature is on the note , is the one who actually has the right to property of whatever you 've purchased. Is this not then the case with the boy , the grocer , and the father who signed the note which the boy gave to the grocer ? </note.n.99><note.n.100>Distinguished " explicit " responses , which were directly observable , from " implicit " responses , such as glandular secretions , that occurred inside the organism. Note that these implicit responses are not directly observable; they were potentially observable . </note.n.100></note.n.train> \ No newline at end of file diff --git a/examples/images/coning_off.png b/examples/images/coning_off.png new file mode 100644 index 000000000..3fac0c68b Binary files /dev/null and b/examples/images/coning_off.png differ diff --git a/examples/images/local_singularity.png b/examples/images/local_singularity.png new file mode 100644 index 000000000..819d1329c Binary files /dev/null and b/examples/images/local_singularity.png differ diff --git a/examples/images/locally_different.png b/examples/images/locally_different.png new file mode 100644 index 000000000..6d2a35f1f Binary files /dev/null and b/examples/images/locally_different.png differ diff --git a/examples/local_hom_NLP_disambiguation.ipynb b/examples/local_hom_NLP_disambiguation.ipynb new file mode 100644 index 000000000..f6dbc5e30 --- /dev/null +++ b/examples/local_hom_NLP_disambiguation.ipynb @@ -0,0 +1,378 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Local Homology NLP Use Cases: unsupervised word disambiguation\n", + "\n", + "In this tutorial we apply **local homology** to study natural language processing (NLP) data. We showcase how to use local homology to disambiguate words. In particular, we focus our analysis to disambiguate the word \"note\": either a musical frequency, a short text, the verb, or money.\n", + "\n", + "If you are looking at a static version of this notebook and would like to run its contents, head over to [GitHub](https://github.com/giotto-ai/giotto-tda/blob/master/examples/local_hom_NLP_disambiguation.ipynb) and download the source.\n", + "\n", + "## See also\n", + " - [Topological feature extraction using VietorisRipsPersistence and PersistenceEntropy](https://giotto-ai.github.io/gtda-docs/latest/notebooks/vietoris_rips_quickstart.html) for a quick introduction to general topological feature extraction in ``giotto-tda``.\n", + " - [Local Homology](https://giotto-ai.github.io/gtda-docs/latest/notebooks/local_homology.html), in which we introduce the ``RadiusLocalVietorisRips`` and ``KNeighborsLocalVietorisRips`` transformers used here are introduced.\n", + "\n", + "**License: AGPLv3**\n", + "\n", + "## The context\n", + "\n", + "Most modern machine learning techniques dealing with NLP data need to preprocess text data and trasform them into more standard objects: arrays. The process of transforming a word (or token, i.e. a word stripped out of its ending) into an array is called *word embedding*. \n", + "\n", + "There are of course more general techniques than simply transforming the single tokens: sentence embedding is one of the generalisations. However, for the purpose of this notebook, we will stick to word embeddings and in particular we will use a technique called [word2vec](https://en.wikipedia.org/wiki/Word2vec).\n", + "\n", + "The disadvantage of any word embedding techniques is that the same token is mapped to the same array. Hence, if two words have the same written form but different meanings (i.e., *homographic words*), such words will anyway be mapped to the same array!\n", + "\n", + "## The task \n", + "\n", + "Given the above introduction, our task is to *disambiguate words*, i.e. finding a way to differentiate homographic words by their meaning. Our approach consists of analysing the whole sentence in which the word appears and try to deduce the meaning of the word from its context (i.e. neighbouring words). The core idea of our proposal is based on the algebro-topological description of the space of word embeddings.\n", + "\n", + "## The main idea\n", + "\n", + "We are structuring our analysis on the assumptions that are clearly explained in [this paper](https://arxiv.org/pdf/2011.09413.pdf). In few words, the idea is that a word with multiple meaning sits on the sigular loci of the stratified space of the word embeddings. This sentence is in truth not formally correct, as there is yet no clear notion of what is the canonical topology in the word embedding space; nonetheless, the intuition behind these concepts can be explained pictorially:\n", + "\n", + "![sing](images/local_singularity.png)\n", + "\n", + "This picture represents the local shape of the word-embedding space: the context words are located over the four cones tipping at the word `mole` (the singularity). Hence, a sentence from a thriller containing the word `mole` would most probably be located on the north-west branch, and so on.\n", + "\n", + "## The goal of our exploration\n", + "\n", + "We would first like to stress that this notebook is merely exploratory and that there is no aim at making it a fully fledge ML pipeline for word disambiguation. \n", + "We would really like to understand if the shape of the cones around the singularity (i.e. the `mole` point) can be distinguished with **local homology**: if that is the case, then the geometric shape of a sentence lying on the word embedding stratified space correlates with the meaning of a word! This entails a new disambiguation technique." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Import PyData libraries\n", + "import numpy as np\n", + "import matplotlib.pyplot as plt\n", + "%matplotlib inline\n", + "from sklearn.base import BaseEstimator, TransformerMixin\n", + "from sklearn.preprocessing import StandardScaler, FunctionTransformer\n", + "from sklearn.pipeline import make_pipeline, Pipeline\n", + "\n", + "# Import umap for dimensionality reduction and visualization\n", + "# umap-learn is not a requirement of giotto-tda, but is needed here.\n", + "from umap import UMAP\n", + "\n", + "# giotto-tda imports\n", + "from gtda.plotting import plot_point_cloud\n", + "from gtda.local_homology import KNeighborsLocalVietorisRips\n", + "from gtda.diagrams import PersistenceEntropy\n", + "\n", + "# Import needed NLP libraries\n", + "# gensim is not a requirement of giotto-tda, but is needed here.\n", + "from gensim.models import Word2Vec\n", + "from gensim.test.utils import common_texts\n", + "from gensim.parsing.preprocessing import remove_stopwords, stem" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## The dataset and its preprocessing\n", + "\n", + "The dataset contains many occurrences of the word \"note\" with the meanings stated above. The format is `.xml`, out of which we extract the plain text and do the standard preprocessing:" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Preprocess the data\n", + "with open(\"data/note.n.xml\", \"r\") as f:\n", + " content = f.read()\n", + "\n", + "# Split the sentences\n", + "temp_list = content.split(\"<note.n.\")\n", + "\n", + "# Remove stopwords\n", + "list_of_text = list(map(remove_stopwords, temp_list))\n", + "\n", + "# Make lower case and stem\n", + "list_of_text = list(map(stem, temp_list))\n", + "\n", + "refined_list = [list_of_text[i][1 + len(str(i)):-12 - len(str(i))]\n", + " for i in range(2, len(list_of_text))]" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Next, we extract senteces from our corpus and vectorize their words using ``Word2Vec``:" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "class PreprocessText(BaseEstimator, TransformerMixin):\n", + " \"\"\"A basic class to transform a list of sentences (strings)\n", + " into a list of arrays, each with 2 dimensions: (n_words, dim_emb_space)\n", + "\n", + " Note that the output is a list of arrays, each of two dimensions: the\n", + " first dimension is the number of words in a sentence, while the \n", + " second dimension the word embedding dimension.\n", + "\n", + " The ``item``parameter is useful to select, for the transform, which item\n", + " to select.\n", + " Set ``item = None`` to get the whole list\n", + " \"\"\"\n", + " def __init__(self, vector_size=30, window=5, min_count=1, workers=4):\n", + " self.vector_size = vector_size\n", + " self.window = window\n", + " self.min_count = min_count\n", + " self.workers = workers\n", + "\n", + " def fit(self, X, y=None):\n", + " all_words_in_sentences = list(map(str.split, X))\n", + " self.word2vec = Word2Vec(sentences=all_words_in_sentences,\n", + " vector_size=self.vector_size,\n", + " window=self.window,\n", + " min_count=self.min_count,\n", + " workers=self.workers,\n", + " seed=11)\n", + " return self\n", + "\n", + " def transform(self, X, y=None):\n", + " all_words_in_sentences = list(map(str.split, X))\n", + " list_of_vect_sentences = [self.word2vec.wv[all_words_in_sentences[i]]\n", + " for i in range(len(all_words_in_sentences))]\n", + " return list_of_vect_sentences\n", + "\n", + "pt = PreprocessText()\n", + "list_of_vect_sentences = pt.fit_transform(refined_list) # all vectorized sentences" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## The exploratory results\n", + "\n", + "Here below we see a couple of sentences containing the word \"note\" with the different meanings described above." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "print(f\"\"\"Example of a preprocessed sentence where 'note' is used as a verb:\n", + "{refined_list[0] = }\n", + "\n", + "Example of preprocessed sentence where 'note' refers to music:\n", + "{refined_list[1] = }\"\"\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Local homology pipeline\n", + "\n", + "As explained in [Topological feature extraction using VietorisRipsPersistence and PersistenceEntropy](https://giotto-ai.github.io/gtda-docs/latest/notebooks/vietoris_rips_quickstart.html), \"persistence diagrams\" are a common and useful way to store information about the topology and geometry of data. Their content can be summarized and made interpretable even further by means of a variety of featurization methods.\n", + "\n", + "We will use a similar topological feature extraction method as in the [Local Homology](https://giotto-ai.github.io/gtda-docs/latest/notebooks/local_homology.html) notebook, and apply it to our Word2Vec embeddings! In particular, we will fit our local homology transformer on either of the example sentences above (seen as point clouds of word vectors) and transform it on the fixed Word2Vec embedding for the word \"note\", to see if any topological differences arise." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Initialize a `KNeighborsLocalVietorisRips` local homology transformer.\n", + "n_neighbors = (5, 15)\n", + "homology_dimensions = (0, 1)\n", + "collapse_edges = True\n", + "n_jobs = -1\n", + "kn_lh = KNeighborsLocalVietorisRips(n_neighbors=n_neighbors,\n", + " homology_dimensions=homology_dimensions,\n", + " collapse_edges=collapse_edges,\n", + " n_jobs=n_jobs)\n", + "\n", + "# Define a featurization method for persistence diagrams.\n", + "mod_pe = make_pipeline(PersistenceEntropy(),\n", + " FunctionTransformer(func=lambda X: 2 ** X))\n", + "\n", + "# Word2Vec embedding of \"note\"\n", + "note_w2v = pt.word2vec.wv[\"note\"].reshape(1, -1)\n", + "\n", + "# Fit the local homology transformer on the example sentence in which 'note' is a verb, and apply it to the \"note\" word vector\n", + "kn_lh.fit(list_of_vect_sentences[0])\n", + "mod_pe.fit_transform(kn_lh.transform(note_w2v))" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Now fit the local homology transformer on the example sentence in which 'note' refers to music, and apply it to the \"note\" word vector again\n", + "kn_lh.fit(list_of_vect_sentences[1])\n", + "mod_pe.fit_transform(kn_lh.transform(note_w2v))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "We now visualize the word2vec embeddings of two different sentences, using UMAP to perform dimensionality reduction:" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "def plotting_the_embedding(i, string):\n", + " \"\"\"this function displays the word embedding space reduced\n", + " to two dimensions by the UMAP algorithm. In yellow the word\n", + " `note` is highlighted.\"\"\"\n", + " value = None\n", + " # for loop to find the instance of note\n", + " for k in range(len(list_of_vect_sentences[i])):\n", + " if (list_of_vect_sentences[i][k] == pt.transform((\"note\",))[0]).all():\n", + " value = k\n", + " temp = np.zeros((len(list_of_vect_sentences[i])))\n", + " temp[value] = 1\n", + "\n", + " reducer = UMAP()\n", + "\n", + " scaled_point_cloud = StandardScaler().fit_transform(list_of_vect_sentences[i])\n", + "\n", + " embedding = reducer.fit_transform(scaled_point_cloud)\n", + "\n", + " plt.scatter(\n", + " embedding[:, 0],\n", + " embedding[:, 1], c = temp)\n", + " plt.gca().set_aspect('equal', 'datalim')\n", + " plt.title(f'Use of \"note\" as a {string}', fontsize=24)\n", + "\n", + " # Example of sentence with the word \"note\"\n", + " print(\"Preprocessed sentence: \")\n", + " print(refined_list[i])\n", + " kn_lh.fit(list_of_vect_sentences[i])\n", + "\n", + " print(\"First and second Betti numbers:\")\n", + " print(mod_pe.fit_transform(kn_lh.transform(np.array(pt.transform((\"note\",))[0], dtype=float))))" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Note as a verb\n", + "plotting_the_embedding(0, \"verb\")" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Musical note\n", + "plotting_the_embedding(1, \"musical note\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The technique seems promising: the results above show a clear distinction between the local shape of the neighborhoods for the word \"note\" with different meanings." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## A small scale statistical exploration" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "We now look at 30 sentences where the word \"note\" takes different meanings which we have hand labelled.\n", + "For each 30 sentences, we look at the 0th and 1st dimension local homology around note and plot the obtained 2 dimensional pointcloud coloured by the meaning of \"note\" in the sentence." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "note_emb = pt.word2vec.wv[\"note\"]\n", + "note_loc_hom = []\n", + "for i in range(30):\n", + " kn_lh = KNeighborsLocalVietorisRips(n_neighbors=(5, 15),\n", + " homology_dimensions=(0, 1),\n", + " collapse_edges=True,\n", + " n_jobs=-1)\n", + " sentence_emb = list_of_vect_sentences[i]\n", + " kn_lh.fit(sentence_emb)\n", + " note_loc_hom.append(mod_pe.fit_transform(kn_lh.transform(note_emb.reshape(1, -1)))[0])\n", + "\n", + "note_loc_hom = np.array(note_loc_hom)\n", + "\n", + "plt.scatter(\n", + " note_loc_hom[:, 0],\n", + " note_loc_hom[:, 1],\n", + " c = [0, 1, 2, 2, 1, 1, 2, 2, 1, 3, 2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 3, 3, 3, 2, 1, 1, 3, 2, 2, 1])\n", + "plt.gca().set_aspect('equal', 'datalim')\n", + "plt.title('Local dimension around \"note\"', fontsize=24)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Conclusion\n", + "\n", + "The method seems promising! In particular, the meaning \"money\" (in yellow) seems to have very varying local dimensions, whereas the other classes seem to be more clustered together. However a lot more work is needed: especially, systematising the anylsis, finding the proper vectorisation of local homology, etc...\n", + "\n", + "We really hope that this notebook will tinkle your attention and suggest you new relevant research directions." + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.7" + } + }, + "nbformat": 4, + "nbformat_minor": 4 +} diff --git a/examples/local_homology.ipynb b/examples/local_homology.ipynb new file mode 100644 index 000000000..7d27cf92c --- /dev/null +++ b/examples/local_homology.ipynb @@ -0,0 +1,356 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Local Homology\n", + "\n", + "In this tutorial we use tools from Topological Data Analysis (TDA) to study the local geometry of point clouds.\n", + "\n", + "If you are looking at a static version of this notebook and would like to run its contents, head over to [GitHub](https://github.com/giotto-ai/giotto-tda/blob/master/examples/local_homology.ipynb) and download the source.\n", + "\n", + "## See also\n", + "\n", + "- [Topological feature extraction using VietorisRipsPersistence and PersistenceEntropy](https://giotto-ai.github.io/gtda-docs/latest/notebooks/vietoris_rips_quickstart.html) for a quick introduction to general topological feature extraction in ``giotto-tda``.\n", + "- [Local Homology NLP Use Cases: Unsupervised text disambiguation](https://giotto-ai.github.io/gtda-docs/latest/notebooks/local_hom_NLP_disambiguation.html), in which the ideas presented here are applied to natural language data!\n", + "\n", + "**License: AGPLv3**" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "scrolled": true + }, + "outputs": [], + "source": [ + "import numpy as np\n", + "\n", + "from gtda.plotting import plot_point_cloud\n", + "from gtda.local_homology import KNeighborsLocalVietorisRips, RadiusLocalVietorisRips" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Dimensionality\n", + "\n", + "## What is \"dimensionality\", and how can we formalize it? \n", + "\n", + "In this tutorial we will learn how to algorithmically distinguish between possible *local geometries* around data points. Consider, for instance, the local geometry around the red dot in the three shapes below:\n", + "\n", + "![locally_different](images/locally_different.png)\n", + "\n", + "## How?\n", + "\n", + "We propose an answer to this question based on the notion of **local homology**. We estimate the \"local dimension\" around each point by studying the topological properties of the data points' neighbourhoods. We start by studying three shapes which differ by their dimensions, namely the line, the plane, and the cube." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "scrolled": true, + "tags": [] + }, + "outputs": [], + "source": [ + "n = 10\n", + "line_1d = np.linspace(0, 1, num=n, endpoint=False)\n", + "\n", + "line = np.c_[np.zeros((n, 2)), line_1d]\n", + "plane = np.array([[0, y, z] for y in line_1d for z in line_1d])\n", + "cube = np.array([[x, y, z] for x in line_1d for y in line_1d for z in line_1d])\n", + "\n", + "line_plane_cube = np.vstack((line, plane + [0.5, -0.5, 0], cube + [1, -0.5, 0]))\n", + "plot_point_cloud(line_plane_cube)" + ] + }, + { + "cell_type": "markdown", + "metadata": { + "tags": [] + }, + "source": [ + "## The method\n", + "\n", + "As explained in [Topological feature extraction using VietorisRipsPersistence and PersistenceEntropy](https://giotto-ai.github.io/gtda-docs/latest/notebooks/vietoris_rips_quickstart.html), \"persistence diagrams\" are a common and useful way to store information about the topology and geometry of data. Their content can be summarized and made interpretable even further by means of a variety of featurization methods.\n", + "\n", + "In this notebook, we show how to compute and featurize persistence diagrams for *local neighbourhoods* of all vectors in a dataset (e.g. in a point cloud), in such a way that each point's features capture the dataset's dimensionality around that point. We do this in steps:\n", + "1. create \"local point clouds\" around our data points and compute their persistence diagrams in a few chosen dimensions (more on this in \"How does it work?\" below);\n", + "2. featurize the \"local persistence diagrams\" using a modified version of the *persistence entropy* computed by the ``PersistenceEntropy`` transformer;\n", + "3. plot the original point cloud with its points coloured according to the value of the dimension-$i$ feature.\n", + "\n", + "Let us see this sequence of steps in action in the case of the point cloud representing a line. The colours will correspond to the value of the dimension-1 local topological feature. The local persistence diagrams are computed here using the ``KNeighborsLocalVietorisRips`` transformer." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "from gtda.diagrams import PersistenceEntropy\n", + "from sklearn.preprocessing import FunctionTransformer\n", + "from gtda.pipeline import make_pipeline\n", + "\n", + "## 1 - Initialize a local homology transformer. \n", + "# The notion of neighborhood here is determined by the number of closest neighbors to consider\n", + "n_neighbors = (1, 7)\n", + "homology_dimensions = (1, 2)\n", + "kn_lh = KNeighborsLocalVietorisRips(n_neighbors=n_neighbors,\n", + " homology_dimensions=homology_dimensions)\n", + "\n", + "## 2 - Define a featurization method for persistence diagrams.\n", + "mod_pe = make_pipeline(PersistenceEntropy(),\n", + " FunctionTransformer(func=lambda X: 2 ** X))\n", + "\n", + "# Summarize the steps above in a single end-to-end scikit-learn pipeline.\n", + "# Then, apply the pipeline\n", + "pipe = make_pipeline(kn_lh,\n", + " mod_pe)\n", + "loc_dim_features = pipe.fit_transform(line)\n", + "\n", + "## 3 - Plot the point cloud, colouring according to the value of the dimension-1 feature\n", + "# A simple helper function\n", + "def plot_coloured_cloud(point_cloud, colors):\n", + " \"\"\"This is a custom plotting function, that plots the point cloud and colours \n", + " the points according to a vector of colours.\"\"\"\n", + " plotly_params = {\"trace\" : {\"marker\": {\"color\": colors,\n", + " \"size\": 6,\n", + " \"showscale\": True},\n", + " \"text\": [f\"color: {v}\" for v in colors]}}\n", + " return plot_point_cloud(point_cloud, plotly_params=plotly_params)\n", + "\n", + "# Find the column index for homology dimension 1 in `loc_dim_features`\n", + "dimension = 1\n", + "dim_index = homology_dimensions.index(dimension)\n", + "colors = loc_dim_features[:, dim_index]\n", + "\n", + "# Plot the point cloud using the results in local homology dimension 1\n", + "plot_coloured_cloud(line, colors)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "For each non-boundary point, the algorithm only detects one local feature, in dimension 1!\n", + "\n", + "Now let's try with the plane point cloud, colouring according to the value of the dimension-2 local topological feature. The local persistence diagrams are computed here using the ``RadiusLocalVietorisRips`` transformer." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Plane coloured with two-dimensional features.\n", + "# The notion of neighborhood here is determined by radii.\n", + "radii = (0.001, 0.3)\n", + "homology_dimensions = (1, 2, 3)\n", + "r_lh = RadiusLocalVietorisRips(radii=radii,\n", + " homology_dimensions=homology_dimensions)\n", + "\n", + "# Construct and apply the pipeline\n", + "pipe = make_pipeline(r_lh,\n", + " mod_pe)\n", + "loc_dim_features = pipe.fit_transform(plane)\n", + "\n", + "# Find the column index for homology dimension 1 in `loc_dim_features`\n", + "dimension = 2\n", + "dim_index = homology_dimensions.index(dimension)\n", + "colors = loc_dim_features[:, dim_index]\n", + "\n", + "# Plot the point cloud using the results in local homology dimension 1\n", + "plot_coloured_cloud(plane, colors)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "As for the line with its one-dimensional local features, the *two-dimensional* local features of the plane are equal to 1 everywhere except at the borders/boundaries." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Non-homogeneous example\n", + "\n", + "In the following example, we consider a point cloud with varying dimensionality. We plot the three shapes next to each other. We encourage you to play around with the dimension parameter, to compare the local structure of points in the line, plane and cube!\n", + "\n", + "One sees that one-dimensional features are observed in all three shapes, but two-dimensional features only exist in the plane and three dimensional features only exist in the cube." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Here we set the `collapse_edges` parameter to True, which often improves performance in higher homology dimensions.\n", + "# We also set the `n_jobs` parameter to -1, to allow the algorithm to distribute across CPU cores!\n", + "radii = (0.01, 0.25)\n", + "homology_dimensions = (1, 2, 3)\n", + "collapse_edges = True\n", + "n_jobs = -1\n", + "r_lh = RadiusLocalVietorisRips(radii=radii,\n", + " homology_dimensions=homology_dimensions,\n", + " collapse_edges=collapse_edges,\n", + " n_jobs=n_jobs)\n", + "\n", + "# Construct and apply the pipeline\n", + "pipe = make_pipeline(r_lh,\n", + " mod_pe)\n", + "loc_dim_features = pipe.fit_transform(line_plane_cube)\n", + "\n", + "# Find the column index for homology dimension 1 in `loc_dim_features`.\n", + "# We encourage you to change the dimension parameter\n", + "dimension = 1\n", + "dim_index = homology_dimensions.index(dimension)\n", + "colors = loc_dim_features[:, dim_index]\n", + "\n", + "# Plot the point cloud using the results in the chosen local homology dimension\n", + "plot_coloured_cloud(line_plane_cube, colors)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## \"Non-manifold\" points|" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Our last example is inherently one-dimensional, but the point cloud still has some interesting local structures." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# First generate the point cloud\n", + "line1 = [[x, 0, 0] for x in np.arange(-1, 1, 1/10)]\n", + "line2 = [[0, y, 0] for y in np.arange(-1, 1, 1/10)]\n", + "line3 = [[x, 1, 0] for x in np.arange(-1, 1, 1/10)]\n", + "lines = np.array(line1 + line2 + line3)\n", + "\n", + "# Plot the point cloud\n", + "plot_point_cloud(lines)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Here, there are 4 different types of points:\n", + "- 'edge points', with no local structure;\n", + "- 'line points', which locally look like one-dimensional lines;\n", + "- 'intersection points' which locally look like an X;\n", + "- 'intersection points' which locally look like a T.\n", + "\n", + "The next block looks at the local homology features!" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "# Initialize the radius local homology transformer.\n", + "radii = (0.21, 0.31)\n", + "homology_dimensions = (0, 1)\n", + "n_jobs = -1\n", + "r_lh = RadiusLocalVietorisRips(radii=radii,\n", + " homology_dimensions=homology_dimensions,\n", + " n_jobs=n_jobs)\n", + "\n", + "# Construct and apply the pipeline\n", + "pipe = make_pipeline(r_lh,\n", + " mod_pe)\n", + "loc_dim_features = pipe.fit_transform(lines)\n", + "\n", + "# Find the column index for homology dimension 1 in `loc_dim_features`.\n", + "dimension = 1\n", + "dim_index = homology_dimensions.index(dimension)\n", + "colors = loc_dim_features[:, dim_index]\n", + "\n", + "# Plot the point cloud using the results in the chosen local homology dimension\n", + "plot_coloured_cloud(lines, colors)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Notice that the one-dimensional feature counts the branches at a given point!\n", + "\n", + "We encourage you to change the values of the ``radii`` parameter. If you are curious of what these parameters are, please scroll down to the 'How does it work?' section." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# How does it work?\n", + "\n", + "As the mathematics behind this algorithm is quite involved, we give an explanation for one-dimensional examples. We also give a picture for the process in a 2-dimensional example.\n", + "\n", + "A central theme in topology is the study of properties that are invariant under deformation. A popular one-dimensional invariant is the number of 'loops' in the space. For a graph, the number of 'loops' is the number of cycles of that graph. In the case of connected graphs this is equal to $1 - \\chi(G)$, where $\\chi(G) = |V| - |E|$ is the *Euler characteristic* of the graph, and $|V|$ and $|E|$ are the number of vertices and edges respectively. \n", + "\n", + "Let us consider *trees*, which are a particular kind of graph. Although all trees have Euler characteristic equal to $1$, they can have very different local structure. By computing this local structure, we can discriminate between topologically distinct trees (or graphs, or higher-dimensional objects). In order to compute the local structure around each data point with standard algorithms for point clouds or dissimilarity matrices, such as the highly-optimised routines used by ``VietorisRipsPersistence``, we use a few tricks!\n", + "\n", + "The first step is to discard points that are far away from the point under consideration, since they do not affect the local geometry around it. We thus only keep points that are \"not far\" from our point, according to a certain criterion. For the ``RadiusLocalVietorisRips`` transformer, the criterion is that the distance from the chosen point should be less than or equal to the second entry in the ``radii`` pair. For the ``KNeighborsVietorisRips`` transformer, we only include the $k$-nearest neighbors to our chosen point, where $k$ is the second entry in the ``n_neighbors`` pair.\n", + "\n", + "The second step is the one making loops reflect dimensionality. From a line, how can we obtain a loop? We stick the two ends of the line together! This trick can be thought of as \"coning off\" the endpoints: adding an extra point and linking some points (the furthest points) to this extra point. In the case of the ``RadiusLocalVietorisRips`` transformer, our algorithm cones off the points that lie in between the first and second entries in ``radii``, as depicted below. For the ``KNeighborsVietorisRips`` transformer, we cone off in an analogous way according to the ``n_neighbors`` pair.\n", + "\n", + "So what is the Euler characteristic of the result of applying this procedure to an \"X shape\" graph, which could be the local neighborhood around a point in a larger graph? The result after \"coning off\" has two vertices (at the intersection points) and 4 edges, so the Euler characteristic is $-2$! This reflects the complexity at the point that we are considering. (Notice also that a loop has Euler characteristic $0$, and a triple intersection will give Euler characteristic $-1$.)\n", + "\n", + "As a 2-dimensional example of this procedure, consider a disk (again, you can think of this as the local neighbourhood around a chosen point). By coning off the outer part of this disk, we end up with a sphere. And a sphere's only non-trivial topological features are 2-dimensional." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "![coning_off](images/coning_off.png)\n", + "<div style=\"text-align: left\">\n", + " <p style=\"text-align: center;\"> Coning off a cross and a disk.</p>\n", + "</div>" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.9" + } + }, + "nbformat": 4, + "nbformat_minor": 4 +} diff --git a/examples/lorenz_attractor.ipynb b/examples/lorenz_attractor.ipynb index 4e39d1e65..70cf22be1 100644 --- a/examples/lorenz_attractor.ipynb +++ b/examples/lorenz_attractor.ipynb @@ -632,18 +632,11 @@ "source": [ "pipeline[-1].plot(X_diagrams, sample=window_number)" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -657,7 +650,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.5" + "version": "3.9.2" } }, "nbformat": 4, diff --git a/gtda/__init__.py b/gtda/__init__.py index d79bbd4ee..d05e79d1f 100644 --- a/gtda/__init__.py +++ b/gtda/__init__.py @@ -13,5 +13,6 @@ 'externals', 'utils', 'metaestimators', + 'local_homology', '__version__' ] diff --git a/gtda/local_homology/__init__.py b/gtda/local_homology/__init__.py new file mode 100644 index 000000000..7d34f9aa3 --- /dev/null +++ b/gtda/local_homology/__init__.py @@ -0,0 +1,11 @@ +"""The module :mod:`gtda.local_homology` implements transformers +to generate local persistence diagrams.""" + + +from .simplicial import KNeighborsLocalVietorisRips, \ + RadiusLocalVietorisRips + +__all__ = [ + 'KNeighborsLocalVietorisRips', + 'RadiusLocalVietorisRips', + ] diff --git a/gtda/local_homology/simplicial.py b/gtda/local_homology/simplicial.py new file mode 100644 index 000000000..5ff46359d --- /dev/null +++ b/gtda/local_homology/simplicial.py @@ -0,0 +1,455 @@ +from numbers import Real +from types import FunctionType + +import numpy as np +import warnings + +from scipy.spatial.distance import pdist, squareform +from sklearn.neighbors import KNeighborsTransformer, RadiusNeighborsTransformer +from sklearn.base import BaseEstimator, TransformerMixin +from sklearn.utils import check_array +from sklearn.utils.validation import check_is_fitted + +from gtda.homology import VietorisRipsPersistence +from gtda.utils.intervals import Interval +from gtda.utils.validation import validate_params +from gtda.plotting import plot_diagram +from gtda.base import PlotterMixin +from gtda.utils._docs import adapt_fit_transform_docs + + +class LocalVietorisRipsBase(BaseEstimator, + TransformerMixin, + PlotterMixin): + """Base class for KNeighboursLocalVietorisRips and RadiusLocalVietorisRips. + LocalVietorisRipsBase is not meant to be used. Please see documentation + for KNeighboursLocalVietorisRips and RadiusLocalVietorisRips. + + """ + + def __init__(self, metric="euclidean", homology_dimensions=(1, 2), + neighborhood_params=(1, 2), collapse_edges=False, + n_jobs=None): + """Initializes the base class by setting the basic parameters. + For more specific description, see specific children classes.""" + # metric for the point cloud + self.metric = metric + + # topological dimension of features to be computed + self.homology_dimensions = homology_dimensions + + # Tuple of parameters defining "neighborhoods" of points. These + # parameters are input in the Transformer objects determining what + # points lie in the "neighborhoods" of each points. The points outside + # the "neighborhood" defined by the largest entry are discarded, and + # the points between the smaller and largest "neighborhoods" are "coned + # off". See more in the corresponding fit methods. + self.neighborhood_params = neighborhood_params + + # parameter to feed into the homology transformer + self.collapse_edges = collapse_edges + + self.n_jobs = n_jobs + + def fit(self, X, y=None): + """Initializes the object used for computing persistence homology, + checks that the parameters were initialized correctly. + + """ + # object used to compute persistence diagrams + self.homology = VietorisRipsPersistence( + metric="precomputed", + collapse_edges=self.collapse_edges, + homology_dimensions=self.homology_dimensions, + n_jobs=self.n_jobs + ) + # make sure the neighborhood_params has been set correctly. + if self.neighborhood_params[0] > self.neighborhood_params[1]: + warnings.warn("First `neighborhood_params` is larger than second. " + "The values are permuted. ") + self.neighborhood_params = (self.neighborhood_params[1], + self.neighborhood_params[0]) + if self.neighborhood_params[1] == 0: + warnings.warn("Second `neighborhood_params` is less than 0. " + "Second radius set to 1. ") + self.radii = (self.radii[0], 1) + if self.neighborhood_params[0] == self.neighborhood_params[1]: + warnings.warn("For meaningful features, first " + "`neighborhood_params` should be strictly smaller " + "than second.") + return self + + def transform(self, X, y=None): + """Computes the local persistence diagrams at each element of X, and + returns a list of persistence diagrams, indexed as the points of X. + This is done in several steps: + - First compute the nearest neighbors in the point cloud that + was fitted on, for both values in n_neighbors. + - For each point, compute the relevant points (corresponding to + the larger neighborhood_params value), the close points + (corresponding to the smaller neighborhood_params value), and the + annulus to cone off (relevant points, but not close points). + Compute the distance matrix of the relevant points, and add an + additional row and column corresponding to the coning off point. + - Finally compute the persistence diagrams of each coned matrices. + + Parameters + ---------- + X : ndarray of shape (n_points, dimension) + Input data representing point cloud: + an array of shape ``(n_points, n_dimensions)``. + + y : None + There is no need for a target in a transformer, yet the pipeline + API requires this parameter. + + Returns + ------- + Xt : ndarray of shape (n_samples, n_features, 3) + Array of persistence diagrams computed from the feature arrays. + ``n_features`` equals :math:`\\sum_q n_q`, where :math:`n_q` + is the maximum number of topological features in dimension + :math:`q` across all samples in `X`. + + """ + check_is_fitted(self) + Xt = check_array(X, accept_sparse=False) + + # sparse binary matrices where rows indicate the indices of points + # which are nearest neighbors to the row's index point. + Xt_close = self.close_neighbors_.transform(Xt) + Xt_relevant = self.relevant_neighbors_.transform(Xt) + + coned_mats = [] + for i in range(len(Xt)): + # get indices of points close to point at index i + close_indices = Xt_close.getrow(i).indices + # get indices of points in second "neighborhood" + relevant_indices = Xt_relevant.getrow(i).indices + annulus_indices = list(set(relevant_indices) - set(close_indices)) + # Order them such that the last ones are the ones to cone off + reordered_relevant_indices = np.concatenate((close_indices, + annulus_indices)) + if len(close_indices) == 0: + # The coned off space retracts to the cone point + coned_mat = np.zeros((1, 1)) + else: + # Fetch the coordinates + relevant_points = [self.relevant_neighbors_._fit_X[int(y)] + for y in reordered_relevant_indices] + # Dense distance matrix between all relevant points + local_mat = squareform(pdist(relevant_points, + metric=self.metric)) + # Now add the cone point: + new_row = np.concatenate((np.ones(len(close_indices))*np.inf, + np.zeros(len(annulus_indices)))) + new_col = np.concatenate((new_row, [0])) + pre_cone = np.concatenate((local_mat, [new_row])) + coned_mat = np.concatenate( + (pre_cone, np.array([new_col], + dtype=float).T), + axis=1) + coned_mats += [coned_mat] + # Compute the Vietoris Rips Persistence diagrams + Xt = self.homology.fit_transform(coned_mats) + return Xt + + @staticmethod + def plot(Xt, sample=0, homology_dimensions=None, plotly_params=None): + """Plot a sample from a collection of persistence diagrams, with + homology in multiple dimensions. + + Parameters + ---------- + Xt : ndarray of shape (n_samples, n_features, 3) + Collection of persistence diagrams, such as returned by + :meth:`transform`. + + sample : int, optional, default: ``0`` + Index of the sample in `Xt` to be plotted. + + homology_dimensions : list, tuple or None, optional, default: ``None`` + Which homology dimensions to include in the plot. ``None`` means + plotting all dimensions present in ``Xt[sample]``. + + plotly_params : dict or None, optional, default: ``None`` + Custom parameters to configure the plotly figure. Allowed keys are + ``"traces"`` and ``"layout"``, and the corresponding values should + be dictionaries containing keyword arguments as would be fed to the + :meth:`update_traces` and :meth:`update_layout` methods of + :class:`plotly.graph_objects.Figure`. + + Returns + ------- + fig : :class:`plotly.graph_objects.Figure` object + Plotly figure. + + """ + return plot_diagram( + Xt[sample], homology_dimensions=homology_dimensions, + plotly_params=plotly_params + ) + + +@adapt_fit_transform_docs +class KNeighborsLocalVietorisRips(LocalVietorisRipsBase): + """Given a :ref:`point cloud <finite_metric_spaces_and_point_clouds>` in + Euclidean space, or an abstract :ref:`metric space + <finite_metric_spaces_and_point_clouds>` encoded by a distance matrix, + information about the local topology around each point is summarized in a + collection of persistence diagrams. + + This is done by first isolating appropriate neighborhoods around each point + using a nearest neighbor transformer, then "coning off" points in an + annulus around each point, and finally computing the corresponding + associated persistence diagram. The output can then be used to explore the + point cloud, or fed into a vectorizer to obtain features. + + Parameters + ---------- + metric : string or callable, optional, default: ``"euclidean"`` + Input data is to be interpreted as a point cloud (i.e. feature arrays), + and `metric`determines a rule with which to calculate distances between + pairs of points (i.e. row vectors). If `metric` is a string, it must be + one of the options allowed by :func:`scipy.spatial.distance.pdist` + for its metric parameter, or a metric listed in + :obj:`sklearn.pairwise.PAIRWISE_DISTANCE_FUNCTIONS`, including + ``"euclidean"``, ``"manhattan"`` or ``"cosine"``. If `metric` is a + callable, it should take pairs of vectors (1D arrays) as input and, for + each two vectors in a pair, it should return a scalar indicating the + distance/dissimilarity between them. + + n_neighbors: tuple, optional, default: ``(10, 50)``, has to + consist of two non-negative integers. This defines the number of points + in the first and second neighborhoods considered. + + homology_dimensions: tuple, optional, default: ``(1, 2)``. Dimensions + (non-negative integers) of the topological features to be detected. + + collapse_edges : bool, optional, default: ``False`` + Whether to run the edge collapse algorithm in [1]_ prior to the + persistent homology computation (see the Notes). Can reduce the runtime + dramatically when the data or the maximum homology dimensions are + large. + + n_jobs : int or None, optional, default: ``None`` + The number of jobs to use for the computation. ``None`` means 1 unless + in a :obj:`joblib.parallel_backend` context. ``-1`` means using all + processors. + + References + ---------- + + .. [1] J.-D. Boissonnat and S. Pritam, "Edge Collapse and Persistence of + Flag Complexes"; in *36th International Symposium on Computational + Geometry (SoCG 2020)*, pp. 19:1–19:15, + Schloss Dagstuhl-Leibniz–Zentrum für Informatik, 2020; + `DOI: 10.4230/LIPIcs.SoCG.2020.19 + <https://doi.org/10.4230/LIPIcs.SoCG.2020.19>`_. + + """ + + _hyperparameters = { + "metric": {"type": (str, FunctionType)}, + "n_neighbors": {"type": (tuple, list), + "of": {type: int, + "in": Interval(1, np.inf, closed="left")} + }, + "homology_dimensions": { + "type": (tuple, list), + "of": {"type": int, "in": Interval(0, np.inf, closed="left")} + }, + "collapse_edges": {"type": bool} + } + + def __init__(self, metric="euclidean", homology_dimensions=(1, 2), + n_neighbors=(1, 2), collapse_edges=False, n_jobs=None): + self.n_neighbors = n_neighbors + super().__init__(metric=metric, + homology_dimensions=homology_dimensions, + neighborhood_params=self.n_neighbors, + collapse_edges=collapse_edges, + n_jobs=n_jobs) + + def fit(self, X, y=None): + """Initiates and fits the transformers that efficiently computes the + nearest neighbors of given points. + This method is here to implement the usual scikit-learn API and hence + work in pipelines. + + Parameters + ---------- + X : ndarray of shape (n_points, dimension) + Input data representing point cloud. Can be either + a point cloud: an array of shape ``(n_points, n_dimensions)``. + + y : None + There is no need for a target in a transformer, yet the pipeline + API requires this parameter. + + Returns + ------- + self : object + + """ + super().fit(X) + + validate_params( + self.get_params(), self._hyperparameters, exclude=["n_jobs"]) + check_array(X, accept_sparse=False) + + # make sure that the parameters are set correctly + self.size_ = len(X) + if self.size_ <= self.neighborhood_params[0]: + warnings.warn("First n_neighbors is too large to be relevant. " + "Consider reducing it.") + self.neighborhood_params = (self.size_-1, self.size_) + if self.size_ < self.neighborhood_params[1]: + warnings.warn("Second `n_neighbors` is too large to be " + "relevant. Consider reducing it. ") + self.neighborhood_params = (self.neighborhood_params[0], + self.size_) + + # Objects used for finding nearest neighbors + self.close_neighbors_ = KNeighborsTransformer( + mode="connectivity", + n_neighbors=self.neighborhood_params[0], + metric=self.metric, + n_jobs=self.n_jobs + ) + + self.relevant_neighbors_ = KNeighborsTransformer( + mode="connectivity", + n_neighbors=self.neighborhood_params[1], + metric=self.metric, + n_jobs=self.n_jobs + ) + + self.close_neighbors_.fit(X) + self.relevant_neighbors_.fit(X) + return self + + +@adapt_fit_transform_docs +class RadiusLocalVietorisRips(LocalVietorisRipsBase): + """Given a :ref:`point cloud <finite_metric_spaces_and_point_clouds>` in + Euclidean space, or an abstract :ref:`metric space + <finite_metric_spaces_and_point_clouds>` encoded by a distance matrix, + information about the local topology around each point is summarized in a + collection of persistence diagrams. + + This is done by first isolating appropriate neighborhoods around each point + using a radius neighbor transformer, then "coning off" points in an annulus + around each point, and finally computing the corresponding associated + persistence diagram. The output can then be used to explore the point + cloud, or fed into a vectorizer to obtain features. + + Parameters + ---------- + metric : string or callable, optional, default: ``"euclidean"`` + Input data is to be interpreted as a point cloud (i.e. feature arrays), + and `metric`determines a rule with which to calculate distances between + pairs of points (i.e. row vectors). If `metric` is a string, it must be + one of the options allowed by :func:`scipy.spatial.distance.pdist` for + its `metric` parameter, or a metric listed in + :obj:`sklearn.pairwise.PAIRWISE_DISTANCE_FUNCTIONS`, including + ``"euclidean"``, ``"manhattan"`` or ``"cosine"``. If `metric` is a + callable, it should take pairs of vectors (1D arrays) as input and, for + each two vectors in a pair, it should return a scalar indicating the + distance/dissimilarity between them. + + radii: tuple, optional, default: ``(0.0, 1.0)`` has to consist of two + non-negative floats. This determines the radius of the first and second + neighborhood around points considered. + + homology_dimensions: tuple, optional, default: ``(1, 2)``. Dimensions + (non-negative integers) of the topological features to be detected. + + collapse_edges : bool, optional, default: ``False`` + Whether to run the edge collapse algorithm in [1]_ prior to the + persistent homology computation (see the Notes). Can reduce the runtime + dramatically when the data or the maximum homology dimensions are + large. + + n_jobs : int or None, optional, default: ``None`` + The number of jobs to use for the computation. ``None`` means 1 unless + in a :obj:`joblib.parallel_backend` context. ``-1`` means using all + processors. + + References + ---------- + .. [1] J.-D. Boissonnat and S. Pritam, "Edge Collapse and Persistence of + Flag Complexes"; in *36th International Symposium on Computational + Geometry (SoCG 2020)*, pp. 19:1–19:15, + Schloss Dagstuhl-Leibniz–Zentrum für Informatik, 2020; + `DOI: 10.4230/LIPIcs.SoCG.2020.19 + <https://doi.org/10.4230/LIPIcs.SoCG.2020.19>`_. + + """ + + _hyperparameters = { + "metric": {"type": (str, FunctionType)}, + "radii": {"type": (tuple, list), + "of": {type: Real, "in": Interval(0, np.inf, closed="left")} + }, + "homology_dimensions": { + "type": (tuple, list), + "of": {"type": int, "in": Interval(0, np.inf, closed="left")} + }, + "collapse_edges": {"type": bool} + } + + def __init__(self, metric="euclidean", homology_dimensions=(1, 2), + radii=(1, 2), collapse_edges=False, n_jobs=None): + self.radii = radii + super().__init__(metric=metric, + homology_dimensions=homology_dimensions, + neighborhood_params=self.radii, + collapse_edges=collapse_edges, + n_jobs=n_jobs) + + def fit(self, X, y=None): + """Initiates and fits the transformers that efficiently computes the + nearest neighbors of given points. + This method is here to implement the usual scikit-learn API and hence + work in pipelines. + + Parameters + ---------- + X : ndarray of shape (n_points, dimension) + Input data representing point cloud. Can be either + a point cloud: an array of shape ``(n_points, n_dimensions)``. + + y : None + There is no need for a target in a transformer, yet the pipeline + API requires this parameter. + + Returns + ------- + self : object + + """ + super().fit(X) + + validate_params( + self.get_params(), self._hyperparameters, exclude=["n_jobs"]) + check_array(X, accept_sparse=False) + + # Objects used for finding nearest neighbors + self.close_neighbors_ = RadiusNeighborsTransformer( + mode="connectivity", + radius=self.neighborhood_params[0], + metric=self.metric, + n_jobs=self.n_jobs + ) + + self.relevant_neighbors_ = RadiusNeighborsTransformer( + mode="connectivity", + radius=self.neighborhood_params[1], + metric=self.metric, + n_jobs=self.n_jobs + ) + + self.close_neighbors_.fit(X) + self.relevant_neighbors_.fit(X) + return self diff --git a/setup.py b/setup.py index 700e83732..9d03c99e7 100755 --- a/setup.py +++ b/setup.py @@ -66,7 +66,9 @@ "examples": ["jupyter", "pandas", "openml", - "matplotlib"]} + "matplotlib", + "gensim", + "umap-learn"]} def combine_requirements(base_keys):
Changes in git history Please be aware that the final moving from gitlab to github has led us to modify git history. @rth, could you please refork?
Sure, will do. Thanks @gtauzin !
2021-07-15T14:54:39
0.0
[]
[]
tenajima/nullpom
tenajima__nullpom-6
9e8125702dddf8740271b718f4a77fb1fd656d00
diff --git a/nullpom/main.py b/nullpom/main.py index 7bfcebb..fd9084d 100644 --- a/nullpom/main.py +++ b/nullpom/main.py @@ -1,26 +1,89 @@ +import pickle +import math +import os +from datetime import datetime + import lightgbm as lgb +import matplotlib.pyplot as plt import numpy as np import pandas as pd -def run_null_importance(params, n_runs=100, *, X_train, X_valid, y_train, y_valid): +def run_null_importance( + params, output_dir="", n_runs=100, *, X_train, X_valid, y_train, y_valid +): experiment = Experiment( params, - n_runs=100, + n_runs=n_runs, X_train=X_train, X_valid=X_valid, y_train=y_train, y_valid=y_valid, ) - return experiment.execute() + result = experiment.execute() + if output_dir == "": + output_dir = datetime.now().strftime(r"%Y%m%d_%H%M%S") + result.save(output_dir) + return result -class Result: +class NullImportanceResult: def __init__(self, actual_importance, actual_model, null_importance): self.actual_importance = actual_importance self.actual_model = actual_model self.null_importance = null_importance + def save(self, output_dir): + output_dir = os.path.join("./", output_dir) + os.makedirs(output_dir) + with open(os.path.join(output_dir, "actual_model.pkl"), "wb") as f: + pickle.dump(self.actual_model, f) + + self.actual_importance.to_pickle( + os.path.join(output_dir, "actual_importance.pkl") + ) + self.null_importance.to_pickle(os.path.join(output_dir, "null_importance.pkl")) + + fig = self.plot_importance() + fig.savefig(os.path.join(output_dir, "distribution_of_importance.png")) + + @classmethod + def load(cls, input_dir): + actual_model = pd.read_pickle(os.path.join(input_dir, "actual_model.pkl")) + actual_importance = pd.read_pickle( + os.path.join(input_dir, "actual_importance.pkl") + ) + null_importance = pd.read_pickle(os.path.join(input_dir, "null_importance.pkl")) + return cls(actual_importance, actual_model, null_importance) + + def plot_importance(self): + features = self.actual_importance["feature"].unique().tolist() + num_features = len(features) + AX_COUNT_PER_ROW = 4 + col_width = AX_COUNT_PER_ROW * 8 + row_width = np.maximum(1, (num_features // AX_COUNT_PER_ROW)) * 4 + fig = plt.figure(figsize=(col_width, row_width)) + num_of_rows = math.ceil(num_features / AX_COUNT_PER_ROW) + for i, feature in enumerate(features): + ax = fig.add_subplot(num_of_rows, AX_COUNT_PER_ROW, i + 1) + hist_info = ax.hist( + self.null_importance.query(f"feature == '{feature}'")["importance"], + label="Null importance", + ) + ax.vlines( + x=self.actual_importance.loc[i, "importance"], + ymin=0, + ymax=np.max(hist_info[0]), + color="r", + linewidth=5, + label="Real Target", + ) + ax.legend(loc="upper right") + ax.set_title(f"Importance of {feature.upper()}", fontweight="bold") + ax.set_xlabel(f"Null Importance Distribution for {feature.upper()}") + ax.set_ylabel("Importance") + return fig + class Experiment: def __init__(self, params, n_runs=100, *, X_train, X_valid, y_train, y_valid): @@ -41,16 +104,22 @@ def get_feature_importance(self, *, shuffle=False): y_valid = np.random.permutation(self.y_valid) dtrain = lgb.Dataset(self.X_train, y_train) dvalid = lgb.Dataset(self.X_valid, y_valid) + verbose_eval = False else: dtrain = lgb.Dataset(self.X_train, self.y_train) dvalid = lgb.Dataset(self.X_valid, self.y_valid) + verbose_eval = 1000 - model = lgb.train(self.params, dtrain, valid_sets=[dtrain, dvalid]) + model = lgb.train( + self.params, dtrain, valid_sets=[dtrain, dvalid], verbose_eval=verbose_eval + ) importance = pd.DataFrame() importance["feature"] = model.feature_name() importance["importance"] = model.feature_importance("gain") - importance = importance.sort_values("importance", ascending=False).reset_index() + importance = importance.sort_values("importance", ascending=False).reset_index( + drop=True + ) return importance, model def execute(self): @@ -64,4 +133,4 @@ def execute(self): tmp_importance, _ = self.get_feature_importance(shuffle=True) null_importance = pd.concat([null_importance, tmp_importance]) - return Result(actual_importance, actual_model, null_importance) + return NullImportanceResult(actual_importance, actual_model, null_importance) diff --git a/poetry.lock b/poetry.lock index 355df68..5e39ff5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,3 +1,22 @@ +[[package]] +name = "anyio" +version = "2.2.0" +description = "High level compatibility layer for multiple asynchronous event loop implementations" +category = "dev" +optional = false +python-versions = ">=3.6.2" + +[package.dependencies] +idna = ">=2.8" +sniffio = ">=1.1" +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +curio = ["curio (>=1.4)"] +doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] +test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop (<0.15)", "uvloop (>=0.15)"] +trio = ["trio (>=0.16)"] + [[package]] name = "appdirs" version = "1.4.4" @@ -6,6 +25,39 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "appnope" +version = "0.1.2" +description = "Disable App Nap on macOS >= 10.9" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "argon2-cffi" +version = "20.1.0" +description = "The secure Argon2 password hashing algorithm." +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +cffi = ">=1.0.0" +six = "*" + +[package.extras] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pytest", "sphinx", "wheel", "pre-commit"] +docs = ["sphinx"] +tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pytest"] + +[[package]] +name = "async-generator" +version = "1.10" +description = "Async generators and context managers for Python 3.5+" +category = "dev" +optional = false +python-versions = ">=3.5" + [[package]] name = "atomicwrites" version = "1.4.0" @@ -28,6 +80,25 @@ docs = ["furo", "sphinx", "zope.interface"] tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] +[[package]] +name = "babel" +version = "2.9.0" +description = "Internationalization utilities" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.dependencies] +pytz = ">=2015.7" + +[[package]] +name = "backcall" +version = "0.2.0" +description = "Specifications for callback functions passed in to an API" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "black" version = "20.8b1" @@ -50,6 +121,30 @@ typing-extensions = ">=3.7.4" colorama = ["colorama (>=0.4.3)"] d = ["aiohttp (>=3.3.2)", "aiohttp-cors"] +[[package]] +name = "bleach" +version = "3.3.0" +description = "An easy safelist-based HTML-sanitizing tool." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.dependencies] +packaging = "*" +six = ">=1.9.0" +webencodings = "*" + +[[package]] +name = "cffi" +version = "1.14.5" +description = "Foreign Function Interface for Python calling C code." +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +pycparser = "*" + [[package]] name = "click" version = "7.1.2" @@ -66,6 +161,49 @@ category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +[[package]] +name = "cycler" +version = "0.10.0" +description = "Composable style cycles" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +six = "*" + +[[package]] +name = "decorator" +version = "4.4.2" +description = "Decorators for Humans" +category = "dev" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*" + +[[package]] +name = "defusedxml" +version = "0.7.1" +description = "XML bomb protection for Python stdlib modules" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "entrypoints" +version = "0.3" +description = "Discover and load entry points from installed packages." +category = "dev" +optional = false +python-versions = ">=2.7" + +[[package]] +name = "idna" +version = "3.1" +description = "Internationalized Domain Names in Applications (IDNA)" +category = "dev" +optional = false +python-versions = ">=3.4" + [[package]] name = "importlib-metadata" version = "3.7.2" @@ -82,6 +220,92 @@ zipp = ">=0.5" docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] +[[package]] +name = "ipykernel" +version = "5.5.0" +description = "IPython Kernel for Jupyter" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +appnope = {version = "*", markers = "platform_system == \"Darwin\""} +ipython = ">=5.0.0" +jupyter-client = "*" +tornado = ">=4.2" +traitlets = ">=4.1.0" + +[package.extras] +test = ["pytest (!=5.3.4)", "pytest-cov", "flaky", "nose", "jedi (<=0.17.2)"] + +[[package]] +name = "ipython" +version = "7.21.0" +description = "IPython: Productive Interactive Computing" +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +appnope = {version = "*", markers = "sys_platform == \"darwin\""} +backcall = "*" +colorama = {version = "*", markers = "sys_platform == \"win32\""} +decorator = "*" +jedi = ">=0.16" +pexpect = {version = ">4.3", markers = "sys_platform != \"win32\""} +pickleshare = "*" +prompt-toolkit = ">=2.0.0,<3.0.0 || >3.0.0,<3.0.1 || >3.0.1,<3.1.0" +pygments = "*" +traitlets = ">=4.2" + +[package.extras] +all = ["Sphinx (>=1.3)", "ipykernel", "ipyparallel", "ipywidgets", "nbconvert", "nbformat", "nose (>=0.10.1)", "notebook", "numpy (>=1.14)", "pygments", "qtconsole", "requests", "testpath"] +doc = ["Sphinx (>=1.3)"] +kernel = ["ipykernel"] +nbconvert = ["nbconvert"] +nbformat = ["nbformat"] +notebook = ["notebook", "ipywidgets"] +parallel = ["ipyparallel"] +qtconsole = ["qtconsole"] +test = ["nose (>=0.10.1)", "requests", "testpath", "pygments", "nbformat", "ipykernel", "numpy (>=1.14)"] + +[[package]] +name = "ipython-genutils" +version = "0.2.0" +description = "Vestigial utilities from IPython" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "jedi" +version = "0.18.0" +description = "An autocompletion tool for Python that can be used for text editors." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +parso = ">=0.8.0,<0.9.0" + +[package.extras] +qa = ["flake8 (==3.8.3)", "mypy (==0.782)"] +testing = ["Django (<3.1)", "colorama", "docopt", "pytest (<6.0.0)"] + +[[package]] +name = "jinja2" +version = "2.11.3" +description = "A very fast and expressive template engine." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.dependencies] +MarkupSafe = ">=0.23" + +[package.extras] +i18n = ["Babel (>=0.8)"] + [[package]] name = "joblib" version = "1.0.1" @@ -90,6 +314,169 @@ category = "main" optional = false python-versions = ">=3.6" +[[package]] +name = "json5" +version = "0.9.5" +description = "A Python implementation of the JSON5 data format." +category = "dev" +optional = false +python-versions = "*" + +[package.extras] +dev = ["hypothesis"] + +[[package]] +name = "jsonschema" +version = "3.2.0" +description = "An implementation of JSON Schema validation for Python" +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +attrs = ">=17.4.0" +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} +pyrsistent = ">=0.14.0" +six = ">=1.11.0" + +[package.extras] +format = ["idna", "jsonpointer (>1.13)", "rfc3987", "strict-rfc3339", "webcolors"] +format_nongpl = ["idna", "jsonpointer (>1.13)", "webcolors", "rfc3986-validator (>0.1.0)", "rfc3339-validator"] + +[[package]] +name = "jupyter-client" +version = "6.1.11" +description = "Jupyter protocol implementation and client libraries" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +jupyter-core = ">=4.6.0" +python-dateutil = ">=2.1" +pyzmq = ">=13" +tornado = ">=4.1" +traitlets = "*" + +[package.extras] +doc = ["sphinx (>=1.3.6)", "sphinx-rtd-theme", "sphinxcontrib-github-alt"] +test = ["jedi (<=0.17.2)", "ipykernel", "ipython", "mock", "pytest", "pytest-asyncio", "async-generator", "pytest-timeout"] + +[[package]] +name = "jupyter-core" +version = "4.7.1" +description = "Jupyter core package. A base package on which Jupyter projects rely." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +pywin32 = {version = ">=1.0", markers = "sys_platform == \"win32\""} +traitlets = "*" + +[[package]] +name = "jupyter-packaging" +version = "0.7.12" +description = "Jupyter Packaging Utilities" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +packaging = "*" + +[package.extras] +test = ["pytest"] + +[[package]] +name = "jupyter-server" +version = "1.4.1" +description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +anyio = ">=2.0.2" +ipython-genutils = "*" +jinja2 = "*" +jupyter-client = ">=6.1.1" +jupyter-core = ">=4.4.0" +nbconvert = "*" +nbformat = "*" +prometheus-client = "*" +pywin32 = {version = ">=1.0", markers = "sys_platform == \"win32\""} +pyzmq = ">=17" +Send2Trash = "*" +terminado = ">=0.8.3" +tornado = ">=6.1.0" +traitlets = ">=4.2.1" + +[package.extras] +test = ["coverage", "requests", "pytest", "pytest-cov", "pytest-tornasync", "pytest-console-scripts", "ipykernel"] + +[[package]] +name = "jupyterlab" +version = "3.0.10" +description = "The JupyterLab server extension." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +ipython = "*" +jinja2 = ">=2.10" +jupyter-core = "*" +jupyter-packaging = ">=0.7.3,<0.8.0" +jupyter-server = ">=1.4,<2.0" +jupyterlab-server = ">=2.3,<3.0" +nbclassic = ">=0.2,<1.0" +packaging = "*" +tornado = ">=6.1.0" + +[package.extras] +docs = ["jsx-lexer", "recommonmark", "sphinx", "sphinx-rtd-theme", "sphinx-copybutton"] +test = ["pytest (>=6.0)", "pytest-cov", "pytest-console-scripts", "pytest-check-links", "jupyterlab-server[test] (>=2.0,<3.0)", "requests", "wheel", "virtualenv", "nose-exclude"] + +[[package]] +name = "jupyterlab-pygments" +version = "0.1.2" +description = "Pygments theme using JupyterLab CSS variables" +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +pygments = ">=2.4.1,<3" + +[[package]] +name = "jupyterlab-server" +version = "2.3.0" +description = "JupyterLab Server" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +babel = "*" +jinja2 = ">=2.10" +json5 = "*" +jsonschema = ">=3.0.1" +jupyter-server = ">=1.4,<2.0" +packaging = "*" +requests = "*" + +[package.extras] +test = ["codecov", "ipykernel", "pytest (>=5.3.2)", "pytest-cov", "jupyter-server", "pytest-console-scripts", "strict-rfc3339", "wheel"] + +[[package]] +name = "kiwisolver" +version = "1.3.1" +description = "A fast implementation of the Cassowary constraint solver" +category = "main" +optional = false +python-versions = ">=3.6" + [[package]] name = "lightgbm" version = "3.1.1" @@ -103,6 +490,38 @@ numpy = "*" scikit-learn = "!=0.22.0" scipy = "*" +[[package]] +name = "markupsafe" +version = "1.1.1" +description = "Safely add untrusted strings to HTML/XML markup." +category = "dev" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" + +[[package]] +name = "matplotlib" +version = "3.3.4" +description = "Python plotting package" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +cycler = ">=0.10" +kiwisolver = ">=1.0.1" +numpy = ">=1.15" +pillow = ">=6.2.0" +pyparsing = ">=2.0.3,<2.0.4 || >2.0.4,<2.1.2 || >2.1.2,<2.1.6 || >2.1.6" +python-dateutil = ">=2.1" + +[[package]] +name = "mistune" +version = "0.8.4" +description = "The fastest markdown parser in pure Python" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "more-itertools" version = "8.7.0" @@ -119,6 +538,126 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "nbclassic" +version = "0.2.6" +description = "Jupyter Notebook as a Jupyter Server Extension." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +jupyter-server = ">=1.1,<2.0" +notebook = "<7" + +[package.extras] +test = ["pytest", "pytest-tornasync", "pytest-console-scripts"] + +[[package]] +name = "nbclient" +version = "0.5.3" +description = "A client library for executing notebooks. Formerly nbconvert's ExecutePreprocessor." +category = "dev" +optional = false +python-versions = ">=3.6.1" + +[package.dependencies] +async-generator = "*" +jupyter-client = ">=6.1.5" +nbformat = ">=5.0" +nest-asyncio = "*" +traitlets = ">=4.2" + +[package.extras] +dev = ["codecov", "coverage", "ipython", "ipykernel", "ipywidgets", "pytest (>=4.1)", "pytest-cov (>=2.6.1)", "check-manifest", "flake8", "mypy", "tox", "bumpversion", "xmltodict", "pip (>=18.1)", "wheel (>=0.31.0)", "setuptools (>=38.6.0)", "twine (>=1.11.0)", "black"] +sphinx = ["Sphinx (>=1.7)", "sphinx-book-theme", "mock", "moto", "myst-parser"] +test = ["codecov", "coverage", "ipython", "ipykernel", "ipywidgets", "pytest (>=4.1)", "pytest-cov (>=2.6.1)", "check-manifest", "flake8", "mypy", "tox", "bumpversion", "xmltodict", "pip (>=18.1)", "wheel (>=0.31.0)", "setuptools (>=38.6.0)", "twine (>=1.11.0)", "black"] + +[[package]] +name = "nbconvert" +version = "6.0.7" +description = "Converting Jupyter Notebooks" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +bleach = "*" +defusedxml = "*" +entrypoints = ">=0.2.2" +jinja2 = ">=2.4" +jupyter-core = "*" +jupyterlab-pygments = "*" +mistune = ">=0.8.1,<2" +nbclient = ">=0.5.0,<0.6.0" +nbformat = ">=4.4" +pandocfilters = ">=1.4.1" +pygments = ">=2.4.1" +testpath = "*" +traitlets = ">=4.2" + +[package.extras] +all = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (==0.2.2)", "tornado (>=4.0)", "sphinx (>=1.5.1)", "sphinx-rtd-theme", "nbsphinx (>=0.2.12)", "ipython"] +docs = ["sphinx (>=1.5.1)", "sphinx-rtd-theme", "nbsphinx (>=0.2.12)", "ipython"] +serve = ["tornado (>=4.0)"] +test = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (==0.2.2)"] +webpdf = ["pyppeteer (==0.2.2)"] + +[[package]] +name = "nbformat" +version = "5.1.2" +description = "The Jupyter Notebook format" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +ipython-genutils = "*" +jsonschema = ">=2.4,<2.5.0 || >2.5.0" +jupyter-core = "*" +traitlets = ">=4.1" + +[package.extras] +fast = ["fastjsonschema"] +test = ["check-manifest", "fastjsonschema", "testpath", "pytest", "pytest-cov"] + +[[package]] +name = "nest-asyncio" +version = "1.5.1" +description = "Patch asyncio to allow nested event loops" +category = "dev" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "notebook" +version = "6.2.0" +description = "A web-based notebook environment for interactive computing" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +argon2-cffi = "*" +ipykernel = "*" +ipython-genutils = "*" +jinja2 = "*" +jupyter-client = ">=5.3.4" +jupyter-core = ">=4.6.1" +nbconvert = "*" +nbformat = "*" +prometheus-client = "*" +pyzmq = ">=17" +Send2Trash = ">=1.5.0" +terminado = ">=0.8.3" +tornado = ">=6.1" +traitlets = ">=4.2.1" + +[package.extras] +docs = ["sphinx", "nbsphinx", "sphinxcontrib-github-alt", "sphinx-rtd-theme"] +json-logging = ["json-logging"] +test = ["pytest", "coverage", "requests", "nbval", "selenium", "pytest-cov", "requests-unixsocket"] + [[package]] name = "numpy" version = "1.20.1" @@ -154,6 +693,26 @@ pytz = ">=2017.3" [package.extras] test = ["pytest (>=5.0.1)", "pytest-xdist", "hypothesis (>=3.58)"] +[[package]] +name = "pandocfilters" +version = "1.4.3" +description = "Utilities for writing pandoc filters in python" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "parso" +version = "0.8.1" +description = "A Python Parser" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.extras] +qa = ["flake8 (==3.8.3)", "mypy (==0.782)"] +testing = ["docopt", "pytest (<6.0.0)"] + [[package]] name = "pathspec" version = "0.8.1" @@ -162,6 +721,33 @@ category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +[[package]] +name = "pexpect" +version = "4.8.0" +description = "Pexpect allows easy control of interactive console applications." +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +ptyprocess = ">=0.5" + +[[package]] +name = "pickleshare" +version = "0.7.5" +description = "Tiny 'shelve'-like database with concurrency support" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "pillow" +version = "8.1.2" +description = "Python Imaging Library (Fork)" +category = "main" +optional = false +python-versions = ">=3.6" + [[package]] name = "pluggy" version = "0.13.1" @@ -176,6 +762,36 @@ importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} [package.extras] dev = ["pre-commit", "tox"] +[[package]] +name = "prometheus-client" +version = "0.9.0" +description = "Python client for the Prometheus monitoring system." +category = "dev" +optional = false +python-versions = "*" + +[package.extras] +twisted = ["twisted"] + +[[package]] +name = "prompt-toolkit" +version = "3.0.16" +description = "Library for building powerful interactive command lines in Python" +category = "dev" +optional = false +python-versions = ">=3.6.1" + +[package.dependencies] +wcwidth = "*" + +[[package]] +name = "ptyprocess" +version = "0.7.0" +description = "Run a subprocess in a pseudo terminal" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "py" version = "1.10.0" @@ -184,14 +800,38 @@ category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +[[package]] +name = "pycparser" +version = "2.20" +description = "C parser in Python" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "pygments" +version = "2.8.1" +description = "Pygments is a syntax highlighting package written in Python." +category = "dev" +optional = false +python-versions = ">=3.5" + [[package]] name = "pyparsing" version = "2.4.7" description = "Python parsing module" -category = "dev" +category = "main" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +[[package]] +name = "pyrsistent" +version = "0.17.3" +description = "Persistent/Functional/Immutable data structures" +category = "dev" +optional = false +python-versions = ">=3.5" + [[package]] name = "pytest" version = "5.4.3" @@ -234,6 +874,34 @@ category = "main" optional = false python-versions = "*" +[[package]] +name = "pywin32" +version = "300" +description = "Python for Window Extensions" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "pywinpty" +version = "0.5.7" +description = "Python bindings for the winpty library" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "pyzmq" +version = "22.0.3" +description = "Python bindings for 0MQ" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +cffi = {version = "*", markers = "implementation_name == \"pypy\""} +py = {version = "*", markers = "implementation_name == \"pypy\""} + [[package]] name = "regex" version = "2020.11.13" @@ -242,6 +910,18 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "requests" +version = "2.15.1" +description = "Python HTTP for Humans." +category = "dev" +optional = false +python-versions = "*" + +[package.extras] +security = ["cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=0.14)"] +socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] + [[package]] name = "scikit-learn" version = "0.24.1" @@ -273,6 +953,14 @@ python-versions = ">=3.7" [package.dependencies] numpy = ">=1.16.5" +[[package]] +name = "send2trash" +version = "1.5.0" +description = "Send file to trash natively under Mac OS X, Windows and Linux." +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "six" version = "1.15.0" @@ -281,6 +969,38 @@ category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" +[[package]] +name = "sniffio" +version = "1.2.0" +description = "Sniff out which async library your code is running under" +category = "dev" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "terminado" +version = "0.9.2" +description = "Tornado websocket backend for the Xterm.js Javascript terminal emulator library." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +ptyprocess = {version = "*", markers = "os_name != \"nt\""} +pywinpty = {version = ">=0.5", markers = "os_name == \"nt\""} +tornado = ">=4" + +[[package]] +name = "testpath" +version = "0.4.4" +description = "Test utilities for code working with files and commands" +category = "dev" +optional = false +python-versions = "*" + +[package.extras] +test = ["pathlib2"] + [[package]] name = "threadpoolctl" version = "2.1.0" @@ -297,6 +1017,28 @@ category = "dev" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +[[package]] +name = "tornado" +version = "6.1" +description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." +category = "dev" +optional = false +python-versions = ">= 3.5" + +[[package]] +name = "traitlets" +version = "5.0.5" +description = "Traitlets Python configuration system" +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +ipython-genutils = "*" + +[package.extras] +test = ["pytest"] + [[package]] name = "typed-ast" version = "1.4.2" @@ -321,6 +1063,14 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "webencodings" +version = "0.5.1" +description = "Character encoding aliases for legacy web content" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "zipp" version = "3.4.1" @@ -336,13 +1086,45 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt [metadata] lock-version = "1.1" python-versions = "^3.7.1" -content-hash = "92530d005ec90dc08c8e86d4a001f775b3f8235927e2bd9e6ae5baf04fcbc781" +content-hash = "42adba8ddd3f3403aa5ac917448aea464b4a467c947638d5847895aace90ae66" [metadata.files] +anyio = [ + {file = "anyio-2.2.0-py3-none-any.whl", hash = "sha256:aa3da546ed17f097ca876c78024dea380a3b7fa80759abfdda59f12176a3dac8"}, + {file = "anyio-2.2.0.tar.gz", hash = "sha256:4a41c5b3a65ed92e469d51b6fba3779301850ea2e352afcf9e36c46f21ee14a9"}, +] appdirs = [ {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, ] +appnope = [ + {file = "appnope-0.1.2-py2.py3-none-any.whl", hash = "sha256:93aa393e9d6c54c5cd570ccadd8edad61ea0c4b9ea7a01409020c9aa019eb442"}, + {file = "appnope-0.1.2.tar.gz", hash = "sha256:dd83cd4b5b460958838f6eb3000c660b1f9caf2a5b1de4264e941512f603258a"}, +] +argon2-cffi = [ + {file = "argon2-cffi-20.1.0.tar.gz", hash = "sha256:d8029b2d3e4b4cea770e9e5a0104dd8fa185c1724a0f01528ae4826a6d25f97d"}, + {file = "argon2_cffi-20.1.0-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:6ea92c980586931a816d61e4faf6c192b4abce89aa767ff6581e6ddc985ed003"}, + {file = "argon2_cffi-20.1.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:05a8ac07c7026542377e38389638a8a1e9b78f1cd8439cd7493b39f08dd75fbf"}, + {file = "argon2_cffi-20.1.0-cp27-cp27m-win32.whl", hash = "sha256:0bf066bc049332489bb2d75f69216416329d9dc65deee127152caeb16e5ce7d5"}, + {file = "argon2_cffi-20.1.0-cp27-cp27m-win_amd64.whl", hash = "sha256:57358570592c46c420300ec94f2ff3b32cbccd10d38bdc12dc6979c4a8484fbc"}, + {file = "argon2_cffi-20.1.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:7d455c802727710e9dfa69b74ccaab04568386ca17b0ad36350b622cd34606fe"}, + {file = "argon2_cffi-20.1.0-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:b160416adc0f012fb1f12588a5e6954889510f82f698e23ed4f4fa57f12a0647"}, + {file = "argon2_cffi-20.1.0-cp35-cp35m-win32.whl", hash = "sha256:9bee3212ba4f560af397b6d7146848c32a800652301843df06b9e8f68f0f7361"}, + {file = "argon2_cffi-20.1.0-cp35-cp35m-win_amd64.whl", hash = "sha256:392c3c2ef91d12da510cfb6f9bae52512a4552573a9e27600bdb800e05905d2b"}, + {file = "argon2_cffi-20.1.0-cp36-cp36m-win32.whl", hash = "sha256:ba7209b608945b889457f949cc04c8e762bed4fe3fec88ae9a6b7765ae82e496"}, + {file = "argon2_cffi-20.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:da7f0445b71db6d3a72462e04f36544b0de871289b0bc8a7cc87c0f5ec7079fa"}, + {file = "argon2_cffi-20.1.0-cp37-abi3-macosx_10_6_intel.whl", hash = "sha256:cc0e028b209a5483b6846053d5fd7165f460a1f14774d79e632e75e7ae64b82b"}, + {file = "argon2_cffi-20.1.0-cp37-cp37m-win32.whl", hash = "sha256:18dee20e25e4be86680b178b35ccfc5d495ebd5792cd00781548d50880fee5c5"}, + {file = "argon2_cffi-20.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:6678bb047373f52bcff02db8afab0d2a77d83bde61cfecea7c5c62e2335cb203"}, + {file = "argon2_cffi-20.1.0-cp38-cp38-win32.whl", hash = "sha256:77e909cc756ef81d6abb60524d259d959bab384832f0c651ed7dcb6e5ccdbb78"}, + {file = "argon2_cffi-20.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:9dfd5197852530294ecb5795c97a823839258dfd5eb9420233c7cfedec2058f2"}, + {file = "argon2_cffi-20.1.0-cp39-cp39-win32.whl", hash = "sha256:e2db6e85c057c16d0bd3b4d2b04f270a7467c147381e8fd73cbbe5bc719832be"}, + {file = "argon2_cffi-20.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:8a84934bd818e14a17943de8099d41160da4a336bcc699bb4c394bbb9b94bd32"}, +] +async-generator = [ + {file = "async_generator-1.10-py3-none-any.whl", hash = "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b"}, + {file = "async_generator-1.10.tar.gz", hash = "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"}, +] atomicwrites = [ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, @@ -351,9 +1133,60 @@ attrs = [ {file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"}, {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"}, ] +babel = [ + {file = "Babel-2.9.0-py2.py3-none-any.whl", hash = "sha256:9d35c22fcc79893c3ecc85ac4a56cde1ecf3f19c540bba0922308a6c06ca6fa5"}, + {file = "Babel-2.9.0.tar.gz", hash = "sha256:da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05"}, +] +backcall = [ + {file = "backcall-0.2.0-py2.py3-none-any.whl", hash = "sha256:fbbce6a29f263178a1f7915c1940bde0ec2b2a967566fe1c65c1dfb7422bd255"}, + {file = "backcall-0.2.0.tar.gz", hash = "sha256:5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"}, +] black = [ {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"}, ] +bleach = [ + {file = "bleach-3.3.0-py2.py3-none-any.whl", hash = "sha256:6123ddc1052673e52bab52cdc955bcb57a015264a1c57d37bea2f6b817af0125"}, + {file = "bleach-3.3.0.tar.gz", hash = "sha256:98b3170739e5e83dd9dc19633f074727ad848cbedb6026708c8ac2d3b697a433"}, +] +cffi = [ + {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, + {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, + {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, + {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, + {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, + {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, + {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, + {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, + {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, + {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, + {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, + {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, + {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, + {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, + {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, + {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, + {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, + {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, + {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, + {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, + {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, + {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, + {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, + {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, + {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, +] click = [ {file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"}, {file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"}, @@ -362,20 +1195,196 @@ colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] +cycler = [ + {file = "cycler-0.10.0-py2.py3-none-any.whl", hash = "sha256:1d8a5ae1ff6c5cf9b93e8811e581232ad8920aeec647c37316ceac982b08cb2d"}, + {file = "cycler-0.10.0.tar.gz", hash = "sha256:cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"}, +] +decorator = [ + {file = "decorator-4.4.2-py2.py3-none-any.whl", hash = "sha256:41fa54c2a0cc4ba648be4fd43cff00aedf5b9465c9bf18d64325bc225f08f760"}, + {file = "decorator-4.4.2.tar.gz", hash = "sha256:e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7"}, +] +defusedxml = [ + {file = "defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"}, + {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"}, +] +entrypoints = [ + {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"}, + {file = "entrypoints-0.3.tar.gz", hash = "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"}, +] +idna = [ + {file = "idna-3.1-py3-none-any.whl", hash = "sha256:5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16"}, + {file = "idna-3.1.tar.gz", hash = "sha256:c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"}, +] importlib-metadata = [ {file = "importlib_metadata-3.7.2-py3-none-any.whl", hash = "sha256:407d13f55dc6f2a844e62325d18ad7019a436c4bfcaee34cda35f2be6e7c3e34"}, {file = "importlib_metadata-3.7.2.tar.gz", hash = "sha256:18d5ff601069f98d5d605b6a4b50c18a34811d655c55548adc833e687289acde"}, ] +ipykernel = [ + {file = "ipykernel-5.5.0-py3-none-any.whl", hash = "sha256:efd07253b54d84d26e0878d268c8c3a41582a18750da633c2febfd2ece0d467d"}, + {file = "ipykernel-5.5.0.tar.gz", hash = "sha256:98321abefdf0505fb3dc7601f60fc4087364d394bd8fad53107eb1adee9ff475"}, +] +ipython = [ + {file = "ipython-7.21.0-py3-none-any.whl", hash = "sha256:34207ffb2f653bced2bc8e3756c1db86e7d93e44ed049daae9814fed66d408ec"}, + {file = "ipython-7.21.0.tar.gz", hash = "sha256:04323f72d5b85b606330b6d7e2dc8d2683ad46c3905e955aa96ecc7a99388e70"}, +] +ipython-genutils = [ + {file = "ipython_genutils-0.2.0-py2.py3-none-any.whl", hash = "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8"}, + {file = "ipython_genutils-0.2.0.tar.gz", hash = "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"}, +] +jedi = [ + {file = "jedi-0.18.0-py2.py3-none-any.whl", hash = "sha256:18456d83f65f400ab0c2d3319e48520420ef43b23a086fdc05dff34132f0fb93"}, + {file = "jedi-0.18.0.tar.gz", hash = "sha256:92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707"}, +] +jinja2 = [ + {file = "Jinja2-2.11.3-py2.py3-none-any.whl", hash = "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419"}, + {file = "Jinja2-2.11.3.tar.gz", hash = "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"}, +] joblib = [ {file = "joblib-1.0.1-py3-none-any.whl", hash = "sha256:feeb1ec69c4d45129954f1b7034954241eedfd6ba39b5e9e4b6883be3332d5e5"}, {file = "joblib-1.0.1.tar.gz", hash = "sha256:9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7"}, ] +json5 = [ + {file = "json5-0.9.5-py2.py3-none-any.whl", hash = "sha256:af1a1b9a2850c7f62c23fde18be4749b3599fd302f494eebf957e2ada6b9e42c"}, + {file = "json5-0.9.5.tar.gz", hash = "sha256:703cfee540790576b56a92e1c6aaa6c4b0d98971dc358ead83812aa4d06bdb96"}, +] +jsonschema = [ + {file = "jsonschema-3.2.0-py2.py3-none-any.whl", hash = "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163"}, + {file = "jsonschema-3.2.0.tar.gz", hash = "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"}, +] +jupyter-client = [ + {file = "jupyter_client-6.1.11-py3-none-any.whl", hash = "sha256:5eaaa41df449167ebba5e1cf6ca9b31f7fd4f71625069836e2e4fee07fe3cb13"}, + {file = "jupyter_client-6.1.11.tar.gz", hash = "sha256:649ca3aca1e28f27d73ef15868a7c7f10d6e70f761514582accec3ca6bb13085"}, +] +jupyter-core = [ + {file = "jupyter_core-4.7.1-py3-none-any.whl", hash = "sha256:8c6c0cac5c1b563622ad49321d5ec47017bd18b94facb381c6973a0486395f8e"}, + {file = "jupyter_core-4.7.1.tar.gz", hash = "sha256:79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4"}, +] +jupyter-packaging = [ + {file = "jupyter-packaging-0.7.12.tar.gz", hash = "sha256:b140325771881a7df7b7f2d14997b619063fe75ae756b9025852e4346000bbb8"}, + {file = "jupyter_packaging-0.7.12-py2.py3-none-any.whl", hash = "sha256:e36efa5edd52b302f0b784ff2a4d1f2cd50f7058af331151315e98b73f947b8d"}, +] +jupyter-server = [ + {file = "jupyter_server-1.4.1-py3-none-any.whl", hash = "sha256:af518ce295bfaa0d5c05031f963bdcfcd2ab156cb2223c0a70665219aed338da"}, + {file = "jupyter_server-1.4.1.tar.gz", hash = "sha256:b0126f237f679533eec46244cfc66d61e3a1f8ec0fad2d47352fa19d3e754e47"}, +] +jupyterlab = [ + {file = "jupyterlab-3.0.10-py3-none-any.whl", hash = "sha256:971e863415742b66cf46bcc5d22aaafaa0e8da177149b8f50c6cc04772fe2c53"}, + {file = "jupyterlab-3.0.10.tar.gz", hash = "sha256:fdc6020d81e8888755ac4b30a08a89520c210d2eda400cfea0c0972d2591cfec"}, +] +jupyterlab-pygments = [ + {file = "jupyterlab_pygments-0.1.2-py2.py3-none-any.whl", hash = "sha256:abfb880fd1561987efaefcb2d2ac75145d2a5d0139b1876d5be806e32f630008"}, + {file = "jupyterlab_pygments-0.1.2.tar.gz", hash = "sha256:cfcda0873626150932f438eccf0f8bf22bfa92345b814890ab360d666b254146"}, +] +jupyterlab-server = [ + {file = "jupyterlab_server-2.3.0-py3-none-any.whl", hash = "sha256:653cb811739e59f2f6998f659b4635a90c110a128e0245ce27dc3fe02c46543a"}, + {file = "jupyterlab_server-2.3.0.tar.gz", hash = "sha256:e7a0245aa3de23a1803de2eff401e4ca4594538d9f59806134f30419a6d8b6a3"}, +] +kiwisolver = [ + {file = "kiwisolver-1.3.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:fd34fbbfbc40628200730bc1febe30631347103fc8d3d4fa012c21ab9c11eca9"}, + {file = "kiwisolver-1.3.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:d3155d828dec1d43283bd24d3d3e0d9c7c350cdfcc0bd06c0ad1209c1bbc36d0"}, + {file = "kiwisolver-1.3.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5a7a7dbff17e66fac9142ae2ecafb719393aaee6a3768c9de2fd425c63b53e21"}, + {file = "kiwisolver-1.3.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:f8d6f8db88049a699817fd9178782867bf22283e3813064302ac59f61d95be05"}, + {file = "kiwisolver-1.3.1-cp36-cp36m-manylinux2014_ppc64le.whl", hash = "sha256:5f6ccd3dd0b9739edcf407514016108e2280769c73a85b9e59aa390046dbf08b"}, + {file = "kiwisolver-1.3.1-cp36-cp36m-win32.whl", hash = "sha256:225e2e18f271e0ed8157d7f4518ffbf99b9450fca398d561eb5c4a87d0986dd9"}, + {file = "kiwisolver-1.3.1-cp36-cp36m-win_amd64.whl", hash = "sha256:cf8b574c7b9aa060c62116d4181f3a1a4e821b2ec5cbfe3775809474113748d4"}, + {file = "kiwisolver-1.3.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:232c9e11fd7ac3a470d65cd67e4359eee155ec57e822e5220322d7b2ac84fbf0"}, + {file = "kiwisolver-1.3.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:b38694dcdac990a743aa654037ff1188c7a9801ac3ccc548d3341014bc5ca278"}, + {file = "kiwisolver-1.3.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ca3820eb7f7faf7f0aa88de0e54681bddcb46e485beb844fcecbcd1c8bd01689"}, + {file = "kiwisolver-1.3.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:c8fd0f1ae9d92b42854b2979024d7597685ce4ada367172ed7c09edf2cef9cb8"}, + {file = "kiwisolver-1.3.1-cp37-cp37m-manylinux2014_ppc64le.whl", hash = "sha256:1e1bc12fb773a7b2ffdeb8380609f4f8064777877b2225dec3da711b421fda31"}, + {file = "kiwisolver-1.3.1-cp37-cp37m-win32.whl", hash = "sha256:72c99e39d005b793fb7d3d4e660aed6b6281b502e8c1eaf8ee8346023c8e03bc"}, + {file = "kiwisolver-1.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:8be8d84b7d4f2ba4ffff3665bcd0211318aa632395a1a41553250484a871d454"}, + {file = "kiwisolver-1.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:31dfd2ac56edc0ff9ac295193eeaea1c0c923c0355bf948fbd99ed6018010b72"}, + {file = "kiwisolver-1.3.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:563c649cfdef27d081c84e72a03b48ea9408c16657500c312575ae9d9f7bc1c3"}, + {file = "kiwisolver-1.3.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:78751b33595f7f9511952e7e60ce858c6d64db2e062afb325985ddbd34b5c131"}, + {file = "kiwisolver-1.3.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:a357fd4f15ee49b4a98b44ec23a34a95f1e00292a139d6015c11f55774ef10de"}, + {file = "kiwisolver-1.3.1-cp38-cp38-manylinux2014_ppc64le.whl", hash = "sha256:5989db3b3b34b76c09253deeaf7fbc2707616f130e166996606c284395da3f18"}, + {file = "kiwisolver-1.3.1-cp38-cp38-win32.whl", hash = "sha256:c08e95114951dc2090c4a630c2385bef681cacf12636fb0241accdc6b303fd81"}, + {file = "kiwisolver-1.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:44a62e24d9b01ba94ae7a4a6c3fb215dc4af1dde817e7498d901e229aaf50e4e"}, + {file = "kiwisolver-1.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:50af681a36b2a1dee1d3c169ade9fdc59207d3c31e522519181e12f1b3ba7000"}, + {file = "kiwisolver-1.3.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:a53d27d0c2a0ebd07e395e56a1fbdf75ffedc4a05943daf472af163413ce9598"}, + {file = "kiwisolver-1.3.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:834ee27348c4aefc20b479335fd422a2c69db55f7d9ab61721ac8cd83eb78882"}, + {file = "kiwisolver-1.3.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:5c3e6455341008a054cccee8c5d24481bcfe1acdbc9add30aa95798e95c65621"}, + {file = "kiwisolver-1.3.1-cp39-cp39-manylinux2014_ppc64le.whl", hash = "sha256:acef3d59d47dd85ecf909c359d0fd2c81ed33bdff70216d3956b463e12c38a54"}, + {file = "kiwisolver-1.3.1-cp39-cp39-win32.whl", hash = "sha256:c5518d51a0735b1e6cee1fdce66359f8d2b59c3ca85dc2b0813a8aa86818a030"}, + {file = "kiwisolver-1.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:b9edd0110a77fc321ab090aaa1cfcaba1d8499850a12848b81be2222eab648f6"}, + {file = "kiwisolver-1.3.1-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0cd53f403202159b44528498de18f9285b04482bab2a6fc3f5dd8dbb9352e30d"}, + {file = "kiwisolver-1.3.1-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:33449715e0101e4d34f64990352bce4095c8bf13bed1b390773fc0a7295967b3"}, + {file = "kiwisolver-1.3.1-pp36-pypy36_pp73-win32.whl", hash = "sha256:401a2e9afa8588589775fe34fc22d918ae839aaaf0c0e96441c0fdbce6d8ebe6"}, + {file = "kiwisolver-1.3.1.tar.gz", hash = "sha256:950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"}, +] lightgbm = [ {file = "lightgbm-3.1.1-py2.py3-none-macosx_10_13_x86_64.macosx_10_14_x86_64.macosx_10_15_x86_64.whl", hash = "sha256:515cd3bc2b7b61663ff61401a2c31eedb43e3dbd49b8479a25acfa4dbbbfd985"}, {file = "lightgbm-3.1.1-py2.py3-none-manylinux1_x86_64.whl", hash = "sha256:9e32c1c7b00cf41b702f0a3225795cc709d72437b38f76ab41ab56ee5baea480"}, {file = "lightgbm-3.1.1-py2.py3-none-win_amd64.whl", hash = "sha256:dbc4d3105bd176d395c6ff5f5f65351ce9bc2ad60585c60f4829ad9f6e814807"}, {file = "lightgbm-3.1.1.tar.gz", hash = "sha256:babece2e3613e97748a67ed45387bb0e984bdb1f4126e39f010fbfe7503c7b20"}, ] +markupsafe = [ + {file = "MarkupSafe-1.1.1-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win32.whl", hash = "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win32.whl", hash = "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win_amd64.whl", hash = "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, + {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, +] +matplotlib = [ + {file = "matplotlib-3.3.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:672960dd114e342b7c610bf32fb99d14227f29919894388b41553217457ba7ef"}, + {file = "matplotlib-3.3.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:7c155437ae4fd366e2700e2716564d1787700687443de46bcb895fe0f84b761d"}, + {file = "matplotlib-3.3.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:a17f0a10604fac7627ec82820439e7db611722e80c408a726cd00d8c974c2fb3"}, + {file = "matplotlib-3.3.4-cp36-cp36m-win32.whl", hash = "sha256:215e2a30a2090221a9481db58b770ce56b8ef46f13224ae33afe221b14b24dc1"}, + {file = "matplotlib-3.3.4-cp36-cp36m-win_amd64.whl", hash = "sha256:348e6032f666ffd151b323342f9278b16b95d4a75dfacae84a11d2829a7816ae"}, + {file = "matplotlib-3.3.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:94bdd1d55c20e764d8aea9d471d2ae7a7b2c84445e0fa463f02e20f9730783e1"}, + {file = "matplotlib-3.3.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:a1acb72f095f1d58ecc2538ed1b8bca0b57df313b13db36ed34b8cdf1868e674"}, + {file = "matplotlib-3.3.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:46b1a60a04e6d884f0250d5cc8dc7bd21a9a96c584a7acdaab44698a44710bab"}, + {file = "matplotlib-3.3.4-cp37-cp37m-win32.whl", hash = "sha256:ed4a9e6dcacba56b17a0a9ac22ae2c72a35b7f0ef0693aa68574f0b2df607a89"}, + {file = "matplotlib-3.3.4-cp37-cp37m-win_amd64.whl", hash = "sha256:c24c05f645aef776e8b8931cb81e0f1632d229b42b6d216e30836e2e145a2b40"}, + {file = "matplotlib-3.3.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7310e353a4a35477c7f032409966920197d7df3e757c7624fd842f3eeb307d3d"}, + {file = "matplotlib-3.3.4-cp38-cp38-manylinux1_i686.whl", hash = "sha256:451cc89cb33d6652c509fc6b588dc51c41d7246afdcc29b8624e256b7663ed1f"}, + {file = "matplotlib-3.3.4-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:3d2eb9c1cc254d0ffa90bc96fde4b6005d09c2228f99dfd493a4219c1af99644"}, + {file = "matplotlib-3.3.4-cp38-cp38-win32.whl", hash = "sha256:e15fa23d844d54e7b3b7243afd53b7567ee71c721f592deb0727ee85e668f96a"}, + {file = "matplotlib-3.3.4-cp38-cp38-win_amd64.whl", hash = "sha256:1de0bb6cbfe460725f0e97b88daa8643bcf9571c18ba90bb8e41432aaeca91d6"}, + {file = "matplotlib-3.3.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f44149a0ef5b4991aaef12a93b8e8d66d6412e762745fea1faa61d98524e0ba9"}, + {file = "matplotlib-3.3.4-cp39-cp39-manylinux1_i686.whl", hash = "sha256:746a1df55749629e26af7f977ea426817ca9370ad1569436608dc48d1069b87c"}, + {file = "matplotlib-3.3.4-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:5f571b92a536206f7958f7cb2d367ff6c9a1fa8229dc35020006e4cdd1ca0acd"}, + {file = "matplotlib-3.3.4-cp39-cp39-win32.whl", hash = "sha256:9265ae0fb35e29f9b8cc86c2ab0a2e3dcddc4dd9de4b85bf26c0f63fe5c1c2ca"}, + {file = "matplotlib-3.3.4-cp39-cp39-win_amd64.whl", hash = "sha256:9a79e5dd7bb797aa611048f5b70588b23c5be05b63eefd8a0d152ac77c4243db"}, + {file = "matplotlib-3.3.4-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:1e850163579a8936eede29fad41e202b25923a0a8d5ffd08ce50fc0a97dcdc93"}, + {file = "matplotlib-3.3.4-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:d738acfdfb65da34c91acbdb56abed46803db39af259b7f194dc96920360dbe4"}, + {file = "matplotlib-3.3.4-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:aa49571d8030ad0b9ac39708ee77bd2a22f87815e12bdee52ecaffece9313ed8"}, + {file = "matplotlib-3.3.4-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:cf3a7e54eff792f0815dbbe9b85df2f13d739289c93d346925554f71d484be78"}, + {file = "matplotlib-3.3.4.tar.gz", hash = "sha256:3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0"}, +] +mistune = [ + {file = "mistune-0.8.4-py2.py3-none-any.whl", hash = "sha256:88a1051873018da288eee8538d476dffe1262495144b33ecb586c4ab266bb8d4"}, + {file = "mistune-0.8.4.tar.gz", hash = "sha256:59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"}, +] more-itertools = [ {file = "more-itertools-8.7.0.tar.gz", hash = "sha256:c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713"}, {file = "more_itertools-8.7.0-py3-none-any.whl", hash = "sha256:5652a9ac72209ed7df8d9c15daf4e1aa0e3d2ccd3c87f8265a0673cd9cbc9ced"}, @@ -384,6 +1393,30 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] +nbclassic = [ + {file = "nbclassic-0.2.6-py3-none-any.whl", hash = "sha256:0248333262d6f90c2fbe05aacb4f008f1d71b5250a9f737488e0a03cfa1c6ed5"}, + {file = "nbclassic-0.2.6.tar.gz", hash = "sha256:b649436ff85dc731ba8115deef089e5abbe827d7a6dccbad42c15b8d427104e8"}, +] +nbclient = [ + {file = "nbclient-0.5.3-py3-none-any.whl", hash = "sha256:e79437364a2376892b3f46bedbf9b444e5396cfb1bc366a472c37b48e9551500"}, + {file = "nbclient-0.5.3.tar.gz", hash = "sha256:db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c"}, +] +nbconvert = [ + {file = "nbconvert-6.0.7-py3-none-any.whl", hash = "sha256:39e9f977920b203baea0be67eea59f7b37a761caa542abe80f5897ce3cf6311d"}, + {file = "nbconvert-6.0.7.tar.gz", hash = "sha256:cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"}, +] +nbformat = [ + {file = "nbformat-5.1.2-py3-none-any.whl", hash = "sha256:3949fdc8f5fa0b1afca16fb307546e78494fa7a7bceff880df8168eafda0e7ac"}, + {file = "nbformat-5.1.2.tar.gz", hash = "sha256:1d223e64a18bfa7cdf2db2e9ba8a818312fc2a0701d2e910b58df66809385a56"}, +] +nest-asyncio = [ + {file = "nest_asyncio-1.5.1-py3-none-any.whl", hash = "sha256:76d6e972265063fe92a90b9cc4fb82616e07d586b346ed9d2c89a4187acea39c"}, + {file = "nest_asyncio-1.5.1.tar.gz", hash = "sha256:afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa"}, +] +notebook = [ + {file = "notebook-6.2.0-py3-none-any.whl", hash = "sha256:25ad93c982b623441b491e693ef400598d1a46cdf11b8c9c0b3be6c61ebbb6cd"}, + {file = "notebook-6.2.0.tar.gz", hash = "sha256:0464b28e18e7a06cec37e6177546c2322739be07962dd13bf712bcb88361f013"}, +] numpy = [ {file = "numpy-1.20.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ae61f02b84a0211abb56462a3b6cd1e7ec39d466d3160eb4e1da8bf6717cdbeb"}, {file = "numpy-1.20.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:65410c7f4398a0047eea5cca9b74009ea61178efd78d1be9847fac1d6716ec1e"}, @@ -432,22 +1465,95 @@ pandas = [ {file = "pandas-1.2.3-cp39-cp39-win_amd64.whl", hash = "sha256:09761bf5f8c741d47d4b8b9073288de1be39bbfccc281d70b889ade12b2aad29"}, {file = "pandas-1.2.3.tar.gz", hash = "sha256:df6f10b85aef7a5bb25259ad651ad1cc1d6bb09000595cab47e718cbac250b1d"}, ] +pandocfilters = [ + {file = "pandocfilters-1.4.3.tar.gz", hash = "sha256:bc63fbb50534b4b1f8ebe1860889289e8af94a23bff7445259592df25a3906eb"}, +] +parso = [ + {file = "parso-0.8.1-py2.py3-none-any.whl", hash = "sha256:15b00182f472319383252c18d5913b69269590616c947747bc50bf4ac768f410"}, + {file = "parso-0.8.1.tar.gz", hash = "sha256:8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e"}, +] pathspec = [ {file = "pathspec-0.8.1-py2.py3-none-any.whl", hash = "sha256:aa0cb481c4041bf52ffa7b0d8fa6cd3e88a2ca4879c533c9153882ee2556790d"}, {file = "pathspec-0.8.1.tar.gz", hash = "sha256:86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd"}, ] +pexpect = [ + {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, + {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, +] +pickleshare = [ + {file = "pickleshare-0.7.5-py2.py3-none-any.whl", hash = "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"}, + {file = "pickleshare-0.7.5.tar.gz", hash = "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"}, +] +pillow = [ + {file = "Pillow-8.1.2-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:5cf03b9534aca63b192856aa601c68d0764810857786ea5da652581f3a44c2b0"}, + {file = "Pillow-8.1.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:f91b50ad88048d795c0ad004abbe1390aa1882073b1dca10bfd55d0b8cf18ec5"}, + {file = "Pillow-8.1.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5762ebb4436f46b566fc6351d67a9b5386b5e5de4e58fdaa18a1c83e0e20f1a8"}, + {file = "Pillow-8.1.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:e2cd8ac157c1e5ae88b6dd790648ee5d2777e76f1e5c7d184eaddb2938594f34"}, + {file = "Pillow-8.1.2-cp36-cp36m-win32.whl", hash = "sha256:72027ebf682abc9bafd93b43edc44279f641e8996fb2945104471419113cfc71"}, + {file = "Pillow-8.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:d1d6bca39bb6dd94fba23cdb3eeaea5e30c7717c5343004d900e2a63b132c341"}, + {file = "Pillow-8.1.2-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:90882c6f084ef68b71bba190209a734bf90abb82ab5e8f64444c71d5974008c6"}, + {file = "Pillow-8.1.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:89e4c757a91b8c55d97c91fa09c69b3677c227b942fa749e9a66eef602f59c28"}, + {file = "Pillow-8.1.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:8c4e32218c764bc27fe49b7328195579581aa419920edcc321c4cb877c65258d"}, + {file = "Pillow-8.1.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a01da2c266d9868c4f91a9c6faf47a251f23b9a862dce81d2ff583135206f5be"}, + {file = "Pillow-8.1.2-cp37-cp37m-win32.whl", hash = "sha256:30d33a1a6400132e6f521640dd3f64578ac9bfb79a619416d7e8802b4ce1dd55"}, + {file = "Pillow-8.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:71b01ee69e7df527439d7752a2ce8fb89e19a32df484a308eca3e81f673d3a03"}, + {file = "Pillow-8.1.2-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:5a2d957eb4aba9d48170b8fe6538ec1fbc2119ffe6373782c03d8acad3323f2e"}, + {file = "Pillow-8.1.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:87f42c976f91ca2fc21a3293e25bd3cd895918597db1b95b93cbd949f7d019ce"}, + {file = "Pillow-8.1.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:15306d71a1e96d7e271fd2a0737038b5a92ca2978d2e38b6ced7966583e3d5af"}, + {file = "Pillow-8.1.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:71f31ee4df3d5e0b366dd362007740106d3210fb6a56ec4b581a5324ba254f06"}, + {file = "Pillow-8.1.2-cp38-cp38-win32.whl", hash = "sha256:98afcac3205d31ab6a10c5006b0cf040d0026a68ec051edd3517b776c1d78b09"}, + {file = "Pillow-8.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:328240f7dddf77783e72d5ed79899a6b48bc6681f8d1f6001f55933cb4905060"}, + {file = "Pillow-8.1.2-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:bead24c0ae3f1f6afcb915a057943ccf65fc755d11a1410a909c1fefb6c06ad1"}, + {file = "Pillow-8.1.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:81b3716cc9744ffdf76b39afb6247eae754186838cedad0b0ac63b2571253fe6"}, + {file = "Pillow-8.1.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:63cd413ac52ee3f67057223d363f4f82ce966e64906aea046daf46695e3c8238"}, + {file = "Pillow-8.1.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:8565355a29655b28fdc2c666fd9a3890fe5edc6639d128814fafecfae2d70910"}, + {file = "Pillow-8.1.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1940fc4d361f9cc7e558d6f56ff38d7351b53052fd7911f4b60cd7bc091ea3b1"}, + {file = "Pillow-8.1.2-cp39-cp39-win32.whl", hash = "sha256:46c2bcf8e1e75d154e78417b3e3c64e96def738c2a25435e74909e127a8cba5e"}, + {file = "Pillow-8.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:aeab4cd016e11e7aa5cfc49dcff8e51561fa64818a0be86efa82c7038e9369d0"}, + {file = "Pillow-8.1.2-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:74cd9aa648ed6dd25e572453eb09b08817a1e3d9f8d1bd4d8403d99e42ea790b"}, + {file = "Pillow-8.1.2-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:e5739ae63636a52b706a0facec77b2b58e485637e1638202556156e424a02dc2"}, + {file = "Pillow-8.1.2-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:903293320efe2466c1ab3509a33d6b866dc850cfd0c5d9cc92632014cec185fb"}, + {file = "Pillow-8.1.2-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:5daba2b40782c1c5157a788ec4454067c6616f5a0c1b70e26ac326a880c2d328"}, + {file = "Pillow-8.1.2-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:1f93f2fe211f1ef75e6f589327f4d4f8545d5c8e826231b042b483d8383e8a7c"}, + {file = "Pillow-8.1.2-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:6efac40344d8f668b6c4533ae02a48d52fd852ef0654cc6f19f6ac146399c733"}, + {file = "Pillow-8.1.2-pp37-pypy37_pp73-win32.whl", hash = "sha256:f36c3ff63d6fc509ce599a2f5b0d0732189eed653420e7294c039d342c6e204a"}, + {file = "Pillow-8.1.2.tar.gz", hash = "sha256:b07c660e014852d98a00a91adfbe25033898a9d90a8f39beb2437d22a203fc44"}, +] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] +prometheus-client = [ + {file = "prometheus_client-0.9.0-py2.py3-none-any.whl", hash = "sha256:b08c34c328e1bf5961f0b4352668e6c8f145b4a087e09b7296ef62cbe4693d35"}, + {file = "prometheus_client-0.9.0.tar.gz", hash = "sha256:9da7b32f02439d8c04f7777021c304ed51d9ec180604700c1ba72a4d44dceb03"}, +] +prompt-toolkit = [ + {file = "prompt_toolkit-3.0.16-py3-none-any.whl", hash = "sha256:62c811e46bd09130fb11ab759012a4ae385ce4fb2073442d1898867a824183bd"}, + {file = "prompt_toolkit-3.0.16.tar.gz", hash = "sha256:0fa02fa80363844a4ab4b8d6891f62dd0645ba672723130423ca4037b80c1974"}, +] +ptyprocess = [ + {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, + {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"}, +] py = [ {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"}, {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"}, ] +pycparser = [ + {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, + {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, +] +pygments = [ + {file = "Pygments-2.8.1-py3-none-any.whl", hash = "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8"}, + {file = "Pygments-2.8.1.tar.gz", hash = "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94"}, +] pyparsing = [ {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] +pyrsistent = [ + {file = "pyrsistent-0.17.3.tar.gz", hash = "sha256:2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"}, +] pytest = [ {file = "pytest-5.4.3-py3-none-any.whl", hash = "sha256:5c0db86b698e8f170ba4582a492248919255fcd4c79b1ee64ace34301fb589a1"}, {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"}, @@ -460,6 +1566,64 @@ pytz = [ {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, {file = "pytz-2021.1.tar.gz", hash = "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da"}, ] +pywin32 = [ + {file = "pywin32-300-cp35-cp35m-win32.whl", hash = "sha256:1c204a81daed2089e55d11eefa4826c05e604d27fe2be40b6bf8db7b6a39da63"}, + {file = "pywin32-300-cp35-cp35m-win_amd64.whl", hash = "sha256:350c5644775736351b77ba68da09a39c760d75d2467ecec37bd3c36a94fbed64"}, + {file = "pywin32-300-cp36-cp36m-win32.whl", hash = "sha256:a3b4c48c852d4107e8a8ec980b76c94ce596ea66d60f7a697582ea9dce7e0db7"}, + {file = "pywin32-300-cp36-cp36m-win_amd64.whl", hash = "sha256:27a30b887afbf05a9cbb05e3ffd43104a9b71ce292f64a635389dbad0ed1cd85"}, + {file = "pywin32-300-cp37-cp37m-win32.whl", hash = "sha256:d7e8c7efc221f10d6400c19c32a031add1c4a58733298c09216f57b4fde110dc"}, + {file = "pywin32-300-cp37-cp37m-win_amd64.whl", hash = "sha256:8151e4d7a19262d6694162d6da85d99a16f8b908949797fd99c83a0bfaf5807d"}, + {file = "pywin32-300-cp38-cp38-win32.whl", hash = "sha256:fbb3b1b0fbd0b4fc2a3d1d81fe0783e30062c1abed1d17c32b7879d55858cfae"}, + {file = "pywin32-300-cp38-cp38-win_amd64.whl", hash = "sha256:60a8fa361091b2eea27f15718f8eb7f9297e8d51b54dbc4f55f3d238093d5190"}, + {file = "pywin32-300-cp39-cp39-win32.whl", hash = "sha256:638b68eea5cfc8def537e43e9554747f8dee786b090e47ead94bfdafdb0f2f50"}, + {file = "pywin32-300-cp39-cp39-win_amd64.whl", hash = "sha256:b1609ce9bd5c411b81f941b246d683d6508992093203d4eb7f278f4ed1085c3f"}, +] +pywinpty = [ + {file = "pywinpty-0.5.7-cp27-cp27m-win32.whl", hash = "sha256:b358cb552c0f6baf790de375fab96524a0498c9df83489b8c23f7f08795e966b"}, + {file = "pywinpty-0.5.7-cp27-cp27m-win_amd64.whl", hash = "sha256:1e525a4de05e72016a7af27836d512db67d06a015aeaf2fa0180f8e6a039b3c2"}, + {file = "pywinpty-0.5.7-cp35-cp35m-win32.whl", hash = "sha256:2740eeeb59297593a0d3f762269b01d0285c1b829d6827445fcd348fb47f7e70"}, + {file = "pywinpty-0.5.7-cp35-cp35m-win_amd64.whl", hash = "sha256:33df97f79843b2b8b8bc5c7aaf54adec08cc1bae94ee99dfb1a93c7a67704d95"}, + {file = "pywinpty-0.5.7-cp36-cp36m-win32.whl", hash = "sha256:e854211df55d107f0edfda8a80b39dfc87015bef52a8fe6594eb379240d81df2"}, + {file = "pywinpty-0.5.7-cp36-cp36m-win_amd64.whl", hash = "sha256:dbd838de92de1d4ebf0dce9d4d5e4fc38d0b7b1de837947a18b57a882f219139"}, + {file = "pywinpty-0.5.7-cp37-cp37m-win32.whl", hash = "sha256:5fb2c6c6819491b216f78acc2c521b9df21e0f53b9a399d58a5c151a3c4e2a2d"}, + {file = "pywinpty-0.5.7-cp37-cp37m-win_amd64.whl", hash = "sha256:dd22c8efacf600730abe4a46c1388355ce0d4ab75dc79b15d23a7bd87bf05b48"}, + {file = "pywinpty-0.5.7-cp38-cp38-win_amd64.whl", hash = "sha256:8fc5019ff3efb4f13708bd3b5ad327589c1a554cb516d792527361525a7cb78c"}, + {file = "pywinpty-0.5.7.tar.gz", hash = "sha256:2d7e9c881638a72ffdca3f5417dd1563b60f603e1b43e5895674c2a1b01f95a0"}, +] +pyzmq = [ + {file = "pyzmq-22.0.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c0cde362075ee8f3d2b0353b283e203c2200243b5a15d5c5c03b78112a17e7d4"}, + {file = "pyzmq-22.0.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:ff1ea14075bbddd6f29bf6beb8a46d0db779bcec6b9820909584081ec119f8fd"}, + {file = "pyzmq-22.0.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:26380487eae4034d6c2a3fb8d0f2dff6dd0d9dd711894e8d25aa2d1938950a33"}, + {file = "pyzmq-22.0.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:3e29f9cf85a40d521d048b55c63f59d6c772ac1c4bf51cdfc23b62a62e377c33"}, + {file = "pyzmq-22.0.3-cp36-cp36m-win32.whl", hash = "sha256:4f34a173f813b38b83f058e267e30465ed64b22cd0cf6bad21148d3fa718f9bb"}, + {file = "pyzmq-22.0.3-cp36-cp36m-win_amd64.whl", hash = "sha256:30df70f81fe210506aa354d7fd486a39b87d9f7f24c3d3f4f698ec5d96b8c084"}, + {file = "pyzmq-22.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7026f0353977431fc884abd4ac28268894bd1a780ba84bb266d470b0ec26d2ed"}, + {file = "pyzmq-22.0.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6d4163704201fff0f3ab0cd5d7a0ea1514ecfffd3926d62ec7e740a04d2012c7"}, + {file = "pyzmq-22.0.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:763c175294d861869f18eb42901d500eda7d3fa4565f160b3b2fd2678ea0ebab"}, + {file = "pyzmq-22.0.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:61e4bb6cd60caf1abcd796c3f48395e22c5b486eeca6f3a8797975c57d94b03e"}, + {file = "pyzmq-22.0.3-cp37-cp37m-win32.whl", hash = "sha256:b25e5d339550a850f7e919fe8cb4c8eabe4c917613db48dab3df19bfb9a28969"}, + {file = "pyzmq-22.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:3ef50d74469b03725d781a2a03c57537d86847ccde587130fe35caafea8f75c6"}, + {file = "pyzmq-22.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:60e63577b85055e4cc43892fecd877b86695ee3ef12d5d10a3c5d6e77a7cc1a3"}, + {file = "pyzmq-22.0.3-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:f5831eff6b125992ec65d973f5151c48003b6754030094723ac4c6e80a97c8c4"}, + {file = "pyzmq-22.0.3-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:9221783dacb419604d5345d0e097bddef4459a9a95322de6c306bf1d9896559f"}, + {file = "pyzmq-22.0.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:b62ea18c0458a65ccd5be90f276f7a5a3f26a6dea0066d948ce2fa896051420f"}, + {file = "pyzmq-22.0.3-cp38-cp38-win32.whl", hash = "sha256:81e7df0da456206201e226491aa1fc449da85328bf33bbeec2c03bb3a9f18324"}, + {file = "pyzmq-22.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:f52070871a0fd90a99130babf21f8af192304ec1e995bec2a9533efc21ea4452"}, + {file = "pyzmq-22.0.3-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:c5e29fe4678f97ce429f076a2a049a3d0b2660ada8f2c621e5dc9939426056dd"}, + {file = "pyzmq-22.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d18ddc6741b51f3985978f2fda57ddcdae359662d7a6b395bc8ff2292fca14bd"}, + {file = "pyzmq-22.0.3-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4231943514812dfb74f44eadcf85e8dd8cf302b4d0bce450ce1357cac88dbfdc"}, + {file = "pyzmq-22.0.3-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:23a74de4b43c05c3044aeba0d1f3970def8f916151a712a3ac1e5cd9c0bc2902"}, + {file = "pyzmq-22.0.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:532af3e6dddea62d9c49062ece5add998c9823c2419da943cf95589f56737de0"}, + {file = "pyzmq-22.0.3-cp39-cp39-win32.whl", hash = "sha256:33acd2b9790818b9d00526135acf12790649d8d34b2b04d64558b469c9d86820"}, + {file = "pyzmq-22.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:a558c5bc89d56d7253187dccc4e81b5bb0eac5ae9511eb4951910a1245d04622"}, + {file = "pyzmq-22.0.3-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:581787c62eaa0e0db6c5413cedc393ebbadac6ddfd22e1cf9a60da23c4f1a4b2"}, + {file = "pyzmq-22.0.3-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:38e3dca75d81bec4f2defa14b0a65b74545812bb519a8e89c8df96bbf4639356"}, + {file = "pyzmq-22.0.3-pp36-pypy36_pp73-win32.whl", hash = "sha256:2f971431aaebe0a8b54ac018e041c2f0b949a43745444e4dadcc80d0f0ef8457"}, + {file = "pyzmq-22.0.3-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:da7d4d4c778c86b60949d17531e60c54ed3726878de8a7f8a6d6e7f8cc8c3205"}, + {file = "pyzmq-22.0.3-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:13465c1ff969cab328bc92f7015ce3843f6e35f8871ad79d236e4fbc85dbe4cb"}, + {file = "pyzmq-22.0.3-pp37-pypy37_pp73-win32.whl", hash = "sha256:279cc9b51db48bec2db146f38e336049ac5a59e5f12fb3a8ad864e238c1c62e3"}, + {file = "pyzmq-22.0.3.tar.gz", hash = "sha256:f7f63ce127980d40f3e6a5fdb87abf17ce1a7c2bd8bf2c7560e1bbce8ab1f92d"}, +] regex = [ {file = "regex-2020.11.13-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:8b882a78c320478b12ff024e81dc7d43c1462aa4a3341c754ee65d857a521f85"}, {file = "regex-2020.11.13-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a63f1a07932c9686d2d416fb295ec2c01ab246e89b4d58e5fa468089cab44b70"}, @@ -503,6 +1667,10 @@ regex = [ {file = "regex-2020.11.13-cp39-cp39-win_amd64.whl", hash = "sha256:a15f64ae3a027b64496a71ab1f722355e570c3fac5ba2801cafce846bf5af01d"}, {file = "regex-2020.11.13.tar.gz", hash = "sha256:83d6b356e116ca119db8e7c6fc2983289d87b27b3fac238cfe5dca529d884562"}, ] +requests = [ + {file = "requests-2.15.1-py2.py3-none-any.whl", hash = "sha256:ff753b2196cd18b1bbeddc9dcd5c864056599f7a7d9a4fb5677e723efa2b7fb9"}, + {file = "requests-2.15.1.tar.gz", hash = "sha256:e5659b9315a0610505e050bb7190bf6fa2ccee1ac295f2b760ef9d8a03ebbb2e"}, +] scikit-learn = [ {file = "scikit-learn-0.24.1.tar.gz", hash = "sha256:a0334a1802e64d656022c3bfab56a73fbd6bf4b1298343f3688af2151810bbdf"}, {file = "scikit_learn-0.24.1-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:9bed8a1ef133c8e2f13966a542cb8125eac7f4b67dcd234197c827ba9c7dd3e0"}, @@ -555,10 +1723,26 @@ scipy = [ {file = "scipy-1.6.1-cp39-cp39-win_amd64.whl", hash = "sha256:a5193a098ae9f29af283dcf0041f762601faf2e595c0db1da929875b7570353f"}, {file = "scipy-1.6.1.tar.gz", hash = "sha256:c4fceb864890b6168e79b0e714c585dbe2fd4222768ee90bc1aa0f8218691b11"}, ] +send2trash = [ + {file = "Send2Trash-1.5.0-py3-none-any.whl", hash = "sha256:f1691922577b6fa12821234aeb57599d887c4900b9ca537948d2dac34aea888b"}, + {file = "Send2Trash-1.5.0.tar.gz", hash = "sha256:60001cc07d707fe247c94f74ca6ac0d3255aabcb930529690897ca2a39db28b2"}, +] six = [ {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, {file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"}, ] +sniffio = [ + {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, + {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, +] +terminado = [ + {file = "terminado-0.9.2-py3-none-any.whl", hash = "sha256:23a053e06b22711269563c8bb96b36a036a86be8b5353e85e804f89b84aaa23f"}, + {file = "terminado-0.9.2.tar.gz", hash = "sha256:89e6d94b19e4bc9dce0ffd908dfaf55cc78a9bf735934e915a4a96f65ac9704c"}, +] +testpath = [ + {file = "testpath-0.4.4-py2.py3-none-any.whl", hash = "sha256:bfcf9411ef4bf3db7579063e0546938b1edda3d69f4e1fb8756991f5951f85d4"}, + {file = "testpath-0.4.4.tar.gz", hash = "sha256:60e0a3261c149755f4399a1fff7d37523179a70fdc3abdf78de9fc2604aeec7e"}, +] threadpoolctl = [ {file = "threadpoolctl-2.1.0-py3-none-any.whl", hash = "sha256:38b74ca20ff3bb42caca8b00055111d74159ee95c4370882bbff2b93d24da725"}, {file = "threadpoolctl-2.1.0.tar.gz", hash = "sha256:ddc57c96a38beb63db45d6c159b5ab07b6bced12c45a1f07b2b92f272aebfa6b"}, @@ -567,6 +1751,53 @@ toml = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] +tornado = [ + {file = "tornado-6.1-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:d371e811d6b156d82aa5f9a4e08b58debf97c302a35714f6f45e35139c332e32"}, + {file = "tornado-6.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:0d321a39c36e5f2c4ff12b4ed58d41390460f798422c4504e09eb5678e09998c"}, + {file = "tornado-6.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9de9e5188a782be6b1ce866e8a51bc76a0fbaa0e16613823fc38e4fc2556ad05"}, + {file = "tornado-6.1-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:61b32d06ae8a036a6607805e6720ef00a3c98207038444ba7fd3d169cd998910"}, + {file = "tornado-6.1-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:3e63498f680547ed24d2c71e6497f24bca791aca2fe116dbc2bd0ac7f191691b"}, + {file = "tornado-6.1-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:6c77c9937962577a6a76917845d06af6ab9197702a42e1346d8ae2e76b5e3675"}, + {file = "tornado-6.1-cp35-cp35m-win32.whl", hash = "sha256:6286efab1ed6e74b7028327365cf7346b1d777d63ab30e21a0f4d5b275fc17d5"}, + {file = "tornado-6.1-cp35-cp35m-win_amd64.whl", hash = "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68"}, + {file = "tornado-6.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:0a00ff4561e2929a2c37ce706cb8233b7907e0cdc22eab98888aca5dd3775feb"}, + {file = "tornado-6.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:748290bf9112b581c525e6e6d3820621ff020ed95af6f17fedef416b27ed564c"}, + {file = "tornado-6.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:e385b637ac3acaae8022e7e47dfa7b83d3620e432e3ecb9a3f7f58f150e50921"}, + {file = "tornado-6.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:25ad220258349a12ae87ede08a7b04aca51237721f63b1808d39bdb4b2164558"}, + {file = "tornado-6.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:65d98939f1a2e74b58839f8c4dab3b6b3c1ce84972ae712be02845e65391ac7c"}, + {file = "tornado-6.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:e519d64089b0876c7b467274468709dadf11e41d65f63bba207e04217f47c085"}, + {file = "tornado-6.1-cp36-cp36m-win32.whl", hash = "sha256:b87936fd2c317b6ee08a5741ea06b9d11a6074ef4cc42e031bc6403f82a32575"}, + {file = "tornado-6.1-cp36-cp36m-win_amd64.whl", hash = "sha256:cc0ee35043162abbf717b7df924597ade8e5395e7b66d18270116f8745ceb795"}, + {file = "tornado-6.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7250a3fa399f08ec9cb3f7b1b987955d17e044f1ade821b32e5f435130250d7f"}, + {file = "tornado-6.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:ed3ad863b1b40cd1d4bd21e7498329ccaece75db5a5bf58cd3c9f130843e7102"}, + {file = "tornado-6.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:dcef026f608f678c118779cd6591c8af6e9b4155c44e0d1bc0c87c036fb8c8c4"}, + {file = "tornado-6.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:70dec29e8ac485dbf57481baee40781c63e381bebea080991893cd297742b8fd"}, + {file = "tornado-6.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:d3f7594930c423fd9f5d1a76bee85a2c36fd8b4b16921cae7e965f22575e9c01"}, + {file = "tornado-6.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:3447475585bae2e77ecb832fc0300c3695516a47d46cefa0528181a34c5b9d3d"}, + {file = "tornado-6.1-cp37-cp37m-win32.whl", hash = "sha256:e7229e60ac41a1202444497ddde70a48d33909e484f96eb0da9baf8dc68541df"}, + {file = "tornado-6.1-cp37-cp37m-win_amd64.whl", hash = "sha256:cb5ec8eead331e3bb4ce8066cf06d2dfef1bfb1b2a73082dfe8a161301b76e37"}, + {file = "tornado-6.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:20241b3cb4f425e971cb0a8e4ffc9b0a861530ae3c52f2b0434e6c1b57e9fd95"}, + {file = "tornado-6.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:c77da1263aa361938476f04c4b6c8916001b90b2c2fdd92d8d535e1af48fba5a"}, + {file = "tornado-6.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5"}, + {file = "tornado-6.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:1e8225a1070cd8eec59a996c43229fe8f95689cb16e552d130b9793cb570a288"}, + {file = "tornado-6.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:d14d30e7f46a0476efb0deb5b61343b1526f73ebb5ed84f23dc794bdb88f9d9f"}, + {file = "tornado-6.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8f959b26f2634a091bb42241c3ed8d3cedb506e7c27b8dd5c7b9f745318ddbb6"}, + {file = "tornado-6.1-cp38-cp38-win32.whl", hash = "sha256:34ca2dac9e4d7afb0bed4677512e36a52f09caa6fded70b4e3e1c89dbd92c326"}, + {file = "tornado-6.1-cp38-cp38-win_amd64.whl", hash = "sha256:6196a5c39286cc37c024cd78834fb9345e464525d8991c21e908cc046d1cc02c"}, + {file = "tornado-6.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f0ba29bafd8e7e22920567ce0d232c26d4d47c8b5cf4ed7b562b5db39fa199c5"}, + {file = "tornado-6.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:33892118b165401f291070100d6d09359ca74addda679b60390b09f8ef325ffe"}, + {file = "tornado-6.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7da13da6f985aab7f6f28debab00c67ff9cbacd588e8477034c0652ac141feea"}, + {file = "tornado-6.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:e0791ac58d91ac58f694d8d2957884df8e4e2f6687cdf367ef7eb7497f79eaa2"}, + {file = "tornado-6.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:66324e4e1beede9ac79e60f88de548da58b1f8ab4b2f1354d8375774f997e6c0"}, + {file = "tornado-6.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:a48900ecea1cbb71b8c71c620dee15b62f85f7c14189bdeee54966fbd9a0c5bd"}, + {file = "tornado-6.1-cp39-cp39-win32.whl", hash = "sha256:d3d20ea5782ba63ed13bc2b8c291a053c8d807a8fa927d941bd718468f7b950c"}, + {file = "tornado-6.1-cp39-cp39-win_amd64.whl", hash = "sha256:548430be2740e327b3fe0201abe471f314741efcb0067ec4f2d7dcfb4825f3e4"}, + {file = "tornado-6.1.tar.gz", hash = "sha256:33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791"}, +] +traitlets = [ + {file = "traitlets-5.0.5-py3-none-any.whl", hash = "sha256:69ff3f9d5351f31a7ad80443c2674b7099df13cc41fc5fa6e2f6d3b0330b0426"}, + {file = "traitlets-5.0.5.tar.gz", hash = "sha256:178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396"}, +] typed-ast = [ {file = "typed_ast-1.4.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:7703620125e4fb79b64aa52427ec192822e9f45d37d4b6625ab37ef403e1df70"}, {file = "typed_ast-1.4.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:c9aadc4924d4b5799112837b226160428524a9a45f830e0d0f184b19e4090487"}, @@ -608,6 +1839,10 @@ wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"}, ] +webencodings = [ + {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, + {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, +] zipp = [ {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, diff --git a/pyproject.toml b/pyproject.toml index a5f6f8f..5a5c706 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,10 +9,12 @@ python = "^3.7.1" scikit-learn = "^0.24.1" pandas = "^1.2.3" lightgbm = "^3.1.1" +matplotlib = "^3.3.4" [tool.poetry.dev-dependencies] pytest = "^5.2" black = "^20.8b1" +jupyterlab = "^3.0.10" [build-system] requires = ["poetry-core>=1.0.0"]
Drop index column ![image](https://user-images.githubusercontent.com/19265782/110742381-9822c000-8279-11eb-81c6-1517d5230a06.png) Hide lightgbm log ![image](https://user-images.githubusercontent.com/19265782/110742321-7fb2a580-8279-11eb-914e-717ee9e8783b.png)
2021-03-11T13:44:54
0.0
[]
[]
vllm-project/vllm
vllm-project__vllm-10134
073a4727282b00f3626d5fdf720bd19589db7b48
diff --git a/pyproject.toml b/pyproject.toml index bae8645502dea..db373a4b1dd02 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ files = [ "vllm/entrypoints", "vllm/core", "vllm/inputs", - "vllm/logging", + "vllm/logging_utils", "vllm/multimodal", "vllm/platforms", "vllm/transformers_utils", diff --git a/vllm/logger.py b/vllm/logger.py index d6fcda02a0fb3..80b9fcc59272d 100644 --- a/vllm/logger.py +++ b/vllm/logger.py @@ -24,7 +24,7 @@ DEFAULT_LOGGING_CONFIG = { "formatters": { "vllm": { - "class": "vllm.logging.NewLineFormatter", + "class": "vllm.logging_utils.NewLineFormatter", "datefmt": _DATE_FORMAT, "format": _FORMAT, }, diff --git a/vllm/logging/__init__.py b/vllm/logging/__init__.py deleted file mode 100644 index b9aec380776f3..0000000000000 --- a/vllm/logging/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from vllm.logging.formatter import NewLineFormatter - -__all__ = [ - "NewLineFormatter", -] diff --git a/vllm/logging_utils/__init__.py b/vllm/logging_utils/__init__.py new file mode 100644 index 0000000000000..576ccf78a8117 --- /dev/null +++ b/vllm/logging_utils/__init__.py @@ -0,0 +1,5 @@ +from vllm.logging_utils.formatter import NewLineFormatter + +__all__ = [ + "NewLineFormatter", +] diff --git a/vllm/logging/formatter.py b/vllm/logging_utils/formatter.py similarity index 100% rename from vllm/logging/formatter.py rename to vllm/logging_utils/formatter.py
[help wanted]: rename vllm/logging module to avoid shadowing builtin logging module ### Anything you want to discuss about vllm. see https://github.com/vllm-project/vllm/issues/2021#issuecomment-2463435586 for more details. we'd better avoid having a module that can potentially shadow python's builtin module, so that error trace can be clear. solution could be: rename `vllm.logging` to `vllm.logging_utils` ### Before submitting a new issue... - [X] Make sure you already searched for relevant issues, and asked the chatbot living at the bottom right corner of the [documentation page](https://docs.vllm.ai/en/latest/), which can answer lots of frequently asked questions.
2024-11-08T00:44:47
0.0
[]
[]
awslabs/amazon-s3-find-and-forget
awslabs__amazon-s3-find-and-forget-358
57611e3eaa4b34742bbbb595eb882150452773de
diff --git a/.gitignore b/.gitignore index f9a65f24..ad843513 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,9 @@ coverage.xml .pytest_cache/ coverage/ +# Test data +tests/acceptance/data/basic.json.gz + # Translations *.mo *.pot diff --git a/CHANGELOG.md b/CHANGELOG.md index 457eccca..8805f82f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## v0.58 + +- [#358](https://github.com/awslabs/amazon-s3-find-and-forget/pull/358): Fix for + bug that caused failure when opening gzipped files due to pyarrow unzipping + ## v0.57 - [#348](https://github.com/awslabs/amazon-s3-find-and-forget/pull/348): Cost diff --git a/Makefile b/Makefile index 70905e52..ad16045b 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ deploy-vpc: deploy-cfn: aws cloudformation package --template-file templates/template.yaml --s3-bucket $(TEMP_BUCKET) --output-template-file packaged.yaml aws cloudformation deploy --template-file ./packaged.yaml --stack-name S3F2 --capabilities CAPABILITY_IAM CAPABILITY_AUTO_EXPAND \ - --parameter-overrides CreateCloudFrontDistribution=false EnableContainerInsights=true AdminEmail=$(ADMIN_EMAIL) \ + --parameter-overrides CreateCloudFrontDistribution=true EnableContainerInsights=true AdminEmail=$(ADMIN_EMAIL) \ AccessControlAllowOriginOverride=* PreBuiltArtefactsBucketOverride=$(TEMP_BUCKET) KMSKeyArns=$(KMS_KEYARNS) deploy-artefacts: @@ -104,7 +104,7 @@ package-artefacts: backend/ecs_tasks/python_3.9-slim.tar -x '**/__pycache*' '*settings.js' @ backend/ecs_tasks/python_3.9-slim.tar: - docker pull python:3.9-slim + docker pull --platform linux/amd64 python:3.9-slim docker save python:3.9-slim -o "$@" redeploy-containers: @@ -114,7 +114,7 @@ redeploy-containers: $(eval ECR_REPOSITORY := $(shell aws cloudformation describe-stacks --stack-name S3F2 --query 'Stacks[0].Outputs[?OutputKey==`ECRRepository`].OutputValue' --output text)) $(eval REPOSITORY_URI := $(shell aws ecr describe-repositories --repository-names $(ECR_REPOSITORY) --query 'repositories[0].repositoryUri' --output text)) $(shell aws ecr get-login --no-include-email --region $(REGION)) - docker build -t $(ECR_REPOSITORY) -f backend/ecs_tasks/delete_files/Dockerfile . + docker build --platform linux/amd64 -t $(ECR_REPOSITORY) -f backend/ecs_tasks/delete_files/Dockerfile . docker tag $(ECR_REPOSITORY):latest $(REPOSITORY_URI):latest docker push $(REPOSITORY_URI):latest @@ -175,6 +175,9 @@ start-frontend-remote: $(eval WEBUI_URL := $(shell aws cloudformation describe-stacks --stack-name S3F2 --query 'Stacks[0].Outputs[?OutputKey==`WebUIUrl`].OutputValue' --output text)) $(if $(filter none, $(WEBUI_URL)), @echo "WebUI not deployed.", open $(WEBUI_URL)) +tests/acceptance/data/basic.json.gz: + gzip -k tests/acceptance/data/basic.json + test-cfn: cfn_nag templates/*.yaml --blacklist-path ci/cfn_nag_blacklist.yaml @@ -187,10 +190,10 @@ test-unit: | $(VENV) test-ci: | $(VENV) $(VENV)/bin/pytest -m unit --log-cli-level info --cov=backend.lambdas --cov=decorators --cov=boto_utils --cov=backend.ecs_tasks --cov-report xml -test-acceptance-cognito: | $(VENV) +test-acceptance-cognito: | $(VENV) tests/acceptance/data/basic.json.gz $(VENV)/bin/pytest -m acceptance_cognito --log-cli-level info -test-acceptance-iam: | $(VENV) +test-acceptance-iam: | $(VENV) tests/acceptance/data/basic.json.gz $(VENV)/bin/pytest -m acceptance_iam --log-cli-level info test-no-state-machine: | $(VENV) diff --git a/backend/ecs_tasks/delete_files/json_handler.py b/backend/ecs_tasks/delete_files/json_handler.py index 7c762baf..d29c4fc1 100644 --- a/backend/ecs_tasks/delete_files/json_handler.py +++ b/backend/ecs_tasks/delete_files/json_handler.py @@ -8,15 +8,6 @@ from pyarrow import BufferOutputStream, CompressedOutputStream -def initialize(input_file, out_stream, compressed): - if compressed: - bytestream = BytesIO(input_file.read()) - input_file = GzipFile(None, "rb", fileobj=bytestream) - gzip_stream = CompressedOutputStream(out_stream, "gzip") if compressed else None - writer = gzip_stream if compressed else out_stream - return input_file, writer - - def find_key(key, obj): """ Athena openx SerDe is case insensitive, and converts by default each object's key @@ -47,10 +38,9 @@ def get_value(key, obj): return obj -def delete_matches_from_json_file(input_file, to_delete, compressed=False): +def delete_matches_from_json_file(input_file, to_delete): deleted_rows = 0 with BufferOutputStream() as out_stream: - input_file, writer = initialize(input_file, out_stream, compressed) content = input_file.read().decode("utf-8") total_rows = 0 for parsed, line in json_lines_iterator(content, include_unparsed=True): @@ -74,8 +64,6 @@ def delete_matches_from_json_file(input_file, to_delete, compressed=False): if should_delete: deleted_rows += 1 else: - writer.write(bytes(line + "\n", "utf-8")) - if compressed: - writer.close() + out_stream.write(bytes(line + "\n", "utf-8")) stats = Counter({"ProcessedRows": total_rows, "DeletedRows": deleted_rows}) return out_stream, stats diff --git a/backend/ecs_tasks/delete_files/main.py b/backend/ecs_tasks/delete_files/main.py index 5e30b9af..15ca1a2c 100644 --- a/backend/ecs_tasks/delete_files/main.py +++ b/backend/ecs_tasks/delete_files/main.py @@ -87,10 +87,10 @@ def validate_message(message): raise ValueError("Malformed message. Missing key: %s", k) -def delete_matches_from_file(input_file, to_delete, file_format, compressed=False): +def delete_matches_from_file(input_file, to_delete, file_format): logger.info("Generating new file without matches") if file_format == "json": - return delete_matches_from_json_file(input_file, to_delete, compressed) + return delete_matches_from_json_file(input_file, to_delete) return delete_matches_from_parquet_file(input_file, to_delete) @@ -155,12 +155,12 @@ def execute(queue_url, message_body, receipt_handle): # Download the object in-memory and convert to PyArrow NativeFile logger.info("Downloading and opening %s object in-memory", object_path) with s3.open_input_stream( - "{}/{}".format(input_bucket, input_key), buffer_size=FIVE_MB + "{}/{}".format(input_bucket, input_key), + buffer_size=FIVE_MB, ) as f: source_version = f.metadata()["VersionId"].decode("utf-8") logger.info("Using object version %s as source", source_version) # Write new file in-memory - compressed = object_path.endswith(".gz") object_info, _ = get_object_info( client, input_bucket, input_key, source_version ) @@ -168,7 +168,7 @@ def execute(queue_url, message_body, receipt_handle): is_encrypted = is_kms_cse_encrypted(metadata) input_file = decrypt(f, metadata, kms_client) if is_encrypted else f out_sink, stats = delete_matches_from_file( - input_file, match_ids, file_format, compressed + input_file, match_ids, file_format ) if stats["DeletedRows"] == 0: raise ValueError(
GZIP JSON files fail to open When running the forget sevice over gzip compressed JSON (with a .gz extension) we are presented with the following error: ``` "Error":"Unable to retrieve object: Not a gzipped file (b'{"')" ``` We believe the cause is because the file is opened as follows (https://github.com/XioResearchInterGalactic/amazon-s3-find-and-forget/blob/master/backend/ecs_tasks/delete_files/main.py#L157): ``` with s3.open_input_stream( "{}/{}".format(input_bucket, input_key), buffer_size=FIVE_MB ) as f: ``` The open_input_stream method has a default parameter `compression='detect'` which returns a gzip stream. https://arrow.apache.org/docs/python/generated/pyarrow.fs.S3FileSystem.html#pyarrow.fs.S3FileSystem.open_input_file After creating the stream it is initalized here https://github.com/XioResearchInterGalactic/amazon-s3-find-and-forget/blob/master/backend/ecs_tasks/delete_files/json_handler.py#L11 - the result being that the input stream is initalized again as a GZIP stream which results in the error above (not a gzipped file). I suspect that when this was written when `compression='detect'` was not a feature.
Thanks for submitting an issue and thanks for the preliminary analysis. I think you may be right, we recently moved from s3fs to arrow's s3 handler, and I don't see in our acceptance tests suite anything covering gzip json end-to-end, so perhaps we introduced the bug there in [v0.53](https://github.com/awslabs/amazon-s3-find-and-forget/blob/master/CHANGELOG.md#v053). I think the next step for me is to add an end-to-end test there to reproduce the issue. If I can reproduce, then the fix may be as simple as you suggested (just remove the gzip handling as arrow should do be able to handle gzip natively). I'll keep this thread updated.
2023-04-13T10:01:24
0.0
[]
[]
awslabs/amazon-s3-find-and-forget
awslabs__amazon-s3-find-and-forget-310
5e9302a68963e73ac557b9d7b3294c6eddbaad6e
diff --git a/CHANGELOG.md b/CHANGELOG.md index f6839df8..11a6e46d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## v0.47 (unreleased) + +- [#310](https://github.com/awslabs/amazon-s3-find-and-forget/pull/310): Improve + performance of Athena query generation + ## v0.46 - [#306](https://github.com/awslabs/amazon-s3-find-and-forget/pull/306): Adds diff --git a/backend/ecs_tasks/delete_files/cse.py b/backend/ecs_tasks/delete_files/cse.py index ac087a34..b3e68d30 100644 --- a/backend/ecs_tasks/delete_files/cse.py +++ b/backend/ecs_tasks/delete_files/cse.py @@ -85,8 +85,8 @@ def encrypt(buf, s3_metadata, kms_client): def decrypt(file_input, s3_metadata, kms_client): """ Method to decrypt an S3 object with KMS based Client-side encryption (CSE). - The object's metadata is used to fetch the encryption envelope such as - the KMS key ID and the algorithm. + The object's metadata is used to fetch the encryption envelope such as + the KMS key ID and the algorithm. """ logger.info("Decrypting Object with CSE-KMS") alg = s3_metadata.get(HEADER_ALG, None) diff --git a/backend/ecs_tasks/delete_files/requirements.in b/backend/ecs_tasks/delete_files/requirements.in index a264ca58..9a81e9ba 100644 --- a/backend/ecs_tasks/delete_files/requirements.in +++ b/backend/ecs_tasks/delete_files/requirements.in @@ -2,7 +2,7 @@ pyarrow==7.0.0 s3fs==0.4.0 python-snappy==0.5.4 pandas==1.1.1 -boto3==1.17.85 +boto3==1.21.40 numpy==1.21.5 cryptography==3.4.7 urllib3>=1.26.5 diff --git a/backend/ecs_tasks/delete_files/requirements.txt b/backend/ecs_tasks/delete_files/requirements.txt index 881543fb..d716d931 100644 --- a/backend/ecs_tasks/delete_files/requirements.txt +++ b/backend/ecs_tasks/delete_files/requirements.txt @@ -1,28 +1,28 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile # To update, run: # # pip-compile --output-file=backend/ecs_tasks/delete_files/requirements.txt backend/ecs_tasks/delete_files/requirements.in # aws-assume-role-lib==2.9.0 # via -r backend/ecs_tasks/delete_files/requirements.in -boto3==1.17.85 +boto3==1.21.40 # via # -r backend/ecs_tasks/delete_files/requirements.in # aws-assume-role-lib # s3fs -botocore==1.20.85 +botocore==1.24.40 # via # boto3 # s3fs # s3transfer -cffi==1.14.5 +cffi==1.15.0 # via cryptography cryptography==3.4.7 # via -r backend/ecs_tasks/delete_files/requirements.in -fsspec==0.8.0 +fsspec==2022.3.0 # via s3fs -jmespath==0.10.0 +jmespath==1.0.0 # via # boto3 # botocore @@ -35,25 +35,25 @@ pandas==1.1.1 # via -r backend/ecs_tasks/delete_files/requirements.in pyarrow==7.0.0 # via -r backend/ecs_tasks/delete_files/requirements.in -pycparser==2.20 +pycparser==2.21 # via cffi -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # botocore # pandas python-snappy==0.5.4 # via -r backend/ecs_tasks/delete_files/requirements.in -pytz==2020.1 +pytz==2022.1 # via pandas s3fs==0.4.0 # via -r backend/ecs_tasks/delete_files/requirements.in -s3transfer==0.4.2 +s3transfer==0.5.2 # via boto3 -six==1.15.0 +six==1.16.0 # via python-dateutil tenacity==8.0.1 # via -r backend/ecs_tasks/delete_files/requirements.in -urllib3==1.26.6 +urllib3==1.26.9 # via # -r backend/ecs_tasks/delete_files/requirements.in # botocore diff --git a/backend/ecs_tasks/delete_files/s3.py b/backend/ecs_tasks/delete_files/s3.py index 771e27be..2911b0aa 100644 --- a/backend/ecs_tasks/delete_files/s3.py +++ b/backend/ecs_tasks/delete_files/s3.py @@ -50,7 +50,11 @@ def save(s3, client, buf, bucket, key, metadata, source_version=None): Bucket=bucket, Key=key, VersionId=new_version_id, - **{**request_payer_args, **acl_args, "GrantWrite": write_grantees,} + **{ + **request_payer_args, + **acl_args, + "GrantWrite": write_grantees, + } ) logger.info("Processing of file s3://%s/%s complete", bucket, key) return new_version_id @@ -248,7 +252,11 @@ def delete_old_versions(client, input_bucket, input_key, new_version): ) def delete_s3_objects(client, bucket, objects): return client.delete_objects( - Bucket=bucket, Delete={"Objects": objects, "Quiet": True,}, + Bucket=bucket, + Delete={ + "Objects": objects, + "Quiet": True, + }, ) @@ -296,7 +304,7 @@ def raise_exception(msg): def rollback_object_version(client, bucket, key, version, on_error): - """ Delete newly created object version as soon as integrity conflict is detected """ + """Delete newly created object version as soon as integrity conflict is detected""" try: return client.delete_object(Bucket=bucket, Key=key, VersionId=version) except ClientError as e: diff --git a/backend/ecs_tasks/delete_files/utils.py b/backend/ecs_tasks/delete_files/utils.py index 5753d2bc..781598f6 100644 --- a/backend/ecs_tasks/delete_files/utils.py +++ b/backend/ecs_tasks/delete_files/utils.py @@ -7,7 +7,7 @@ def remove_none(d: dict): def retry_wrapper(fn, retry_wait_seconds=2, retry_factor=2, max_retries=5): - """ Exponential back-off retry wrapper for ClientError exceptions """ + """Exponential back-off retry wrapper for ClientError exceptions""" def wrapper(*args, **kwargs): retry_current = 0 diff --git a/backend/lambda_layers/aws_sdk/requirements.in b/backend/lambda_layers/aws_sdk/requirements.in index 3e5f5b98..098f35b1 100644 --- a/backend/lambda_layers/aws_sdk/requirements.in +++ b/backend/lambda_layers/aws_sdk/requirements.in @@ -1,3 +1,3 @@ -boto3==1.17.85 +boto3==1.21.40 urllib3>=1.26.5 aws-assume-role-lib>=2.9.0 diff --git a/backend/lambda_layers/aws_sdk/requirements.txt b/backend/lambda_layers/aws_sdk/requirements.txt index 267a02dc..dee4d70b 100644 --- a/backend/lambda_layers/aws_sdk/requirements.txt +++ b/backend/lambda_layers/aws_sdk/requirements.txt @@ -1,30 +1,30 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.7 # To update, run: # # pip-compile --output-file=backend/lambda_layers/aws_sdk/requirements.txt backend/lambda_layers/aws_sdk/requirements.in # aws-assume-role-lib==2.9.0 # via -r backend/lambda_layers/aws_sdk/requirements.in -boto3==1.17.85 +boto3==1.21.40 # via # -r backend/lambda_layers/aws_sdk/requirements.in # aws-assume-role-lib -botocore==1.20.85 +botocore==1.24.40 # via # boto3 # s3transfer -jmespath==0.10.0 +jmespath==1.0.0 # via # boto3 # botocore -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via botocore -s3transfer==0.4.2 +s3transfer==0.5.2 # via boto3 -six==1.15.0 +six==1.16.0 # via python-dateutil -urllib3==1.26.6 +urllib3==1.26.9 # via # -r backend/lambda_layers/aws_sdk/requirements.in # botocore diff --git a/backend/lambda_layers/decorators/python/decorators.py b/backend/lambda_layers/decorators/python/decorators.py index 4e28ae7a..b551b39d 100644 --- a/backend/lambda_layers/decorators/python/decorators.py +++ b/backend/lambda_layers/decorators/python/decorators.py @@ -66,14 +66,18 @@ def wrapper(to_validate, *args, **kwargs): return { "statusCode": 500, "body": json.dumps( - {"Message": "Invalid configuration: {}".format(str(e)),} + { + "Message": "Invalid configuration: {}".format(str(e)), + } ), } except jsonschema.ValidationError as exception: return { "statusCode": 422, "body": json.dumps( - {"Message": "Invalid Request: {}".format(exception.message),} + { + "Message": "Invalid Request: {}".format(exception.message), + } ), } @@ -96,18 +100,28 @@ def wrapper(event, context): except ClientError as e: return { "statusCode": e.response["ResponseMetadata"].get("HTTPStatusCode", 400), - "body": json.dumps({"Message": "Client error: {}".format(str(e)),}), + "body": json.dumps( + { + "Message": "Client error: {}".format(str(e)), + } + ), } except ValueError as e: return { "statusCode": 400, - "body": json.dumps({"Message": "Invalid request: {}".format(str(e)),}), + "body": json.dumps( + { + "Message": "Invalid request: {}".format(str(e)), + } + ), } except Exception as e: return { "statusCode": 400, "body": json.dumps( - {"Message": "Unable to process request: {}".format(str(e)),} + { + "Message": "Unable to process request: {}".format(str(e)), + } ), } diff --git a/backend/lambda_layers/decorators/requirements.txt b/backend/lambda_layers/decorators/requirements.txt index 99f2ae5d..51f00803 100644 --- a/backend/lambda_layers/decorators/requirements.txt +++ b/backend/lambda_layers/decorators/requirements.txt @@ -4,12 +4,20 @@ # # pip-compile --output-file=backend/lambda_layers/decorators/requirements.txt backend/lambda_layers/decorators/requirements.in # -attrs==20.1.0 # via jsonschema -importlib-metadata==1.7.0 # via jsonschema -jsonschema==3.2.0 # via -r backend/lambda_layers/decorators/requirements.in -pyrsistent==0.16.0 # via jsonschema -six==1.15.0 # via jsonschema, pyrsistent -zipp==3.1.0 # via importlib-metadata +attrs==21.4.0 + # via jsonschema +importlib-metadata==4.11.3 + # via jsonschema +jsonschema==3.2.0 + # via -r backend/lambda_layers/decorators/requirements.in +pyrsistent==0.18.1 + # via jsonschema +six==1.16.0 + # via jsonschema +typing-extensions==4.1.1 + # via importlib-metadata +zipp==3.8.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/backend/lambdas/jobs/handlers.py b/backend/lambdas/jobs/handlers.py index 275cf8cf..64427d0c 100644 --- a/backend/lambdas/jobs/handlers.py +++ b/backend/lambdas/jobs/handlers.py @@ -54,7 +54,12 @@ @catch_errors def get_job_handler(event, context): job_id = event["pathParameters"]["job_id"] - resp = table.get_item(Key={"Id": job_id, "Sk": job_id,}) + resp = table.get_item( + Key={ + "Id": job_id, + "Sk": job_id, + } + ) item = resp.get("Item") if not item: return {"statusCode": 404} @@ -93,7 +98,11 @@ def list_jobs_handler(event, context): return { "statusCode": 200, "body": json.dumps( - {"Jobs": items, "NextStart": next_start,}, cls=DecimalEncoder + { + "Jobs": items, + "NextStart": next_start, + }, + cls=DecimalEncoder, ), } @@ -113,7 +122,12 @@ def list_job_events_handler(event, context): page_size = int(qs.get("page_size", 20)) start_at = qs.get("start_at", "0") # Check the job exists - job = table.get_item(Key={"Id": job_id, "Sk": job_id,}).get("Item") + job = table.get_item( + Key={ + "Id": job_id, + "Sk": job_id, + } + ).get("Item") if not job: return {"statusCode": 404} diff --git a/backend/lambdas/jobs/stats_updater.py b/backend/lambdas/jobs/stats_updater.py index f51044c0..57863800 100644 --- a/backend/lambdas/jobs/stats_updater.py +++ b/backend/lambdas/jobs/stats_updater.py @@ -74,7 +74,10 @@ def _aggregate_stats(events): def _update_job(job_id, stats): try: return table.update_item( - Key={"Id": job_id, "Sk": job_id,}, + Key={ + "Id": job_id, + "Sk": job_id, + }, ConditionExpression="#Id = :Id AND #Sk = :Sk", UpdateExpression="set #qt = if_not_exists(#qt, :z) + :qt, " "#qs = if_not_exists(#qs, :z) + :qs, " diff --git a/backend/lambdas/jobs/status_updater.py b/backend/lambdas/jobs/status_updater.py index 7cb99ca5..5a37ab2d 100644 --- a/backend/lambdas/jobs/status_updater.py +++ b/backend/lambdas/jobs/status_updater.py @@ -90,9 +90,13 @@ def determine_status(job_id, event_name): def job_has_errors(job_id): - item = table.get_item(Key={"Id": job_id, "Sk": job_id,}, ConsistentRead=True)[ - "Item" - ] + item = table.get_item( + Key={ + "Id": job_id, + "Sk": job_id, + }, + ConsistentRead=True, + )["Item"] return ( item.get("TotalObjectUpdateFailedCount", 0) > 0 or item.get("TotalQueryFailedCount") > 0 @@ -116,7 +120,10 @@ def _update_item(job_id, attr_updates): ) return table.update_item( - Key={"Id": job_id, "Sk": job_id,}, + Key={ + "Id": job_id, + "Sk": job_id, + }, UpdateExpression=update_expression, ConditionExpression="#Id = :Id AND #Sk = :Sk AND ({})".format( unlocked_states_condition diff --git a/backend/lambdas/tasks/check_task_count.py b/backend/lambdas/tasks/check_task_count.py index 486bdb4e..0aed9f5f 100644 --- a/backend/lambdas/tasks/check_task_count.py +++ b/backend/lambdas/tasks/check_task_count.py @@ -14,7 +14,10 @@ def handler(event, context): try: service = client.describe_services( - cluster=event["Cluster"], services=[event["ServiceName"],], + cluster=event["Cluster"], + services=[ + event["ServiceName"], + ], )["services"][0] pending = service["pendingCount"] running = service["runningCount"] diff --git a/backend/lambdas/tasks/execute_query.py b/backend/lambdas/tasks/execute_query.py index 13c69c32..e9a57262 100644 --- a/backend/lambdas/tasks/execute_query.py +++ b/backend/lambdas/tasks/execute_query.py @@ -53,7 +53,7 @@ def make_query(query_data): m."queryablecolumns"='other_customer_id' AND partition_key = value ) - + Note: 'queryablematchid' and 'queryablecolumns' is a convenience stringified value of match_id and its column when the match is simple, or a stringified joint value when composite (for instance, @@ -98,7 +98,8 @@ def make_query(query_data): partition_filters = "" for partition in partitions: partition_filters += " AND {key} = {value} ".format( - key=escape_column(partition["Key"]), value=escape_item(partition["Value"]), + key=escape_column(partition["Key"]), + value=escape_item(partition["Value"]), ) column_unions = "" diff --git a/backend/lambdas/tasks/generate_queries.py b/backend/lambdas/tasks/generate_queries.py index db54fcfe..aa381f39 100644 --- a/backend/lambdas/tasks/generate_queries.py +++ b/backend/lambdas/tasks/generate_queries.py @@ -94,7 +94,7 @@ def build_manifest_row(columns, match_id, item_id, item_createdat): is simple, or a stringified joint value when composite (for instance, "John_S3F2COMP_Doe" and "first_name_S3F2COMP_last_name"). The purpose of these fields is optimise query execution by doing the SQL JOINs over strings only. - + * What are MatchId and Columns? Original values to be used by the ECS task instead. Note that the MatchId is declared as array<string> in the Glue Table as it's @@ -272,6 +272,7 @@ def get_partitions(db, table_name): ["Partitions"], DatabaseName=db, TableName=table_name, + ExcludeColumnSchema=True, ) diff --git a/requirements.in b/requirements.in index d987423f..7d37cd65 100644 --- a/requirements.in +++ b/requirements.in @@ -1,12 +1,12 @@ pip-tools>=6.0.1 pytest==6.2.3 -cfn-lint==0.48.1 +cfn-lint==0.59.0 cfn-flip==1.2.3 mock==4.0.1 pytest-cov==2.11.1 py>=1.10.0 pre-commit==2.12.1 -black>=19.10b0,<20.0 +black==22.3.0 pyyaml>=5.4.1 requests==2.26.0 urllib3>=1.26.5 diff --git a/requirements.txt b/requirements.txt index d32939b4..c0f773b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,93 +1,100 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.7 # To update, run: # # pip-compile --output-file=requirements.txt requirements.in # -appdirs==1.4.4 - # via - # black - # virtualenv -attrs==20.1.0 +attrs==21.4.0 # via # -r ./backend/lambda_layers/decorators/requirements.txt - # black + # jschema-to-python # jsonschema # pytest + # sarif-om aws-assume-role-lib==2.9.0 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # -r ./backend/lambda_layers/aws_sdk/requirements.txt -aws-sam-translator==1.35.0 +aws-sam-translator==1.45.0 # via cfn-lint -black==19.10b0 +black==22.3.0 # via -r requirements.in -boto3==1.17.85 +boto3==1.21.40 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # -r ./backend/lambda_layers/aws_sdk/requirements.txt # aws-assume-role-lib # aws-sam-translator # s3fs -botocore==1.20.85 +botocore==1.24.40 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # -r ./backend/lambda_layers/aws_sdk/requirements.txt # boto3 # s3fs # s3transfer -certifi==2021.5.30 +certifi==2021.10.8 # via requests -cffi==1.14.5 +cffi==1.15.0 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # cryptography -cfgv==3.2.0 +cfgv==3.3.1 # via pre-commit cfn-flip==1.2.3 # via -r requirements.in -cfn-lint==0.48.1 +cfn-lint==0.59.0 # via -r requirements.in -charset-normalizer==2.0.3 +charset-normalizer==2.0.12 # via requests -click==7.1.2 +click==8.1.2 # via # black # cfn-flip # pip-tools -coverage==5.2.1 +coverage==6.3.2 # via pytest-cov crhelper==2.0.10 # via -r ./backend/lambda_layers/cr_helper/requirements.txt cryptography==3.4.7 # via -r ./backend/ecs_tasks/delete_files/requirements.txt -decorator==4.4.2 - # via networkx -distlib==0.3.1 +distlib==0.3.4 # via virtualenv -filelock==3.0.12 +filelock==3.6.0 # via virtualenv -fsspec==0.8.0 +fsspec==2022.3.0 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # s3fs -identify==1.4.30 +identify==2.4.12 # via pre-commit -idna==2.10 +idna==3.3 # via requests -importlib-metadata==1.7.0 - # via -r ./backend/lambda_layers/decorators/requirements.txt +importlib-metadata==4.11.3 + # via + # -r ./backend/lambda_layers/decorators/requirements.txt + # click + # jsonschema + # pep517 + # pluggy + # pre-commit + # pytest + # virtualenv iniconfig==1.1.1 # via pytest -jmespath==0.10.0 +jmespath==1.0.0 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # -r ./backend/lambda_layers/aws_sdk/requirements.txt # boto3 # botocore -jsonpatch==1.26 +jschema-to-python==1.2.3 + # via cfn-lint +jsonpatch==1.32 # via cfn-lint -jsonpointer==2.0 +jsonpickle==2.1.0 + # via jschema-to-python +jsonpointer==2.3 # via jsonpatch jsonschema==3.2.0 # via @@ -98,42 +105,52 @@ junit-xml==1.9 # via cfn-lint mock==4.0.1 # via -r requirements.in -networkx==2.5 +mypy-extensions==0.4.3 + # via black +networkx==2.6.3 # via cfn-lint -nodeenv==1.5.0 +nodeenv==1.6.0 # via pre-commit numpy==1.21.5 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # pandas # pyarrow -packaging==20.4 +packaging==21.3 # via pytest pandas==1.1.1 # via -r ./backend/ecs_tasks/delete_files/requirements.txt -pathspec==0.8.0 +pathspec==0.9.0 # via black -pep517==0.10.0 +pbr==5.8.1 + # via + # jschema-to-python + # sarif-om +pep517==0.12.0 # via pip-tools -pip-tools==6.0.1 +pip-tools==6.6.0 # via -r requirements.in +platformdirs==2.5.1 + # via + # black + # virtualenv pluggy==0.13.1 # via pytest pre-commit==2.12.1 # via -r requirements.in -py==1.10.0 +py==1.11.0 # via # -r requirements.in # pytest pyarrow==7.0.0 # via -r ./backend/ecs_tasks/delete_files/requirements.txt -pycparser==2.20 +pycparser==2.21 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # cffi -pyparsing==2.4.7 +pyparsing==3.0.8 # via packaging -pyrsistent==0.16.0 +pyrsistent==0.18.1 # via # -r ./backend/lambda_layers/decorators/requirements.txt # jsonschema @@ -143,7 +160,7 @@ pytest==6.2.3 # pytest-cov pytest-cov==2.11.1 # via -r requirements.in -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # -r ./backend/lambda_layers/aws_sdk/requirements.txt @@ -151,64 +168,70 @@ python-dateutil==2.8.1 # pandas python-snappy==0.5.4 # via -r ./backend/ecs_tasks/delete_files/requirements.txt -pytz==2020.1 +pytz==2022.1 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # pandas -pyyaml==5.4.1 +pyyaml==6.0 # via # -r requirements.in # cfn-flip # cfn-lint # pre-commit -regex==2020.7.14 - # via black requests==2.26.0 # via -r requirements.in s3fs==0.4.0 # via -r ./backend/ecs_tasks/delete_files/requirements.txt -s3transfer==0.4.2 +s3transfer==0.5.2 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # -r ./backend/lambda_layers/aws_sdk/requirements.txt # boto3 -six==1.15.0 +sarif-om==1.0.4 + # via cfn-lint +six==1.16.0 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # -r ./backend/lambda_layers/aws_sdk/requirements.txt # -r ./backend/lambda_layers/decorators/requirements.txt - # aws-sam-translator # cfn-flip - # cfn-lint # jsonschema # junit-xml - # packaging - # pyrsistent # python-dateutil # virtualenv tenacity==8.0.1 # via -r ./backend/ecs_tasks/delete_files/requirements.txt -toml==0.10.1 +toml==0.10.2 # via - # black - # pep517 # pre-commit # pytest -typed-ast==1.4.1 +tomli==2.0.1 + # via + # black + # pep517 +typed-ast==1.5.2 # via black -urllib3==1.26.6 +typing-extensions==4.1.1 + # via + # -r ./backend/lambda_layers/decorators/requirements.txt + # black + # importlib-metadata +urllib3==1.26.9 # via # -r ./backend/ecs_tasks/delete_files/requirements.txt # -r ./backend/lambda_layers/aws_sdk/requirements.txt # -r requirements.in # botocore # requests -virtualenv==20.0.31 +virtualenv==20.14.1 # via pre-commit -zipp==3.1.0 +wheel==0.37.1 + # via pip-tools +zipp==3.8.0 # via # -r ./backend/lambda_layers/decorators/requirements.txt # importlib-metadata + # pep517 # The following packages are considered to be unsafe in a requirements file: # pip
GenerateQueries lambda times out on highly partitioned tables with many columns For highly* partitioned tables with many* columns, the GenerateQueries lambda consumes most of its time waiting for [glue get_partitions() calls](https://github.com/awslabs/amazon-s3-find-and-forget/blob/master/backend/lambdas/tasks/generate_queries.py#L268-L274). Scaling the number of partitions in a dataset with many columns causes the lambda to hit the timeout cap of 15 minutes. On these kinds of tables, get_partitions() returns a very large response payload, a lot of which is unnecessary column metadata. One quick fix would be to call get_partitions() with the `ExcludeColumnSchema=True` parameter to reduce the response payload size. \* For reference, we encountered timeout issues on a table with 800k+ partitions and 170 columns. Applying this change in our specific case sped up execution by ~4x.
2022-04-19T12:17:31
0.0
[]
[]
sphinx-contrib/jquery
sphinx-contrib__jquery-7
5995de9ed0c4704f5f45aed2f2e2b778e6370f07
diff --git a/CHANGES.rst b/CHANGES.rst index 4572624..703b0e4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,11 @@ +Release 3.0.0 (in development) +============================== + +* Vendor jQuery within the extension and copy the files to the documentation's + ``_static`` directory. +* Include the ``_sphinx_javascript_frameworks_compat.js`` compatibility file + from Sphinx 5. + Release 2.0.0 (18/10/2022) ========================== diff --git a/pyproject.toml b/pyproject.toml index 8e04379..1dd0bf5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,10 @@ [build-system] -requires = ["setuptools>=65"] -build-backend = "setuptools.build_meta" +requires = ["flit_core>=3.7"] +build-backend = "flit_core.buildapi" # project metadata [project] -name = "sphinxcontrib-jquery" +name = "sphinxcontrib.jquery" version = "2.0.0" description = "Extension to include jQuery on newer Sphinx releases" readme = "README.rst" diff --git a/sphinxcontrib/__init__.py b/sphinxcontrib/__init__.py deleted file mode 100644 index 68c04af..0000000 --- a/sphinxcontrib/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# -*- coding: utf-8 -*- -__import__('pkg_resources').declare_namespace(__name__) diff --git a/sphinxcontrib/jquery.py b/sphinxcontrib/jquery.py deleted file mode 100644 index 91e1df4..0000000 --- a/sphinxcontrib/jquery.py +++ /dev/null @@ -1,20 +0,0 @@ -import sphinx - -__version__ = "2.0.0" -version_info = (2, 0, 0) - - -def setup(app): - jquery_installed = getattr(app, "_sphinxcontrib_jquery_installed", False) - if sphinx.version_info[:2] >= (6, 0) and not jquery_installed: - app.add_js_file( - "https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js", - priority=100, - ) - app._sphinxcontrib_jquery_installed = True - - return { - "parallel_read_safe": True, - "parallel_write_safe": True, - "version": __version__, - } diff --git a/sphinxcontrib/jquery/__init__.py b/sphinxcontrib/jquery/__init__.py new file mode 100644 index 0000000..cf3513a --- /dev/null +++ b/sphinxcontrib/jquery/__init__.py @@ -0,0 +1,31 @@ +from os import makedirs, path +import shutil + +import sphinx + +__version__ = "2.0.0" +version_info = (2, 0, 0) + +_ROOT_DIR = path.abspath(path.dirname(__file__)) + + +def setup(app): + jquery_installed = getattr(app, "_sphinxcontrib_jquery_installed", False) + if sphinx.version_info[:2] >= (6, 0) and not jquery_installed: + makedirs(path.join(app.outdir, '_static')) + for filename in ( + 'jquery.js', + '_sphinx_javascript_frameworks_compat.js', + ): + app.add_js_file(filename, priority=100) + shutil.copyfile( + path.join(_ROOT_DIR, filename), + path.join(app.outdir, '_static', filename) + ) + app._sphinxcontrib_jquery_installed = True + + return { + "parallel_read_safe": True, + "parallel_write_safe": True, + "version": __version__, + } diff --git a/sphinxcontrib/jquery/_sphinx_javascript_frameworks_compat.js b/sphinxcontrib/jquery/_sphinx_javascript_frameworks_compat.js new file mode 100644 index 0000000..8141580 --- /dev/null +++ b/sphinxcontrib/jquery/_sphinx_javascript_frameworks_compat.js @@ -0,0 +1,123 @@ +/* Compatability shim for jQuery and underscores.js. + * + * Copyright Sphinx contributors + * Released under the two clause BSD licence + */ + +/** + * small helper function to urldecode strings + * + * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent#Decoding_query_parameters_from_a_URL + */ +jQuery.urldecode = function(x) { + if (!x) { + return x + } + return decodeURIComponent(x.replace(/\+/g, ' ')); +}; + +/** + * small helper function to urlencode strings + */ +jQuery.urlencode = encodeURIComponent; + +/** + * This function returns the parsed url parameters of the + * current request. Multiple values per key are supported, + * it will always return arrays of strings for the value parts. + */ +jQuery.getQueryParameters = function(s) { + if (typeof s === 'undefined') + s = document.location.search; + var parts = s.substr(s.indexOf('?') + 1).split('&'); + var result = {}; + for (var i = 0; i < parts.length; i++) { + var tmp = parts[i].split('=', 2); + var key = jQuery.urldecode(tmp[0]); + var value = jQuery.urldecode(tmp[1]); + if (key in result) + result[key].push(value); + else + result[key] = [value]; + } + return result; +}; + +/** + * highlight a given string on a jquery object by wrapping it in + * span elements with the given class name. + */ +jQuery.fn.highlightText = function(text, className) { + function highlight(node, addItems) { + if (node.nodeType === 3) { + var val = node.nodeValue; + var pos = val.toLowerCase().indexOf(text); + if (pos >= 0 && + !jQuery(node.parentNode).hasClass(className) && + !jQuery(node.parentNode).hasClass("nohighlight")) { + var span; + var isInSVG = jQuery(node).closest("body, svg, foreignObject").is("svg"); + if (isInSVG) { + span = document.createElementNS("http://www.w3.org/2000/svg", "tspan"); + } else { + span = document.createElement("span"); + span.className = className; + } + span.appendChild(document.createTextNode(val.substr(pos, text.length))); + node.parentNode.insertBefore(span, node.parentNode.insertBefore( + document.createTextNode(val.substr(pos + text.length)), + node.nextSibling)); + node.nodeValue = val.substr(0, pos); + if (isInSVG) { + var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect"); + var bbox = node.parentElement.getBBox(); + rect.x.baseVal.value = bbox.x; + rect.y.baseVal.value = bbox.y; + rect.width.baseVal.value = bbox.width; + rect.height.baseVal.value = bbox.height; + rect.setAttribute('class', className); + addItems.push({ + "parent": node.parentNode, + "target": rect}); + } + } + } + else if (!jQuery(node).is("button, select, textarea")) { + jQuery.each(node.childNodes, function() { + highlight(this, addItems); + }); + } + } + var addItems = []; + var result = this.each(function() { + highlight(this, addItems); + }); + for (var i = 0; i < addItems.length; ++i) { + jQuery(addItems[i].parent).before(addItems[i].target); + } + return result; +}; + +/* + * backward compatibility for jQuery.browser + * This will be supported until firefox bug is fixed. + */ +if (!jQuery.browser) { + jQuery.uaMatch = function(ua) { + ua = ua.toLowerCase(); + + var match = /(chrome)[ \/]([\w.]+)/.exec(ua) || + /(webkit)[ \/]([\w.]+)/.exec(ua) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || + /(msie) ([\w.]+)/.exec(ua) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) || + []; + + return { + browser: match[ 1 ] || "", + version: match[ 2 ] || "0" + }; + }; + jQuery.browser = {}; + jQuery.browser[jQuery.uaMatch(navigator.userAgent).browser] = true; +} diff --git a/sphinxcontrib/jquery/jquery-3.6.0.js b/sphinxcontrib/jquery/jquery-3.6.0.js new file mode 100644 index 0000000..fc6c299 --- /dev/null +++ b/sphinxcontrib/jquery/jquery-3.6.0.js @@ -0,0 +1,10881 @@ +/*! + * jQuery JavaScript Library v3.6.0 + * https://jquery.com/ + * + * Includes Sizzle.js + * https://sizzlejs.com/ + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license + * https://jquery.org/license + * + * Date: 2021-03-02T17:08Z + */ +( function( global, factory ) { + + "use strict"; + + if ( typeof module === "object" && typeof module.exports === "object" ) { + + // For CommonJS and CommonJS-like environments where a proper `window` + // is present, execute the factory and get jQuery. + // For environments that do not have a `window` with a `document` + // (such as Node.js), expose a factory as module.exports. + // This accentuates the need for the creation of a real `window`. + // e.g. var jQuery = require("jquery")(window); + // See ticket #14549 for more info. + module.exports = global.document ? + factory( global, true ) : + function( w ) { + if ( !w.document ) { + throw new Error( "jQuery requires a window with a document" ); + } + return factory( w ); + }; + } else { + factory( global ); + } + +// Pass this if window is not defined yet +} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) { + +// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1 +// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode +// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common +// enough that all such attempts are guarded in a try block. +"use strict"; + +var arr = []; + +var getProto = Object.getPrototypeOf; + +var slice = arr.slice; + +var flat = arr.flat ? function( array ) { + return arr.flat.call( array ); +} : function( array ) { + return arr.concat.apply( [], array ); +}; + + +var push = arr.push; + +var indexOf = arr.indexOf; + +var class2type = {}; + +var toString = class2type.toString; + +var hasOwn = class2type.hasOwnProperty; + +var fnToString = hasOwn.toString; + +var ObjectFunctionString = fnToString.call( Object ); + +var support = {}; + +var isFunction = function isFunction( obj ) { + + // Support: Chrome <=57, Firefox <=52 + // In some browsers, typeof returns "function" for HTML <object> elements + // (i.e., `typeof document.createElement( "object" ) === "function"`). + // We don't want to classify *any* DOM node as a function. + // Support: QtWeb <=3.8.5, WebKit <=534.34, wkhtmltopdf tool <=0.12.5 + // Plus for old WebKit, typeof returns "function" for HTML collections + // (e.g., `typeof document.getElementsByTagName("div") === "function"`). (gh-4756) + return typeof obj === "function" && typeof obj.nodeType !== "number" && + typeof obj.item !== "function"; + }; + + +var isWindow = function isWindow( obj ) { + return obj != null && obj === obj.window; + }; + + +var document = window.document; + + + + var preservedScriptAttributes = { + type: true, + src: true, + nonce: true, + noModule: true + }; + + function DOMEval( code, node, doc ) { + doc = doc || document; + + var i, val, + script = doc.createElement( "script" ); + + script.text = code; + if ( node ) { + for ( i in preservedScriptAttributes ) { + + // Support: Firefox 64+, Edge 18+ + // Some browsers don't support the "nonce" property on scripts. + // On the other hand, just using `getAttribute` is not enough as + // the `nonce` attribute is reset to an empty string whenever it + // becomes browsing-context connected. + // See https://github.com/whatwg/html/issues/2369 + // See https://html.spec.whatwg.org/#nonce-attributes + // The `node.getAttribute` check was added for the sake of + // `jQuery.globalEval` so that it can fake a nonce-containing node + // via an object. + val = node[ i ] || node.getAttribute && node.getAttribute( i ); + if ( val ) { + script.setAttribute( i, val ); + } + } + } + doc.head.appendChild( script ).parentNode.removeChild( script ); + } + + +function toType( obj ) { + if ( obj == null ) { + return obj + ""; + } + + // Support: Android <=2.3 only (functionish RegExp) + return typeof obj === "object" || typeof obj === "function" ? + class2type[ toString.call( obj ) ] || "object" : + typeof obj; +} +/* global Symbol */ +// Defining this global in .eslintrc.json would create a danger of using the global +// unguarded in another place, it seems safer to define global only for this module + + + +var + version = "3.6.0", + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + + // The jQuery object is actually just the init constructor 'enhanced' + // Need init if jQuery is called (just allow error to be thrown if not included) + return new jQuery.fn.init( selector, context ); + }; + +jQuery.fn = jQuery.prototype = { + + // The current version of jQuery being used + jquery: version, + + constructor: jQuery, + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + + // Return all the elements in a clean array + if ( num == null ) { + return slice.call( this ); + } + + // Return just the one element from the set + return num < 0 ? this[ num + this.length ] : this[ num ]; + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + each: function( callback ) { + return jQuery.each( this, callback ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map( this, function( elem, i ) { + return callback.call( elem, i, elem ); + } ) ); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + even: function() { + return this.pushStack( jQuery.grep( this, function( _elem, i ) { + return ( i + 1 ) % 2; + } ) ); + }, + + odd: function() { + return this.pushStack( jQuery.grep( this, function( _elem, i ) { + return i % 2; + } ) ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] ); + }, + + end: function() { + return this.prevObject || this.constructor(); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: arr.sort, + splice: arr.splice +}; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[ 0 ] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // Skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !isFunction( target ) ) { + target = {}; + } + + // Extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + + // Only deal with non-null/undefined values + if ( ( options = arguments[ i ] ) != null ) { + + // Extend the base object + for ( name in options ) { + copy = options[ name ]; + + // Prevent Object.prototype pollution + // Prevent never-ending loop + if ( name === "__proto__" || target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject( copy ) || + ( copyIsArray = Array.isArray( copy ) ) ) ) { + src = target[ name ]; + + // Ensure proper type for the source value + if ( copyIsArray && !Array.isArray( src ) ) { + clone = []; + } else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) { + clone = {}; + } else { + clone = src; + } + copyIsArray = false; + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend( { + + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), + + // Assume jQuery is ready without the ready module + isReady: true, + + error: function( msg ) { + throw new Error( msg ); + }, + + noop: function() {}, + + isPlainObject: function( obj ) { + var proto, Ctor; + + // Detect obvious negatives + // Use toString instead of jQuery.type to catch host objects + if ( !obj || toString.call( obj ) !== "[object Object]" ) { + return false; + } + + proto = getProto( obj ); + + // Objects with no prototype (e.g., `Object.create( null )`) are plain + if ( !proto ) { + return true; + } + + // Objects with prototype are plain iff they were constructed by a global Object function + Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor; + return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString; + }, + + isEmptyObject: function( obj ) { + var name; + + for ( name in obj ) { + return false; + } + return true; + }, + + // Evaluates a script in a provided context; falls back to the global one + // if not specified. + globalEval: function( code, options, doc ) { + DOMEval( code, { nonce: options && options.nonce }, doc ); + }, + + each: function( obj, callback ) { + var length, i = 0; + + if ( isArrayLike( obj ) ) { + length = obj.length; + for ( ; i < length; i++ ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; + } + } + } else { + for ( i in obj ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; + } + } + } + + return obj; + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArrayLike( Object( arr ) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + return arr == null ? -1 : indexOf.call( arr, elem, i ); + }, + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + merge: function( first, second ) { + var len = +second.length, + j = 0, + i = first.length; + + for ( ; j < len; j++ ) { + first[ i++ ] = second[ j ]; + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, invert ) { + var callbackInverse, + matches = [], + i = 0, + length = elems.length, + callbackExpect = !invert; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + callbackInverse = !callback( elems[ i ], i ); + if ( callbackInverse !== callbackExpect ) { + matches.push( elems[ i ] ); + } + } + + return matches; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var length, value, + i = 0, + ret = []; + + // Go through the array, translating each of the items to their new values + if ( isArrayLike( elems ) ) { + length = elems.length; + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + } + + // Flatten any nested arrays + return flat( ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // jQuery.support is not used in Core but other projects attach their + // properties to it so it needs to exist. + support: support +} ); + +if ( typeof Symbol === "function" ) { + jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; +} + +// Populate the class2type map +jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), + function( _i, name ) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); + } ); + +function isArrayLike( obj ) { + + // Support: real iOS 8.2 only (not reproducible in simulator) + // `in` check used to prevent JIT error (gh-2145) + // hasOwn isn't used here due to false negatives + // regarding Nodelist length in IE + var length = !!obj && "length" in obj && obj.length, + type = toType( obj ); + + if ( isFunction( obj ) || isWindow( obj ) ) { + return false; + } + + return type === "array" || length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj; +} +var Sizzle = +/*! + * Sizzle CSS Selector Engine v2.3.6 + * https://sizzlejs.com/ + * + * Copyright JS Foundation and other contributors + * Released under the MIT license + * https://js.foundation/ + * + * Date: 2021-02-16 + */ +( function( window ) { +var i, + support, + Expr, + getText, + isXML, + tokenize, + compile, + select, + outermostContext, + sortInput, + hasDuplicate, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + 1 * new Date(), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + nonnativeSelectorCache = createCache(), + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + } + return 0; + }, + + // Instance methods + hasOwn = ( {} ).hasOwnProperty, + arr = [], + pop = arr.pop, + pushNative = arr.push, + push = arr.push, + slice = arr.slice, + + // Use a stripped-down indexOf as it's faster than native + // https://jsperf.com/thor-indexof-vs-for/5 + indexOf = function( list, elem ) { + var i = 0, + len = list.length; + for ( ; i < len; i++ ) { + if ( list[ i ] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" + + "ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + + // https://www.w3.org/TR/css-syntax-3/#ident-token-diagram + identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace + + "?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+", + + // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + + + // Operator (capture 2) + "*([*^$|!~]?=)" + whitespace + + + // "Attribute values must be CSS identifiers [capture 5] + // or strings [capture 3 or capture 4]" + "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + + whitespace + "*\\]", + + pseudos = ":(" + identifier + ")(?:\\((" + + + // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: + // 1. quoted (capture 3; capture 4 or capture 5) + "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + + + // 2. simple (capture 6) + "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + + + // 3. anything else (capture 2) + ".*" + + ")\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rwhitespace = new RegExp( whitespace + "+", "g" ), + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + + "*" ), + rdescend = new RegExp( whitespace + "|>" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + identifier + ")" ), + "CLASS": new RegExp( "^\\.(" + identifier + ")" ), + "TAG": new RegExp( "^(" + identifier + "|[*])" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + + whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + + whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace + + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rhtml = /HTML$/i, + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rsibling = /[+~]/, + + // CSS escapes + // http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ), + funescape = function( escape, nonHex ) { + var high = "0x" + escape.slice( 1 ) - 0x10000; + + return nonHex ? + + // Strip the backslash prefix from a non-hex escape sequence + nonHex : + + // Replace a hexadecimal escape sequence with the encoded Unicode code point + // Support: IE <=11+ + // For values outside the Basic Multilingual Plane (BMP), manually construct a + // surrogate pair + high < 0 ? + String.fromCharCode( high + 0x10000 ) : + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }, + + // CSS string/identifier serialization + // https://drafts.csswg.org/cssom/#common-serializing-idioms + rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g, + fcssescape = function( ch, asCodePoint ) { + if ( asCodePoint ) { + + // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER + if ( ch === "\0" ) { + return "\uFFFD"; + } + + // Control characters and (dependent upon position) numbers get escaped as code points + return ch.slice( 0, -1 ) + "\\" + + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " "; + } + + // Other potentially-special ASCII characters get backslash-escaped + return "\\" + ch; + }, + + // Used for iframes + // See setDocument() + // Removing the function wrapper causes a "Permission Denied" + // error in IE + unloadHandler = function() { + setDocument(); + }, + + inDisabledFieldset = addCombinator( + function( elem ) { + return elem.disabled === true && elem.nodeName.toLowerCase() === "fieldset"; + }, + { dir: "parentNode", next: "legend" } + ); + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + ( arr = slice.call( preferredDoc.childNodes ) ), + preferredDoc.childNodes + ); + + // Support: Android<4.0 + // Detect silently failing push.apply + // eslint-disable-next-line no-unused-expressions + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + pushNative.apply( target, slice.call( els ) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + + // Can't trust NodeList.length + while ( ( target[ j++ ] = els[ i++ ] ) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var m, i, elem, nid, match, groups, newSelector, + newContext = context && context.ownerDocument, + + // nodeType defaults to 9, since context defaults to document + nodeType = context ? context.nodeType : 9; + + results = results || []; + + // Return early from calls with invalid selector or context + if ( typeof selector !== "string" || !selector || + nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { + + return results; + } + + // Try to shortcut find operations (as opposed to filters) in HTML documents + if ( !seed ) { + setDocument( context ); + context = context || document; + + if ( documentIsHTML ) { + + // If the selector is sufficiently simple, try using a "get*By*" DOM method + // (excepting DocumentFragment context, where the methods don't exist) + if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) { + + // ID selector + if ( ( m = match[ 1 ] ) ) { + + // Document context + if ( nodeType === 9 ) { + if ( ( elem = context.getElementById( m ) ) ) { + + // Support: IE, Opera, Webkit + // TODO: identify versions + // getElementById can match elements by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + + // Element context + } else { + + // Support: IE, Opera, Webkit + // TODO: identify versions + // getElementById can match elements by name instead of ID + if ( newContext && ( elem = newContext.getElementById( m ) ) && + contains( context, elem ) && + elem.id === m ) { + + results.push( elem ); + return results; + } + } + + // Type selector + } else if ( match[ 2 ] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Class selector + } else if ( ( m = match[ 3 ] ) && support.getElementsByClassName && + context.getElementsByClassName ) { + + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // Take advantage of querySelectorAll + if ( support.qsa && + !nonnativeSelectorCache[ selector + " " ] && + ( !rbuggyQSA || !rbuggyQSA.test( selector ) ) && + + // Support: IE 8 only + // Exclude object elements + ( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) { + + newSelector = selector; + newContext = context; + + // qSA considers elements outside a scoping root when evaluating child or + // descendant combinators, which is not what we want. + // In such cases, we work around the behavior by prefixing every selector in the + // list with an ID selector referencing the scope context. + // The technique has to be used as well when a leading combinator is used + // as such selectors are not recognized by querySelectorAll. + // Thanks to Andrew Dupont for this technique. + if ( nodeType === 1 && + ( rdescend.test( selector ) || rcombinators.test( selector ) ) ) { + + // Expand context for sibling selectors + newContext = rsibling.test( selector ) && testContext( context.parentNode ) || + context; + + // We can use :scope instead of the ID hack if the browser + // supports it & if we're not changing the context. + if ( newContext !== context || !support.scope ) { + + // Capture the context ID, setting it first if necessary + if ( ( nid = context.getAttribute( "id" ) ) ) { + nid = nid.replace( rcssescape, fcssescape ); + } else { + context.setAttribute( "id", ( nid = expando ) ); + } + } + + // Prefix every selector in the list + groups = tokenize( selector ); + i = groups.length; + while ( i-- ) { + groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " + + toSelector( groups[ i ] ); + } + newSelector = groups.join( "," ); + } + + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch ( qsaError ) { + nonnativeSelectorCache( selector, true ); + } finally { + if ( nid === expando ) { + context.removeAttribute( "id" ); + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * Create key-value caches of limited size + * @returns {function(string, object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key + " " ) > Expr.cacheLength ) { + + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return ( cache[ key + " " ] = value ); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created element and returns a boolean result + */ +function assert( fn ) { + var el = document.createElement( "fieldset" ); + + try { + return !!fn( el ); + } catch ( e ) { + return false; + } finally { + + // Remove from its parent by default + if ( el.parentNode ) { + el.parentNode.removeChild( el ); + } + + // release memory in IE + el = null; + } +} + +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split( "|" ), + i = arr.length; + + while ( i-- ) { + Expr.attrHandle[ arr[ i ] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + a.sourceIndex - b.sourceIndex; + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( ( cur = cur.nextSibling ) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return ( name === "input" || name === "button" ) && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for :enabled/:disabled + * @param {Boolean} disabled true for :disabled; false for :enabled + */ +function createDisabledPseudo( disabled ) { + + // Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable + return function( elem ) { + + // Only certain elements can match :enabled or :disabled + // https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled + // https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled + if ( "form" in elem ) { + + // Check for inherited disabledness on relevant non-disabled elements: + // * listed form-associated elements in a disabled fieldset + // https://html.spec.whatwg.org/multipage/forms.html#category-listed + // https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled + // * option elements in a disabled optgroup + // https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled + // All such elements have a "form" property. + if ( elem.parentNode && elem.disabled === false ) { + + // Option elements defer to a parent optgroup if present + if ( "label" in elem ) { + if ( "label" in elem.parentNode ) { + return elem.parentNode.disabled === disabled; + } else { + return elem.disabled === disabled; + } + } + + // Support: IE 6 - 11 + // Use the isDisabled shortcut property to check for disabled fieldset ancestors + return elem.isDisabled === disabled || + + // Where there is no isDisabled, check manually + /* jshint -W018 */ + elem.isDisabled !== !disabled && + inDisabledFieldset( elem ) === disabled; + } + + return elem.disabled === disabled; + + // Try to winnow out elements that can't be disabled before trusting the disabled property. + // Some victims get caught in our net (label, legend, menu, track), but it shouldn't + // even exist on them, let alone have a boolean value. + } else if ( "label" in elem ) { + return elem.disabled === disabled; + } + + // Remaining elements are neither :enabled nor :disabled + return false; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction( function( argument ) { + argument = +argument; + return markFunction( function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ ( j = matchIndexes[ i ] ) ] ) { + seed[ j ] = !( matches[ j ] = seed[ j ] ); + } + } + } ); + } ); +} + +/** + * Checks a node for validity as a Sizzle context + * @param {Element|Object=} context + * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value + */ +function testContext( context ) { + return context && typeof context.getElementsByTagName !== "undefined" && context; +} + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Detects XML nodes + * @param {Element|Object} elem An element or a document + * @returns {Boolean} True iff elem is a non-HTML XML node + */ +isXML = Sizzle.isXML = function( elem ) { + var namespace = elem && elem.namespaceURI, + docElem = elem && ( elem.ownerDocument || elem ).documentElement; + + // Support: IE <=8 + // Assume HTML when documentElement doesn't yet exist, such as inside loading iframes + // https://bugs.jquery.com/ticket/4833 + return !rhtml.test( namespace || docElem && docElem.nodeName || "HTML" ); +}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var hasCompare, subWindow, + doc = node ? node.ownerDocument || node : preferredDoc; + + // Return early if doc is invalid or already selected + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Update global variables + document = doc; + docElem = document.documentElement; + documentIsHTML = !isXML( document ); + + // Support: IE 9 - 11+, Edge 12 - 18+ + // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + if ( preferredDoc != document && + ( subWindow = document.defaultView ) && subWindow.top !== subWindow ) { + + // Support: IE 11, Edge + if ( subWindow.addEventListener ) { + subWindow.addEventListener( "unload", unloadHandler, false ); + + // Support: IE 9 - 10 only + } else if ( subWindow.attachEvent ) { + subWindow.attachEvent( "onunload", unloadHandler ); + } + } + + // Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only, + // Safari 4 - 5 only, Opera <=11.6 - 12.x only + // IE/Edge & older browsers don't support the :scope pseudo-class. + // Support: Safari 6.0 only + // Safari 6.0 supports :scope but it's an alias of :root there. + support.scope = assert( function( el ) { + docElem.appendChild( el ).appendChild( document.createElement( "div" ) ); + return typeof el.querySelectorAll !== "undefined" && + !el.querySelectorAll( ":scope fieldset div" ).length; + } ); + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties + // (excepting IE8 booleans) + support.attributes = assert( function( el ) { + el.className = "i"; + return !el.getAttribute( "className" ); + } ); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert( function( el ) { + el.appendChild( document.createComment( "" ) ); + return !el.getElementsByTagName( "*" ).length; + } ); + + // Support: IE<9 + support.getElementsByClassName = rnative.test( document.getElementsByClassName ); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programmatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert( function( el ) { + docElem.appendChild( el ).id = expando; + return !document.getElementsByName || !document.getElementsByName( expando ).length; + } ); + + // ID filter and find + if ( support.getById ) { + Expr.filter[ "ID" ] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute( "id" ) === attrId; + }; + }; + Expr.find[ "ID" ] = function( id, context ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { + var elem = context.getElementById( id ); + return elem ? [ elem ] : []; + } + }; + } else { + Expr.filter[ "ID" ] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== "undefined" && + elem.getAttributeNode( "id" ); + return node && node.value === attrId; + }; + }; + + // Support: IE 6 - 7 only + // getElementById is not reliable as a find shortcut + Expr.find[ "ID" ] = function( id, context ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { + var node, i, elems, + elem = context.getElementById( id ); + + if ( elem ) { + + // Verify the id attribute + node = elem.getAttributeNode( "id" ); + if ( node && node.value === id ) { + return [ elem ]; + } + + // Fall back on getElementsByName + elems = context.getElementsByName( id ); + i = 0; + while ( ( elem = elems[ i++ ] ) ) { + node = elem.getAttributeNode( "id" ); + if ( node && node.value === id ) { + return [ elem ]; + } + } + } + + return []; + } + }; + } + + // Tag + Expr.find[ "TAG" ] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( tag ); + + // DocumentFragment nodes don't have gEBTN + } else if ( support.qsa ) { + return context.querySelectorAll( tag ); + } + } : + + function( tag, context ) { + var elem, + tmp = [], + i = 0, + + // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( ( elem = results[ i++ ] ) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) { + if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See https://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) { + + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert( function( el ) { + + var input; + + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // https://bugs.jquery.com/ticket/12359 + docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" + + "<select id='" + expando + "-\r\\' msallowcapture=''>" + + "<option selected=''></option></select>"; + + // Support: IE8, Opera 11-12.16 + // Nothing should be selected when empty strings follow ^= or $= or *= + // The test attribute must be unknown in Opera but "safe" for WinRT + // https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section + if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !el.querySelectorAll( "[selected]" ).length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ + if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) { + rbuggyQSA.push( "~=" ); + } + + // Support: IE 11+, Edge 15 - 18+ + // IE 11/Edge don't find elements on a `[name='']` query in some cases. + // Adding a temporary attribute to the document before the selection works + // around the issue. + // Interestingly, IE 10 & older don't seem to have the issue. + input = document.createElement( "input" ); + input.setAttribute( "name", "" ); + el.appendChild( input ); + if ( !el.querySelectorAll( "[name='']" ).length ) { + rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" + + whitespace + "*(?:''|\"\")" ); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !el.querySelectorAll( ":checked" ).length ) { + rbuggyQSA.push( ":checked" ); + } + + // Support: Safari 8+, iOS 8+ + // https://bugs.webkit.org/show_bug.cgi?id=136851 + // In-page `selector#id sibling-combinator selector` fails + if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) { + rbuggyQSA.push( ".#.+[+~]" ); + } + + // Support: Firefox <=3.6 - 5 only + // Old Firefox doesn't throw on a badly-escaped identifier. + el.querySelectorAll( "\\\f" ); + rbuggyQSA.push( "[\\r\\n\\f]" ); + } ); + + assert( function( el ) { + el.innerHTML = "<a href='' disabled='disabled'></a>" + + "<select disabled='disabled'><option/></select>"; + + // Support: Windows 8 Native Apps + // The type and name attributes are restricted during .innerHTML assignment + var input = document.createElement( "input" ); + input.setAttribute( "type", "hidden" ); + el.appendChild( input ).setAttribute( "name", "D" ); + + // Support: IE8 + // Enforce case-sensitivity of name attribute + if ( el.querySelectorAll( "[name=d]" ).length ) { + rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( el.querySelectorAll( ":enabled" ).length !== 2 ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Support: IE9-11+ + // IE's :disabled selector does not pick up the children of disabled fieldsets + docElem.appendChild( el ).disabled = true; + if ( el.querySelectorAll( ":disabled" ).length !== 2 ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Support: Opera 10 - 11 only + // Opera 10-11 does not throw on post-comma invalid pseudos + el.querySelectorAll( "*,:x" ); + rbuggyQSA.push( ",.*:" ); + } ); + } + + if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches || + docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector ) ) ) ) { + + assert( function( el ) { + + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( el, "*" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( el, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + } ); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) ); + + /* Contains + ---------------------------------------------------------------------- */ + hasCompare = rnative.test( docElem.compareDocumentPosition ); + + // Element contains another + // Purposefully self-exclusive + // As in, an element does not contain itself + contains = hasCompare || rnative.test( docElem.contains ) ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + ) ); + } : + function( a, b ) { + if ( b ) { + while ( ( b = b.parentNode ) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = hasCompare ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + // Sort on method existence if only one input has compareDocumentPosition + var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; + if ( compare ) { + return compare; + } + + // Calculate position if both inputs belong to the same document + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + compare = ( a.ownerDocument || a ) == ( b.ownerDocument || b ) ? + a.compareDocumentPosition( b ) : + + // Otherwise we know they are disconnected + 1; + + // Disconnected nodes + if ( compare & 1 || + ( !support.sortDetached && b.compareDocumentPosition( a ) === compare ) ) { + + // Choose the first element that is related to our preferred document + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + if ( a == document || a.ownerDocument == preferredDoc && + contains( preferredDoc, a ) ) { + return -1; + } + + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + if ( b == document || b.ownerDocument == preferredDoc && + contains( preferredDoc, b ) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } : + function( a, b ) { + + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Parentless nodes are either documents or disconnected + if ( !aup || !bup ) { + + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + /* eslint-disable eqeqeq */ + return a == document ? -1 : + b == document ? 1 : + /* eslint-enable eqeqeq */ + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( ( cur = cur.parentNode ) ) { + ap.unshift( cur ); + } + cur = b; + while ( ( cur = cur.parentNode ) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[ i ] === bp[ i ] ) { + i++; + } + + return i ? + + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[ i ], bp[ i ] ) : + + // Otherwise nodes in our document sort first + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + /* eslint-disable eqeqeq */ + ap[ i ] == preferredDoc ? -1 : + bp[ i ] == preferredDoc ? 1 : + /* eslint-enable eqeqeq */ + 0; + }; + + return document; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + setDocument( elem ); + + if ( support.matchesSelector && documentIsHTML && + !nonnativeSelectorCache[ expr + " " ] && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch ( e ) { + nonnativeSelectorCache( expr, true ); + } + } + + return Sizzle( expr, document, null, [ elem ] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + + // Set document vars if needed + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + if ( ( context.ownerDocument || context ) != document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + + // Set document vars if needed + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + if ( ( elem.ownerDocument || elem ) != document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val !== undefined ? + val : + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + ( val = elem.getAttributeNode( name ) ) && val.specified ? + val.value : + null; +}; + +Sizzle.escape = function( sel ) { + return ( sel + "" ).replace( rcssescape, fcssescape ); +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( ( elem = results[ i++ ] ) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + // Clear input after sorting to release objects + // See https://github.com/jquery/sizzle/pull/225 + sortInput = null; + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + + // If no nodeType, this is expected to be an array + while ( ( node = elem[ i++ ] ) ) { + + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + + // Use textContent for elements + // innerText usage removed for consistency of new lines (jQuery #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[ 1 ] = match[ 1 ].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[ 3 ] = ( match[ 3 ] || match[ 4 ] || + match[ 5 ] || "" ).replace( runescape, funescape ); + + if ( match[ 2 ] === "~=" ) { + match[ 3 ] = " " + match[ 3 ] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[ 1 ] = match[ 1 ].toLowerCase(); + + if ( match[ 1 ].slice( 0, 3 ) === "nth" ) { + + // nth-* requires argument + if ( !match[ 3 ] ) { + Sizzle.error( match[ 0 ] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[ 4 ] = +( match[ 4 ] ? + match[ 5 ] + ( match[ 6 ] || 1 ) : + 2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) ); + match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" ); + + // other types prohibit arguments + } else if ( match[ 3 ] ) { + Sizzle.error( match[ 0 ] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[ 6 ] && match[ 2 ]; + + if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[ 3 ] ) { + match[ 2 ] = match[ 4 ] || match[ 5 ] || ""; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + + // Get excess from tokenize (recursively) + ( excess = tokenize( unquoted, true ) ) && + + // advance to the next closing parenthesis + ( excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length ) ) { + + // excess is a negative index + match[ 0 ] = match[ 0 ].slice( 0, excess ); + match[ 2 ] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { + return true; + } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + ( pattern = new RegExp( "(^|" + whitespace + + ")" + className + "(" + whitespace + "|$)" ) ) && classCache( + className, function( elem ) { + return pattern.test( + typeof elem.className === "string" && elem.className || + typeof elem.getAttribute !== "undefined" && + elem.getAttribute( "class" ) || + "" + ); + } ); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + /* eslint-disable max-len */ + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + /* eslint-enable max-len */ + + }; + }, + + "CHILD": function( type, what, _argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, _context, xml ) { + var cache, uniqueCache, outerCache, node, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType, + diff = false; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( ( node = node[ dir ] ) ) { + if ( ofType ? + node.nodeName.toLowerCase() === name : + node.nodeType === 1 ) { + + return false; + } + } + + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + + // Seek `elem` from a previously-cached index + + // ...in a gzip-friendly way + node = parent; + outerCache = node[ expando ] || ( node[ expando ] = {} ); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + ( outerCache[ node.uniqueID ] = {} ); + + cache = uniqueCache[ type ] || []; + nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; + diff = nodeIndex && cache[ 2 ]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( ( node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + ( diff = nodeIndex = 0 ) || start.pop() ) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + uniqueCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + } else { + + // Use previously-cached element index if available + if ( useCache ) { + + // ...in a gzip-friendly way + node = elem; + outerCache = node[ expando ] || ( node[ expando ] = {} ); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + ( outerCache[ node.uniqueID ] = {} ); + + cache = uniqueCache[ type ] || []; + nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; + diff = nodeIndex; + } + + // xml :nth-child(...) + // or :nth-last-child(...) or :nth(-last)?-of-type(...) + if ( diff === false ) { + + // Use the same loop as above to seek `elem` from the start + while ( ( node = ++nodeIndex && node && node[ dir ] || + ( diff = nodeIndex = 0 ) || start.pop() ) ) { + + if ( ( ofType ? + node.nodeName.toLowerCase() === name : + node.nodeType === 1 ) && + ++diff ) { + + // Cache the index of each encountered element + if ( useCache ) { + outerCache = node[ expando ] || + ( node[ expando ] = {} ); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + ( outerCache[ node.uniqueID ] = {} ); + + uniqueCache[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction( function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf( seed, matched[ i ] ); + seed[ idx ] = !( matches[ idx ] = matched[ i ] ); + } + } ) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + + // Potentially complex pseudos + "not": markFunction( function( selector ) { + + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction( function( seed, matches, _context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( ( elem = unmatched[ i ] ) ) { + seed[ i ] = !( matches[ i ] = elem ); + } + } + } ) : + function( elem, _context, xml ) { + input[ 0 ] = elem; + matcher( input, null, xml, results ); + + // Don't keep the element (issue #299) + input[ 0 ] = null; + return !results.pop(); + }; + } ), + + "has": markFunction( function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + } ), + + "contains": markFunction( function( text ) { + text = text.replace( runescape, funescape ); + return function( elem ) { + return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1; + }; + } ), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + + // lang value must be a valid identifier + if ( !ridentifier.test( lang || "" ) ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( ( elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute( "xml:lang" ) || elem.getAttribute( "lang" ) ) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( ( elem = elem.parentNode ) && elem.nodeType === 1 ); + return false; + }; + } ), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && + ( !document.hasFocus || document.hasFocus() ) && + !!( elem.type || elem.href || ~elem.tabIndex ); + }, + + // Boolean properties + "enabled": createDisabledPseudo( false ), + "disabled": createDisabledPseudo( true ), + + "checked": function( elem ) { + + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return ( nodeName === "input" && !!elem.checked ) || + ( nodeName === "option" && !!elem.selected ); + }, + + "selected": function( elem ) { + + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + // eslint-disable-next-line no-unused-expressions + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), + // but not by others (comment: 8; processing instruction: 7; etc.) + // nodeType < 6 works because attributes (2) do not appear as children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeType < 6 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos[ "empty" ]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + + // Support: IE<8 + // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" + ( ( attr = elem.getAttribute( "type" ) ) == null || + attr.toLowerCase() === "text" ); + }, + + // Position-in-collection + "first": createPositionalPseudo( function() { + return [ 0 ]; + } ), + + "last": createPositionalPseudo( function( _matchIndexes, length ) { + return [ length - 1 ]; + } ), + + "eq": createPositionalPseudo( function( _matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + } ), + + "even": createPositionalPseudo( function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + } ), + + "odd": createPositionalPseudo( function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + } ), + + "lt": createPositionalPseudo( function( matchIndexes, length, argument ) { + var i = argument < 0 ? + argument + length : + argument > length ? + length : + argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + } ), + + "gt": createPositionalPseudo( function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + } ) + } +}; + +Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); +} + +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); + +tokenize = Sizzle.tokenize = function( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || ( match = rcomma.exec( soFar ) ) ) { + if ( match ) { + + // Don't consume trailing commas as valid + soFar = soFar.slice( match[ 0 ].length ) || soFar; + } + groups.push( ( tokens = [] ) ); + } + + matched = false; + + // Combinators + if ( ( match = rcombinators.exec( soFar ) ) ) { + matched = match.shift(); + tokens.push( { + value: matched, + + // Cast descendant combinators to space + type: match[ 0 ].replace( rtrim, " " ) + } ); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( ( match = matchExpr[ type ].exec( soFar ) ) && ( !preFilters[ type ] || + ( match = preFilters[ type ]( match ) ) ) ) { + matched = match.shift(); + tokens.push( { + value: matched, + type: type, + matches: match + } ); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +}; + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[ i ].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + skip = combinator.next, + key = skip || dir, + checkNonElements = base && key === "parentNode", + doneName = done++; + + return combinator.first ? + + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( ( elem = elem[ dir ] ) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + return false; + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var oldCache, uniqueCache, outerCache, + newCache = [ dirruns, doneName ]; + + // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching + if ( xml ) { + while ( ( elem = elem[ dir ] ) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( ( elem = elem[ dir ] ) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || ( elem[ expando ] = {} ); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ elem.uniqueID ] || + ( outerCache[ elem.uniqueID ] = {} ); + + if ( skip && skip === elem.nodeName.toLowerCase() ) { + elem = elem[ dir ] || elem; + } else if ( ( oldCache = uniqueCache[ key ] ) && + oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { + + // Assign to newCache so results back-propagate to previous elements + return ( newCache[ 2 ] = oldCache[ 2 ] ); + } else { + + // Reuse newcache so results back-propagate to previous elements + uniqueCache[ key ] = newCache; + + // A match means we're done; a fail means we have to keep checking + if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) { + return true; + } + } + } + } + } + return false; + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[ i ]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[ 0 ]; +} + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[ i ], results ); + } + return results; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( ( elem = unmatched[ i ] ) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction( function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( + selector || "*", + context.nodeType ? [ context ] : context, + [] + ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( ( elem = temp[ i ] ) ) { + matcherOut[ postMap[ i ] ] = !( matcherIn[ postMap[ i ] ] = elem ); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( ( elem = matcherOut[ i ] ) ) { + + // Restore matcherIn since elem is not yet a final match + temp.push( ( matcherIn[ i ] = elem ) ); + } + } + postFinder( null, ( matcherOut = [] ), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( ( elem = matcherOut[ i ] ) && + ( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) { + + seed[ temp ] = !( results[ temp ] = elem ); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + } ); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[ 0 ].type ], + implicitRelative = leadingRelative || Expr.relative[ " " ], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + ( checkContext = context ).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + + // Avoid hanging onto element (issue #299) + checkContext = null; + return ret; + } ]; + + for ( ; i < len; i++ ) { + if ( ( matcher = Expr.relative[ tokens[ i ].type ] ) ) { + matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ]; + } else { + matcher = Expr.filter[ tokens[ i ].type ].apply( null, tokens[ i ].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[ j ].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens + .slice( 0, i - 1 ) + .concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } ) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + var bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, outermost ) { + var elem, j, matcher, + matchedCount = 0, + i = "0", + unmatched = seed && [], + setMatched = [], + contextBackup = outermostContext, + + // We must always have either seed elements or outermost context + elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ), + + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ), + len = elems.length; + + if ( outermost ) { + + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + outermostContext = context == document || context || outermost; + } + + // Add elements passing elementMatchers directly to results + // Support: IE<9, Safari + // Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id + for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + + // Support: IE 11+, Edge 17 - 18+ + // IE/Edge sometimes throw a "Permission denied" error when strict-comparing + // two documents; shallow comparisons work. + // eslint-disable-next-line eqeqeq + if ( !context && elem.ownerDocument != document ) { + setDocument( elem ); + xml = !documentIsHTML; + } + while ( ( matcher = elementMatchers[ j++ ] ) ) { + if ( matcher( elem, context || document, xml ) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + + // They will have gone through all possible matchers + if ( ( elem = !matcher && elem ) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // `i` is now the count of elements visited above, and adding it to `matchedCount` + // makes the latter nonnegative. + matchedCount += i; + + // Apply set filters to unmatched elements + // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount` + // equals `i`), unless we didn't visit _any_ elements in the above loop because we have + // no element matchers and no seed. + // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that + // case, which will result in a "00" `matchedCount` that differs from `i` but is also + // numerically zero. + if ( bySet && i !== matchedCount ) { + j = 0; + while ( ( matcher = setMatchers[ j++ ] ) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !( unmatched[ i ] || setMatched[ i ] ) ) { + setMatched[ i ] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + + // Generate a function of recursive functions that can be used to check each element + if ( !match ) { + match = tokenize( selector ); + } + i = match.length; + while ( i-- ) { + cached = matcherFromTokens( match[ i ] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( + selector, + matcherFromGroupMatchers( elementMatchers, setMatchers ) + ); + + // Save selector and tokenization + cached.selector = selector; + } + return cached; +}; + +/** + * A low-level selection function that works with Sizzle's compiled + * selector functions + * @param {String|Function} selector A selector or a pre-compiled + * selector function built with Sizzle.compile + * @param {Element} context + * @param {Array} [results] + * @param {Array} [seed] A set of elements to match against + */ +select = Sizzle.select = function( selector, context, results, seed ) { + var i, tokens, token, type, find, + compiled = typeof selector === "function" && selector, + match = !seed && tokenize( ( selector = compiled.selector || selector ) ); + + results = results || []; + + // Try to minimize operations if there is only one selector in the list and no seed + // (the latter of which guarantees us context) + if ( match.length === 1 ) { + + // Reduce context if the leading compound selector is an ID + tokens = match[ 0 ] = match[ 0 ].slice( 0 ); + if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" && + context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) { + + context = ( Expr.find[ "ID" ]( token.matches[ 0 ] + .replace( runescape, funescape ), context ) || [] )[ 0 ]; + if ( !context ) { + return results; + + // Precompiled matchers will still verify ancestry, so step up a level + } else if ( compiled ) { + context = context.parentNode; + } + + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[ i ]; + + // Abort if we hit a combinator + if ( Expr.relative[ ( type = token.type ) ] ) { + break; + } + if ( ( find = Expr.find[ type ] ) ) { + + // Search, expanding context for leading sibling combinators + if ( ( seed = find( + token.matches[ 0 ].replace( runescape, funescape ), + rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) || + context + ) ) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + + // Compile and execute a filtering function if one is not provided + // Provide `match` to avoid retokenization if we modified the selector above + ( compiled || compile( selector, match ) )( + seed, + context, + !documentIsHTML, + results, + !context || rsibling.test( selector ) && testContext( context.parentNode ) || context + ); + return results; +}; + +// One-time assignments + +// Sort stability +support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando; + +// Support: Chrome 14-35+ +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = !!hasDuplicate; + +// Initialize against the default document +setDocument(); + +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert( function( el ) { + + // Should return 1, but returns 4 (following) + return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1; +} ); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert( function( el ) { + el.innerHTML = "<a href='#'></a>"; + return el.firstChild.getAttribute( "href" ) === "#"; +} ) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + } ); +} + +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert( function( el ) { + el.innerHTML = "<input/>"; + el.firstChild.setAttribute( "value", "" ); + return el.firstChild.getAttribute( "value" ) === ""; +} ) ) { + addHandle( "value", function( elem, _name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + } ); +} + +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert( function( el ) { + return el.getAttribute( "disabled" ) == null; +} ) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return elem[ name ] === true ? name.toLowerCase() : + ( val = elem.getAttributeNode( name ) ) && val.specified ? + val.value : + null; + } + } ); +} + +return Sizzle; + +} )( window ); + + + +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; + +// Deprecated +jQuery.expr[ ":" ] = jQuery.expr.pseudos; +jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; +jQuery.escapeSelector = Sizzle.escape; + + + + +var dir = function( elem, dir, until ) { + var matched = [], + truncate = until !== undefined; + + while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) { + if ( elem.nodeType === 1 ) { + if ( truncate && jQuery( elem ).is( until ) ) { + break; + } + matched.push( elem ); + } + } + return matched; +}; + + +var siblings = function( n, elem ) { + var matched = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + matched.push( n ); + } + } + + return matched; +}; + + +var rneedsContext = jQuery.expr.match.needsContext; + + + +function nodeName( elem, name ) { + + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); + +} +var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i ); + + + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, not ) { + if ( isFunction( qualifier ) ) { + return jQuery.grep( elements, function( elem, i ) { + return !!qualifier.call( elem, i, elem ) !== not; + } ); + } + + // Single element + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + } ); + } + + // Arraylike of elements (jQuery, arguments, Array) + if ( typeof qualifier !== "string" ) { + return jQuery.grep( elements, function( elem ) { + return ( indexOf.call( qualifier, elem ) > -1 ) !== not; + } ); + } + + // Filtered directly for both simple and complex selectors + return jQuery.filter( qualifier, elements, not ); +} + +jQuery.filter = function( expr, elems, not ) { + var elem = elems[ 0 ]; + + if ( not ) { + expr = ":not(" + expr + ")"; + } + + if ( elems.length === 1 && elem.nodeType === 1 ) { + return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : []; + } + + return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + } ) ); +}; + +jQuery.fn.extend( { + find: function( selector ) { + var i, ret, + len = this.length, + self = this; + + if ( typeof selector !== "string" ) { + return this.pushStack( jQuery( selector ).filter( function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + } ) ); + } + + ret = this.pushStack( [] ); + + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); + } + + return len > 1 ? jQuery.uniqueSort( ret ) : ret; + }, + filter: function( selector ) { + return this.pushStack( winnow( this, selector || [], false ) ); + }, + not: function( selector ) { + return this.pushStack( winnow( this, selector || [], true ) ); + }, + is: function( selector ) { + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; + } +} ); + + +// Initialize a jQuery object + + +// A central reference to the root jQuery(document) +var rootjQuery, + + // A simple way to check for HTML strings + // Prioritize #id over <tag> to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + // Shortcut simple #id case for speed + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/, + + init = jQuery.fn.init = function( selector, context, root ) { + var match, elem; + + // HANDLE: $(""), $(null), $(undefined), $(false) + if ( !selector ) { + return this; + } + + // Method init() accepts an alternate rootjQuery + // so migrate can support jQuery.sub (gh-2101) + root = root || rootjQuery; + + // Handle HTML strings + if ( typeof selector === "string" ) { + if ( selector[ 0 ] === "<" && + selector[ selector.length - 1 ] === ">" && + selector.length >= 3 ) { + + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = rquickExpr.exec( selector ); + } + + // Match html or make sure no context is specified for #id + if ( match && ( match[ 1 ] || !context ) ) { + + // HANDLE: $(html) -> $(array) + if ( match[ 1 ] ) { + context = context instanceof jQuery ? context[ 0 ] : context; + + // Option to run scripts is true for back-compat + // Intentionally let the error be thrown if parseHTML is not present + jQuery.merge( this, jQuery.parseHTML( + match[ 1 ], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + + // Properties of context are called as methods if possible + if ( isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } + } + + return this; + + // HANDLE: $(#id) + } else { + elem = document.getElementById( match[ 2 ] ); + + if ( elem ) { + + // Inject the element directly into the jQuery object + this[ 0 ] = elem; + this.length = 1; + } + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || root ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this[ 0 ] = selector; + this.length = 1; + return this; + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( isFunction( selector ) ) { + return root.ready !== undefined ? + root.ready( selector ) : + + // Execute immediately if ready is not present + selector( jQuery ); + } + + return jQuery.makeArray( selector, this ); + }; + +// Give the init function the jQuery prototype for later instantiation +init.prototype = jQuery.fn; + +// Initialize central reference +rootjQuery = jQuery( document ); + + +var rparentsprev = /^(?:parents|prev(?:Until|All))/, + + // Methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.fn.extend( { + has: function( target ) { + var targets = jQuery( target, this ), + l = targets.length; + + return this.filter( function() { + var i = 0; + for ( ; i < l; i++ ) { + if ( jQuery.contains( this, targets[ i ] ) ) { + return true; + } + } + } ); + }, + + closest: function( selectors, context ) { + var cur, + i = 0, + l = this.length, + matched = [], + targets = typeof selectors !== "string" && jQuery( selectors ); + + // Positional selectors never match, since there's no _selection_ context + if ( !rneedsContext.test( selectors ) ) { + for ( ; i < l; i++ ) { + for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) { + + // Always skip document fragments + if ( cur.nodeType < 11 && ( targets ? + targets.index( cur ) > -1 : + + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector( cur, selectors ) ) ) { + + matched.push( cur ); + break; + } + } + } + } + + return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched ); + }, + + // Determine the position of an element within the set + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; + } + + // Index in selector + if ( typeof elem === "string" ) { + return indexOf.call( jQuery( elem ), this[ 0 ] ); + } + + // Locate the position of the desired element + return indexOf.call( this, + + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[ 0 ] : elem + ); + }, + + add: function( selector, context ) { + return this.pushStack( + jQuery.uniqueSort( + jQuery.merge( this.get(), jQuery( selector, context ) ) + ) + ); + }, + + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter( selector ) + ); + } +} ); + +function sibling( cur, dir ) { + while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {} + return cur; +} + +jQuery.each( { + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, _i, until ) { + return dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return sibling( elem, "nextSibling" ); + }, + prev: function( elem ) { + return sibling( elem, "previousSibling" ); + }, + nextAll: function( elem ) { + return dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, _i, until ) { + return dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, _i, until ) { + return dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return siblings( ( elem.parentNode || {} ).firstChild, elem ); + }, + children: function( elem ) { + return siblings( elem.firstChild ); + }, + contents: function( elem ) { + if ( elem.contentDocument != null && + + // Support: IE 11+ + // <object> elements with no `data` attribute has an object + // `contentDocument` with a `null` prototype. + getProto( elem.contentDocument ) ) { + + return elem.contentDocument; + } + + // Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only + // Treat the template element as a regular one in browsers that + // don't support it. + if ( nodeName( elem, "template" ) ) { + elem = elem.content || elem; + } + + return jQuery.merge( [], elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var matched = jQuery.map( this, fn, until ); + + if ( name.slice( -5 ) !== "Until" ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + matched = jQuery.filter( selector, matched ); + } + + if ( this.length > 1 ) { + + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + jQuery.uniqueSort( matched ); + } + + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + matched.reverse(); + } + } + + return this.pushStack( matched ); + }; +} ); +var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g ); + + + +// Convert String-formatted options into Object-formatted ones +function createOptions( options ) { + var object = {}; + jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) { + object[ flag ] = true; + } ); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + createOptions( options ) : + jQuery.extend( {}, options ); + + var // Flag to know if list is currently firing + firing, + + // Last fire value for non-forgettable lists + memory, + + // Flag to know if list was already fired + fired, + + // Flag to prevent firing + locked, + + // Actual callback list + list = [], + + // Queue of execution data for repeatable lists + queue = [], + + // Index of currently firing callback (modified by add/remove as needed) + firingIndex = -1, + + // Fire callbacks + fire = function() { + + // Enforce single-firing + locked = locked || options.once; + + // Execute callbacks for all pending executions, + // respecting firingIndex overrides and runtime changes + fired = firing = true; + for ( ; queue.length; firingIndex = -1 ) { + memory = queue.shift(); + while ( ++firingIndex < list.length ) { + + // Run callback and check for early termination + if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false && + options.stopOnFalse ) { + + // Jump to end and forget the data so .add doesn't re-fire + firingIndex = list.length; + memory = false; + } + } + } + + // Forget the data if we're done with it + if ( !options.memory ) { + memory = false; + } + + firing = false; + + // Clean up if we're done firing for good + if ( locked ) { + + // Keep an empty list if we have data for future add calls + if ( memory ) { + list = []; + + // Otherwise, this object is spent + } else { + list = ""; + } + } + }, + + // Actual Callbacks object + self = { + + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + + // If we have memory from a past run, we should fire after adding + if ( memory && !firing ) { + firingIndex = list.length - 1; + queue.push( memory ); + } + + ( function add( args ) { + jQuery.each( args, function( _, arg ) { + if ( isFunction( arg ) ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && toType( arg ) !== "string" ) { + + // Inspect recursively + add( arg ); + } + } ); + } )( arguments ); + + if ( memory && !firing ) { + fire(); + } + } + return this; + }, + + // Remove a callback from the list + remove: function() { + jQuery.each( arguments, function( _, arg ) { + var index; + while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + + // Handle firing indexes + if ( index <= firingIndex ) { + firingIndex--; + } + } + } ); + return this; + }, + + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? + jQuery.inArray( fn, list ) > -1 : + list.length > 0; + }, + + // Remove all callbacks from the list + empty: function() { + if ( list ) { + list = []; + } + return this; + }, + + // Disable .fire and .add + // Abort any current/pending executions + // Clear all callbacks and values + disable: function() { + locked = queue = []; + list = memory = ""; + return this; + }, + disabled: function() { + return !list; + }, + + // Disable .fire + // Also disable .add unless we have memory (since it would have no effect) + // Abort any pending executions + lock: function() { + locked = queue = []; + if ( !memory && !firing ) { + list = memory = ""; + } + return this; + }, + locked: function() { + return !!locked; + }, + + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( !locked ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + queue.push( args ); + if ( !firing ) { + fire(); + } + } + return this; + }, + + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; + + return self; +}; + + +function Identity( v ) { + return v; +} +function Thrower( ex ) { + throw ex; +} + +function adoptValue( value, resolve, reject, noValue ) { + var method; + + try { + + // Check for promise aspect first to privilege synchronous behavior + if ( value && isFunction( ( method = value.promise ) ) ) { + method.call( value ).done( resolve ).fail( reject ); + + // Other thenables + } else if ( value && isFunction( ( method = value.then ) ) ) { + method.call( value, resolve, reject ); + + // Other non-thenables + } else { + + // Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer: + // * false: [ value ].slice( 0 ) => resolve( value ) + // * true: [ value ].slice( 1 ) => resolve() + resolve.apply( undefined, [ value ].slice( noValue ) ); + } + + // For Promises/A+, convert exceptions into rejections + // Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in + // Deferred#then to conditionally suppress rejection. + } catch ( value ) { + + // Support: Android 4.0 only + // Strict mode functions invoked without .call/.apply get global-object context + reject.apply( undefined, [ value ] ); + } +} + +jQuery.extend( { + + Deferred: function( func ) { + var tuples = [ + + // action, add listener, callbacks, + // ... .then handlers, argument index, [final state] + [ "notify", "progress", jQuery.Callbacks( "memory" ), + jQuery.Callbacks( "memory" ), 2 ], + [ "resolve", "done", jQuery.Callbacks( "once memory" ), + jQuery.Callbacks( "once memory" ), 0, "resolved" ], + [ "reject", "fail", jQuery.Callbacks( "once memory" ), + jQuery.Callbacks( "once memory" ), 1, "rejected" ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + "catch": function( fn ) { + return promise.then( null, fn ); + }, + + // Keep pipe for back-compat + pipe: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + + return jQuery.Deferred( function( newDefer ) { + jQuery.each( tuples, function( _i, tuple ) { + + // Map tuples (progress, done, fail) to arguments (done, fail, progress) + var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ]; + + // deferred.progress(function() { bind to newDefer or newDefer.notify }) + // deferred.done(function() { bind to newDefer or newDefer.resolve }) + // deferred.fail(function() { bind to newDefer or newDefer.reject }) + deferred[ tuple[ 1 ] ]( function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && isFunction( returned.promise ) ) { + returned.promise() + .progress( newDefer.notify ) + .done( newDefer.resolve ) + .fail( newDefer.reject ); + } else { + newDefer[ tuple[ 0 ] + "With" ]( + this, + fn ? [ returned ] : arguments + ); + } + } ); + } ); + fns = null; + } ).promise(); + }, + then: function( onFulfilled, onRejected, onProgress ) { + var maxDepth = 0; + function resolve( depth, deferred, handler, special ) { + return function() { + var that = this, + args = arguments, + mightThrow = function() { + var returned, then; + + // Support: Promises/A+ section 2.3.3.3.3 + // https://promisesaplus.com/#point-59 + // Ignore double-resolution attempts + if ( depth < maxDepth ) { + return; + } + + returned = handler.apply( that, args ); + + // Support: Promises/A+ section 2.3.1 + // https://promisesaplus.com/#point-48 + if ( returned === deferred.promise() ) { + throw new TypeError( "Thenable self-resolution" ); + } + + // Support: Promises/A+ sections 2.3.3.1, 3.5 + // https://promisesaplus.com/#point-54 + // https://promisesaplus.com/#point-75 + // Retrieve `then` only once + then = returned && + + // Support: Promises/A+ section 2.3.4 + // https://promisesaplus.com/#point-64 + // Only check objects and functions for thenability + ( typeof returned === "object" || + typeof returned === "function" ) && + returned.then; + + // Handle a returned thenable + if ( isFunction( then ) ) { + + // Special processors (notify) just wait for resolution + if ( special ) { + then.call( + returned, + resolve( maxDepth, deferred, Identity, special ), + resolve( maxDepth, deferred, Thrower, special ) + ); + + // Normal processors (resolve) also hook into progress + } else { + + // ...and disregard older resolution values + maxDepth++; + + then.call( + returned, + resolve( maxDepth, deferred, Identity, special ), + resolve( maxDepth, deferred, Thrower, special ), + resolve( maxDepth, deferred, Identity, + deferred.notifyWith ) + ); + } + + // Handle all other returned values + } else { + + // Only substitute handlers pass on context + // and multiple values (non-spec behavior) + if ( handler !== Identity ) { + that = undefined; + args = [ returned ]; + } + + // Process the value(s) + // Default process is resolve + ( special || deferred.resolveWith )( that, args ); + } + }, + + // Only normal processors (resolve) catch and reject exceptions + process = special ? + mightThrow : + function() { + try { + mightThrow(); + } catch ( e ) { + + if ( jQuery.Deferred.exceptionHook ) { + jQuery.Deferred.exceptionHook( e, + process.stackTrace ); + } + + // Support: Promises/A+ section 2.3.3.3.4.1 + // https://promisesaplus.com/#point-61 + // Ignore post-resolution exceptions + if ( depth + 1 >= maxDepth ) { + + // Only substitute handlers pass on context + // and multiple values (non-spec behavior) + if ( handler !== Thrower ) { + that = undefined; + args = [ e ]; + } + + deferred.rejectWith( that, args ); + } + } + }; + + // Support: Promises/A+ section 2.3.3.3.1 + // https://promisesaplus.com/#point-57 + // Re-resolve promises immediately to dodge false rejection from + // subsequent errors + if ( depth ) { + process(); + } else { + + // Call an optional hook to record the stack, in case of exception + // since it's otherwise lost when execution goes async + if ( jQuery.Deferred.getStackHook ) { + process.stackTrace = jQuery.Deferred.getStackHook(); + } + window.setTimeout( process ); + } + }; + } + + return jQuery.Deferred( function( newDefer ) { + + // progress_handlers.add( ... ) + tuples[ 0 ][ 3 ].add( + resolve( + 0, + newDefer, + isFunction( onProgress ) ? + onProgress : + Identity, + newDefer.notifyWith + ) + ); + + // fulfilled_handlers.add( ... ) + tuples[ 1 ][ 3 ].add( + resolve( + 0, + newDefer, + isFunction( onFulfilled ) ? + onFulfilled : + Identity + ) + ); + + // rejected_handlers.add( ... ) + tuples[ 2 ][ 3 ].add( + resolve( + 0, + newDefer, + isFunction( onRejected ) ? + onRejected : + Thrower + ) + ); + } ).promise(); + }, + + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } + }, + deferred = {}; + + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 5 ]; + + // promise.progress = list.add + // promise.done = list.add + // promise.fail = list.add + promise[ tuple[ 1 ] ] = list.add; + + // Handle state + if ( stateString ) { + list.add( + function() { + + // state = "resolved" (i.e., fulfilled) + // state = "rejected" + state = stateString; + }, + + // rejected_callbacks.disable + // fulfilled_callbacks.disable + tuples[ 3 - i ][ 2 ].disable, + + // rejected_handlers.disable + // fulfilled_handlers.disable + tuples[ 3 - i ][ 3 ].disable, + + // progress_callbacks.lock + tuples[ 0 ][ 2 ].lock, + + // progress_handlers.lock + tuples[ 0 ][ 3 ].lock + ); + } + + // progress_handlers.fire + // fulfilled_handlers.fire + // rejected_handlers.fire + list.add( tuple[ 3 ].fire ); + + // deferred.notify = function() { deferred.notifyWith(...) } + // deferred.resolve = function() { deferred.resolveWith(...) } + // deferred.reject = function() { deferred.rejectWith(...) } + deferred[ tuple[ 0 ] ] = function() { + deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments ); + return this; + }; + + // deferred.notifyWith = list.fireWith + // deferred.resolveWith = list.fireWith + // deferred.rejectWith = list.fireWith + deferred[ tuple[ 0 ] + "With" ] = list.fireWith; + } ); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( singleValue ) { + var + + // count of uncompleted subordinates + remaining = arguments.length, + + // count of unprocessed arguments + i = remaining, + + // subordinate fulfillment data + resolveContexts = Array( i ), + resolveValues = slice.call( arguments ), + + // the primary Deferred + primary = jQuery.Deferred(), + + // subordinate callback factory + updateFunc = function( i ) { + return function( value ) { + resolveContexts[ i ] = this; + resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; + if ( !( --remaining ) ) { + primary.resolveWith( resolveContexts, resolveValues ); + } + }; + }; + + // Single- and empty arguments are adopted like Promise.resolve + if ( remaining <= 1 ) { + adoptValue( singleValue, primary.done( updateFunc( i ) ).resolve, primary.reject, + !remaining ); + + // Use .then() to unwrap secondary thenables (cf. gh-3000) + if ( primary.state() === "pending" || + isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) { + + return primary.then(); + } + } + + // Multiple arguments are aggregated like Promise.all array elements + while ( i-- ) { + adoptValue( resolveValues[ i ], updateFunc( i ), primary.reject ); + } + + return primary.promise(); + } +} ); + + +// These usually indicate a programmer mistake during development, +// warn about them ASAP rather than swallowing them by default. +var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/; + +jQuery.Deferred.exceptionHook = function( error, stack ) { + + // Support: IE 8 - 9 only + // Console exists when dev tools are open, which can happen at any time + if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) { + window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack ); + } +}; + + + + +jQuery.readyException = function( error ) { + window.setTimeout( function() { + throw error; + } ); +}; + + + + +// The deferred used on DOM ready +var readyList = jQuery.Deferred(); + +jQuery.fn.ready = function( fn ) { + + readyList + .then( fn ) + + // Wrap jQuery.readyException in a function so that the lookup + // happens at the time of error handling instead of callback + // registration. + .catch( function( error ) { + jQuery.readyException( error ); + } ); + + return this; +}; + +jQuery.extend( { + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Handle when the DOM is ready + ready: function( wait ) { + + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { + return; + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + } +} ); + +jQuery.ready.then = readyList.then; + +// The ready event handler and self cleanup method +function completed() { + document.removeEventListener( "DOMContentLoaded", completed ); + window.removeEventListener( "load", completed ); + jQuery.ready(); +} + +// Catch cases where $(document).ready() is called +// after the browser event has already occurred. +// Support: IE <=9 - 10 only +// Older IE sometimes signals "interactive" too soon +if ( document.readyState === "complete" || + ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) { + + // Handle it asynchronously to allow scripts the opportunity to delay ready + window.setTimeout( jQuery.ready ); + +} else { + + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed ); +} + + + + +// Multifunctional method to get and set values of a collection +// The value/s can optionally be executed if it's a function +var access = function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + len = elems.length, + bulk = key == null; + + // Sets many values + if ( toType( key ) === "object" ) { + chainable = true; + for ( i in key ) { + access( elems, fn, i, key[ i ], true, emptyGet, raw ); + } + + // Sets one value + } else if ( value !== undefined ) { + chainable = true; + + if ( !isFunction( value ) ) { + raw = true; + } + + if ( bulk ) { + + // Bulk operations run against the entire set + if ( raw ) { + fn.call( elems, value ); + fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, _key, value ) { + return bulk.call( jQuery( elem ), value ); + }; + } + } + + if ( fn ) { + for ( ; i < len; i++ ) { + fn( + elems[ i ], key, raw ? + value : + value.call( elems[ i ], i, fn( elems[ i ], key ) ) + ); + } + } + } + + if ( chainable ) { + return elems; + } + + // Gets + if ( bulk ) { + return fn.call( elems ); + } + + return len ? fn( elems[ 0 ], key ) : emptyGet; +}; + + +// Matches dashed string for camelizing +var rmsPrefix = /^-ms-/, + rdashAlpha = /-([a-z])/g; + +// Used by camelCase as callback to replace() +function fcamelCase( _all, letter ) { + return letter.toUpperCase(); +} + +// Convert dashed to camelCase; used by the css and data modules +// Support: IE <=9 - 11, Edge 12 - 15 +// Microsoft forgot to hump their vendor prefix (#9572) +function camelCase( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); +} +var acceptData = function( owner ) { + + // Accepts only: + // - Node + // - Node.ELEMENT_NODE + // - Node.DOCUMENT_NODE + // - Object + // - Any + return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); +}; + + + + +function Data() { + this.expando = jQuery.expando + Data.uid++; +} + +Data.uid = 1; + +Data.prototype = { + + cache: function( owner ) { + + // Check if the owner object already has a cache + var value = owner[ this.expando ]; + + // If not, create one + if ( !value ) { + value = {}; + + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return an empty object. + if ( acceptData( owner ) ) { + + // If it is a node unlikely to be stringify-ed or looped over + // use plain assignment + if ( owner.nodeType ) { + owner[ this.expando ] = value; + + // Otherwise secure it in a non-enumerable property + // configurable must be true to allow the property to be + // deleted when data is removed + } else { + Object.defineProperty( owner, this.expando, { + value: value, + configurable: true + } ); + } + } + } + + return value; + }, + set: function( owner, data, value ) { + var prop, + cache = this.cache( owner ); + + // Handle: [ owner, key, value ] args + // Always use camelCase key (gh-2257) + if ( typeof data === "string" ) { + cache[ camelCase( data ) ] = value; + + // Handle: [ owner, { properties } ] args + } else { + + // Copy the properties one-by-one to the cache object + for ( prop in data ) { + cache[ camelCase( prop ) ] = data[ prop ]; + } + } + return cache; + }, + get: function( owner, key ) { + return key === undefined ? + this.cache( owner ) : + + // Always use camelCase key (gh-2257) + owner[ this.expando ] && owner[ this.expando ][ camelCase( key ) ]; + }, + access: function( owner, key, value ) { + + // In cases where either: + // + // 1. No key was specified + // 2. A string key was specified, but no value provided + // + // Take the "read" path and allow the get method to determine + // which value to return, respectively either: + // + // 1. The entire cache object + // 2. The data stored at the key + // + if ( key === undefined || + ( ( key && typeof key === "string" ) && value === undefined ) ) { + + return this.get( owner, key ); + } + + // When the key is not a string, or both a key and value + // are specified, set or extend (existing objects) with either: + // + // 1. An object of properties + // 2. A key and value + // + this.set( owner, key, value ); + + // Since the "set" path can have two possible entry points + // return the expected data based on which path was taken[*] + return value !== undefined ? value : key; + }, + remove: function( owner, key ) { + var i, + cache = owner[ this.expando ]; + + if ( cache === undefined ) { + return; + } + + if ( key !== undefined ) { + + // Support array or space separated string of keys + if ( Array.isArray( key ) ) { + + // If key is an array of keys... + // We always set camelCase keys, so remove that. + key = key.map( camelCase ); + } else { + key = camelCase( key ); + + // If a key with the spaces exists, use it. + // Otherwise, create an array by matching non-whitespace + key = key in cache ? + [ key ] : + ( key.match( rnothtmlwhite ) || [] ); + } + + i = key.length; + + while ( i-- ) { + delete cache[ key[ i ] ]; + } + } + + // Remove the expando if there's no more data + if ( key === undefined || jQuery.isEmptyObject( cache ) ) { + + // Support: Chrome <=35 - 45 + // Webkit & Blink performance suffers when deleting properties + // from DOM nodes, so set to undefined instead + // https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted) + if ( owner.nodeType ) { + owner[ this.expando ] = undefined; + } else { + delete owner[ this.expando ]; + } + } + }, + hasData: function( owner ) { + var cache = owner[ this.expando ]; + return cache !== undefined && !jQuery.isEmptyObject( cache ); + } +}; +var dataPriv = new Data(); + +var dataUser = new Data(); + + + +// Implementation Summary +// +// 1. Enforce API surface and semantic compatibility with 1.9.x branch +// 2. Improve the module's maintainability by reducing the storage +// paths to a single mechanism. +// 3. Use the same single mechanism to support "private" and "user" data. +// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) +// 5. Avoid exposing implementation details on user objects (eg. expando properties) +// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 + +var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, + rmultiDash = /[A-Z]/g; + +function getData( data ) { + if ( data === "true" ) { + return true; + } + + if ( data === "false" ) { + return false; + } + + if ( data === "null" ) { + return null; + } + + // Only convert to a number if it doesn't change the string + if ( data === +data + "" ) { + return +data; + } + + if ( rbrace.test( data ) ) { + return JSON.parse( data ); + } + + return data; +} + +function dataAttr( elem, key, data ) { + var name; + + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase(); + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = getData( data ); + } catch ( e ) {} + + // Make sure we set the data so it isn't changed later + dataUser.set( elem, key, data ); + } else { + data = undefined; + } + } + return data; +} + +jQuery.extend( { + hasData: function( elem ) { + return dataUser.hasData( elem ) || dataPriv.hasData( elem ); + }, + + data: function( elem, name, data ) { + return dataUser.access( elem, name, data ); + }, + + removeData: function( elem, name ) { + dataUser.remove( elem, name ); + }, + + // TODO: Now that all calls to _data and _removeData have been replaced + // with direct calls to dataPriv methods, these can be deprecated. + _data: function( elem, name, data ) { + return dataPriv.access( elem, name, data ); + }, + + _removeData: function( elem, name ) { + dataPriv.remove( elem, name ); + } +} ); + +jQuery.fn.extend( { + data: function( key, value ) { + var i, name, data, + elem = this[ 0 ], + attrs = elem && elem.attributes; + + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = dataUser.get( elem ); + + if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) { + i = attrs.length; + while ( i-- ) { + + // Support: IE 11 only + // The attrs elements can be null (#14894) + if ( attrs[ i ] ) { + name = attrs[ i ].name; + if ( name.indexOf( "data-" ) === 0 ) { + name = camelCase( name.slice( 5 ) ); + dataAttr( elem, name, data[ name ] ); + } + } + } + dataPriv.set( elem, "hasDataAttrs", true ); + } + } + + return data; + } + + // Sets multiple values + if ( typeof key === "object" ) { + return this.each( function() { + dataUser.set( this, key ); + } ); + } + + return access( this, function( value ) { + var data; + + // The calling jQuery object (element matches) is not empty + // (and therefore has an element appears at this[ 0 ]) and the + // `value` parameter was not undefined. An empty jQuery object + // will result in `undefined` for elem = this[ 0 ] which will + // throw an exception if an attempt to read a data cache is made. + if ( elem && value === undefined ) { + + // Attempt to get data from the cache + // The key will always be camelCased in Data + data = dataUser.get( elem, key ); + if ( data !== undefined ) { + return data; + } + + // Attempt to "discover" the data in + // HTML5 custom data-* attrs + data = dataAttr( elem, key ); + if ( data !== undefined ) { + return data; + } + + // We tried really hard, but the data doesn't exist. + return; + } + + // Set the data... + this.each( function() { + + // We always store the camelCased key + dataUser.set( this, key, value ); + } ); + }, null, value, arguments.length > 1, null, true ); + }, + + removeData: function( key ) { + return this.each( function() { + dataUser.remove( this, key ); + } ); + } +} ); + + +jQuery.extend( { + queue: function( elem, type, data ) { + var queue; + + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = dataPriv.get( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || Array.isArray( data ) ) { + queue = dataPriv.access( elem, type, jQuery.makeArray( data ) ); + } else { + queue.push( data ); + } + } + return queue || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } + + if ( fn ) { + + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + // Clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); + } + + if ( !startLength && hooks ) { + hooks.empty.fire(); + } + }, + + // Not public - generate a queueHooks object, or return the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return dataPriv.get( elem, key ) || dataPriv.access( elem, key, { + empty: jQuery.Callbacks( "once memory" ).add( function() { + dataPriv.remove( elem, [ type + "queue", key ] ); + } ) + } ); + } +} ); + +jQuery.fn.extend( { + queue: function( type, data ) { + var setter = 2; + + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; + } + + if ( arguments.length < setter ) { + return jQuery.queue( this[ 0 ], type ); + } + + return data === undefined ? + this : + this.each( function() { + var queue = jQuery.queue( this, type, data ); + + // Ensure a hooks for this queue + jQuery._queueHooks( this, type ); + + if ( type === "fx" && queue[ 0 ] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + } ); + }, + dequeue: function( type ) { + return this.each( function() { + jQuery.dequeue( this, type ); + } ); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; + } + type = type || "fx"; + + while ( i-- ) { + tmp = dataPriv.get( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } + } + resolve(); + return defer.promise( obj ); + } +} ); +var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source; + +var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ); + + +var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; + +var documentElement = document.documentElement; + + + + var isAttached = function( elem ) { + return jQuery.contains( elem.ownerDocument, elem ); + }, + composed = { composed: true }; + + // Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only + // Check attachment across shadow DOM boundaries when possible (gh-3504) + // Support: iOS 10.0-10.2 only + // Early iOS 10 versions support `attachShadow` but not `getRootNode`, + // leading to errors. We need to check for `getRootNode`. + if ( documentElement.getRootNode ) { + isAttached = function( elem ) { + return jQuery.contains( elem.ownerDocument, elem ) || + elem.getRootNode( composed ) === elem.ownerDocument; + }; + } +var isHiddenWithinTree = function( elem, el ) { + + // isHiddenWithinTree might be called from jQuery#filter function; + // in that case, element will be second argument + elem = el || elem; + + // Inline style trumps all + return elem.style.display === "none" || + elem.style.display === "" && + + // Otherwise, check computed style + // Support: Firefox <=43 - 45 + // Disconnected elements can have computed display: none, so first confirm that elem is + // in the document. + isAttached( elem ) && + + jQuery.css( elem, "display" ) === "none"; + }; + + + +function adjustCSS( elem, prop, valueParts, tween ) { + var adjusted, scale, + maxIterations = 20, + currentValue = tween ? + function() { + return tween.cur(); + } : + function() { + return jQuery.css( elem, prop, "" ); + }, + initial = currentValue(), + unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ), + + // Starting value computation is required for potential unit mismatches + initialInUnit = elem.nodeType && + ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) && + rcssNum.exec( jQuery.css( elem, prop ) ); + + if ( initialInUnit && initialInUnit[ 3 ] !== unit ) { + + // Support: Firefox <=54 + // Halve the iteration target value to prevent interference from CSS upper bounds (gh-2144) + initial = initial / 2; + + // Trust units reported by jQuery.css + unit = unit || initialInUnit[ 3 ]; + + // Iteratively approximate from a nonzero starting point + initialInUnit = +initial || 1; + + while ( maxIterations-- ) { + + // Evaluate and update our best guess (doubling guesses that zero out). + // Finish if the scale equals or crosses 1 (making the old*new product non-positive). + jQuery.style( elem, prop, initialInUnit + unit ); + if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) { + maxIterations = 0; + } + initialInUnit = initialInUnit / scale; + + } + + initialInUnit = initialInUnit * 2; + jQuery.style( elem, prop, initialInUnit + unit ); + + // Make sure we update the tween properties later on + valueParts = valueParts || []; + } + + if ( valueParts ) { + initialInUnit = +initialInUnit || +initial || 0; + + // Apply relative offset (+=/-=) if specified + adjusted = valueParts[ 1 ] ? + initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] : + +valueParts[ 2 ]; + if ( tween ) { + tween.unit = unit; + tween.start = initialInUnit; + tween.end = adjusted; + } + } + return adjusted; +} + + +var defaultDisplayMap = {}; + +function getDefaultDisplay( elem ) { + var temp, + doc = elem.ownerDocument, + nodeName = elem.nodeName, + display = defaultDisplayMap[ nodeName ]; + + if ( display ) { + return display; + } + + temp = doc.body.appendChild( doc.createElement( nodeName ) ); + display = jQuery.css( temp, "display" ); + + temp.parentNode.removeChild( temp ); + + if ( display === "none" ) { + display = "block"; + } + defaultDisplayMap[ nodeName ] = display; + + return display; +} + +function showHide( elements, show ) { + var display, elem, + values = [], + index = 0, + length = elements.length; + + // Determine new display value for elements that need to change + for ( ; index < length; index++ ) { + elem = elements[ index ]; + if ( !elem.style ) { + continue; + } + + display = elem.style.display; + if ( show ) { + + // Since we force visibility upon cascade-hidden elements, an immediate (and slow) + // check is required in this first loop unless we have a nonempty display value (either + // inline or about-to-be-restored) + if ( display === "none" ) { + values[ index ] = dataPriv.get( elem, "display" ) || null; + if ( !values[ index ] ) { + elem.style.display = ""; + } + } + if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) { + values[ index ] = getDefaultDisplay( elem ); + } + } else { + if ( display !== "none" ) { + values[ index ] = "none"; + + // Remember what we're overwriting + dataPriv.set( elem, "display", display ); + } + } + } + + // Set the display of the elements in a second loop to avoid constant reflow + for ( index = 0; index < length; index++ ) { + if ( values[ index ] != null ) { + elements[ index ].style.display = values[ index ]; + } + } + + return elements; +} + +jQuery.fn.extend( { + show: function() { + return showHide( this, true ); + }, + hide: function() { + return showHide( this ); + }, + toggle: function( state ) { + if ( typeof state === "boolean" ) { + return state ? this.show() : this.hide(); + } + + return this.each( function() { + if ( isHiddenWithinTree( this ) ) { + jQuery( this ).show(); + } else { + jQuery( this ).hide(); + } + } ); + } +} ); +var rcheckableType = ( /^(?:checkbox|radio)$/i ); + +var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]*)/i ); + +var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i ); + + + +( function() { + var fragment = document.createDocumentFragment(), + div = fragment.appendChild( document.createElement( "div" ) ), + input = document.createElement( "input" ); + + // Support: Android 4.0 - 4.3 only + // Check state lost if the name is set (#11217) + // Support: Windows Web Apps (WWA) + // `name` and `type` must use .setAttribute for WWA (#14901) + input.setAttribute( "type", "radio" ); + input.setAttribute( "checked", "checked" ); + input.setAttribute( "name", "t" ); + + div.appendChild( input ); + + // Support: Android <=4.1 only + // Older WebKit doesn't clone checked state correctly in fragments + support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Support: IE <=11 only + // Make sure textarea (and checkbox) defaultValue is properly cloned + div.innerHTML = "<textarea>x</textarea>"; + support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; + + // Support: IE <=9 only + // IE <=9 replaces <option> tags with their contents when inserted outside of + // the select element. + div.innerHTML = "<option></option>"; + support.option = !!div.lastChild; +} )(); + + +// We have to close these tags to support XHTML (#13200) +var wrapMap = { + + // XHTML parsers do not magically insert elements in the + // same way that tag soup parsers do. So we cannot shorten + // this by omitting <tbody> or other required elements. + thead: [ 1, "<table>", "</table>" ], + col: [ 2, "<table><colgroup>", "</colgroup></table>" ], + tr: [ 2, "<table><tbody>", "</tbody></table>" ], + td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ], + + _default: [ 0, "", "" ] +}; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// Support: IE <=9 only +if ( !support.option ) { + wrapMap.optgroup = wrapMap.option = [ 1, "<select multiple='multiple'>", "</select>" ]; +} + + +function getAll( context, tag ) { + + // Support: IE <=9 - 11 only + // Use typeof to avoid zero-argument method invocation on host objects (#15151) + var ret; + + if ( typeof context.getElementsByTagName !== "undefined" ) { + ret = context.getElementsByTagName( tag || "*" ); + + } else if ( typeof context.querySelectorAll !== "undefined" ) { + ret = context.querySelectorAll( tag || "*" ); + + } else { + ret = []; + } + + if ( tag === undefined || tag && nodeName( context, tag ) ) { + return jQuery.merge( [ context ], ret ); + } + + return ret; +} + + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + dataPriv.set( + elems[ i ], + "globalEval", + !refElements || dataPriv.get( refElements[ i ], "globalEval" ) + ); + } +} + + +var rhtml = /<|&#?\w+;/; + +function buildFragment( elems, context, scripts, selection, ignored ) { + var elem, tmp, tag, wrap, attached, j, + fragment = context.createDocumentFragment(), + nodes = [], + i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( toType( elem ) === "object" ) { + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || fragment.appendChild( context.createElement( "div" ) ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ]; + + // Descend through wrappers to the right content + j = wrap[ 0 ]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, tmp.childNodes ); + + // Remember the top-level container + tmp = fragment.firstChild; + + // Ensure the created nodes are orphaned (#12392) + tmp.textContent = ""; + } + } + } + + // Remove wrapper from fragment + fragment.textContent = ""; + + i = 0; + while ( ( elem = nodes[ i++ ] ) ) { + + // Skip elements already in the context collection (trac-4087) + if ( selection && jQuery.inArray( elem, selection ) > -1 ) { + if ( ignored ) { + ignored.push( elem ); + } + continue; + } + + attached = isAttached( elem ); + + // Append to fragment + tmp = getAll( fragment.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( attached ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( ( elem = tmp[ j++ ] ) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + return fragment; +} + + +var rtypenamespace = /^([^.]*)(?:\.(.+)|)/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +// Support: IE <=9 - 11+ +// focus() and blur() are asynchronous, except when they are no-op. +// So expect focus to be synchronous when the element is already active, +// and blur to be synchronous when the element is not already active. +// (focus and blur are always synchronous in other supported browsers, +// this just defines when we can count on it). +function expectSync( elem, type ) { + return ( elem === safeActiveElement() ) === ( type === "focus" ); +} + +// Support: IE <=9 only +// Accessing document.activeElement can throw unexpectedly +// https://bugs.jquery.com/ticket/13393 +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +function on( elem, types, selector, data, fn, one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + on( elem, type, selector, data, types[ type ], one ); + } + return elem; + } + + if ( data == null && fn == null ) { + + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return elem; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return elem.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + } ); +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + + var handleObjIn, eventHandle, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = dataPriv.get( elem ); + + // Only attach events to objects that accept data + if ( !acceptData( elem ) ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Ensure that invalid selectors throw exceptions at attach time + // Evaluate against documentElement in case elem is a non-element node (e.g., document) + if ( selector ) { + jQuery.find.matchesSelector( documentElement, selector ); + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !( events = elemData.events ) ) { + events = elemData.events = Object.create( null ); + } + if ( !( eventHandle = elemData.handle ) ) { + eventHandle = elemData.handle = function( e ) { + + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ? + jQuery.event.dispatch.apply( elem, arguments ) : undefined; + }; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( rnothtmlwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend( { + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join( "." ) + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !( handlers = events[ type ] ) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener if the special events handler returns false + if ( !special.setup || + special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var j, origCount, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = dataPriv.hasData( elem ) && dataPriv.get( elem ); + + if ( !elemData || !( events = elemData.events ) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( rnothtmlwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[ 2 ] && + new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || + selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || + special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove data and the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + dataPriv.remove( elem, "handle events" ); + } + }, + + dispatch: function( nativeEvent ) { + + var i, j, ret, matched, handleObj, handlerQueue, + args = new Array( arguments.length ), + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( nativeEvent ), + + handlers = ( + dataPriv.get( this, "events" ) || Object.create( null ) + )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[ 0 ] = event; + + for ( i = 1; i < arguments.length; i++ ) { + args[ i ] = arguments[ i ]; + } + + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( ( handleObj = matched.handlers[ j++ ] ) && + !event.isImmediatePropagationStopped() ) { + + // If the event is namespaced, then each handler is only invoked if it is + // specially universal or its namespaces are a superset of the event's. + if ( !event.rnamespace || handleObj.namespace === false || + event.rnamespace.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle || + handleObj.handler ).apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( ( event.result = ret ) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var i, handleObj, sel, matchedHandlers, matchedSelectors, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Find delegate handlers + if ( delegateCount && + + // Support: IE <=9 + // Black-hole SVG <use> instance trees (trac-13180) + cur.nodeType && + + // Support: Firefox <=42 + // Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861) + // https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click + // Support: IE 11 only + // ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343) + !( event.type === "click" && event.button >= 1 ) ) { + + for ( ; cur !== this; cur = cur.parentNode || this ) { + + // Don't check non-elements (#13208) + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) { + matchedHandlers = []; + matchedSelectors = {}; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matchedSelectors[ sel ] === undefined ) { + matchedSelectors[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) > -1 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matchedSelectors[ sel ] ) { + matchedHandlers.push( handleObj ); + } + } + if ( matchedHandlers.length ) { + handlerQueue.push( { elem: cur, handlers: matchedHandlers } ); + } + } + } + } + + // Add the remaining (directly-bound) handlers + cur = this; + if ( delegateCount < handlers.length ) { + handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } ); + } + + return handlerQueue; + }, + + addProp: function( name, hook ) { + Object.defineProperty( jQuery.Event.prototype, name, { + enumerable: true, + configurable: true, + + get: isFunction( hook ) ? + function() { + if ( this.originalEvent ) { + return hook( this.originalEvent ); + } + } : + function() { + if ( this.originalEvent ) { + return this.originalEvent[ name ]; + } + }, + + set: function( value ) { + Object.defineProperty( this, name, { + enumerable: true, + configurable: true, + writable: true, + value: value + } ); + } + } ); + }, + + fix: function( originalEvent ) { + return originalEvent[ jQuery.expando ] ? + originalEvent : + new jQuery.Event( originalEvent ); + }, + + special: { + load: { + + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + click: { + + // Utilize native event to ensure correct state for checkable inputs + setup: function( data ) { + + // For mutual compressibility with _default, replace `this` access with a local var. + // `|| data` is dead code meant only to preserve the variable through minification. + var el = this || data; + + // Claim the first handler + if ( rcheckableType.test( el.type ) && + el.click && nodeName( el, "input" ) ) { + + // dataPriv.set( el, "click", ... ) + leverageNative( el, "click", returnTrue ); + } + + // Return false to allow normal processing in the caller + return false; + }, + trigger: function( data ) { + + // For mutual compressibility with _default, replace `this` access with a local var. + // `|| data` is dead code meant only to preserve the variable through minification. + var el = this || data; + + // Force setup before triggering a click + if ( rcheckableType.test( el.type ) && + el.click && nodeName( el, "input" ) ) { + + leverageNative( el, "click" ); + } + + // Return non-false to allow normal event-path propagation + return true; + }, + + // For cross-browser consistency, suppress native .click() on links + // Also prevent it if we're currently inside a leveraged native-event stack + _default: function( event ) { + var target = event.target; + return rcheckableType.test( target.type ) && + target.click && nodeName( target, "input" ) && + dataPriv.get( target, "click" ) || + nodeName( target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Support: Firefox 20+ + // Firefox doesn't alert if the returnValue field is not set. + if ( event.result !== undefined && event.originalEvent ) { + event.originalEvent.returnValue = event.result; + } + } + } + } +}; + +// Ensure the presence of an event listener that handles manually-triggered +// synthetic events by interrupting progress until reinvoked in response to +// *native* events that it fires directly, ensuring that state changes have +// already occurred before other listeners are invoked. +function leverageNative( el, type, expectSync ) { + + // Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add + if ( !expectSync ) { + if ( dataPriv.get( el, type ) === undefined ) { + jQuery.event.add( el, type, returnTrue ); + } + return; + } + + // Register the controller as a special universal handler for all event namespaces + dataPriv.set( el, type, false ); + jQuery.event.add( el, type, { + namespace: false, + handler: function( event ) { + var notAsync, result, + saved = dataPriv.get( this, type ); + + if ( ( event.isTrigger & 1 ) && this[ type ] ) { + + // Interrupt processing of the outer synthetic .trigger()ed event + // Saved data should be false in such cases, but might be a leftover capture object + // from an async native handler (gh-4350) + if ( !saved.length ) { + + // Store arguments for use when handling the inner native event + // There will always be at least one argument (an event object), so this array + // will not be confused with a leftover capture object. + saved = slice.call( arguments ); + dataPriv.set( this, type, saved ); + + // Trigger the native event and capture its result + // Support: IE <=9 - 11+ + // focus() and blur() are asynchronous + notAsync = expectSync( this, type ); + this[ type ](); + result = dataPriv.get( this, type ); + if ( saved !== result || notAsync ) { + dataPriv.set( this, type, false ); + } else { + result = {}; + } + if ( saved !== result ) { + + // Cancel the outer synthetic event + event.stopImmediatePropagation(); + event.preventDefault(); + + // Support: Chrome 86+ + // In Chrome, if an element having a focusout handler is blurred by + // clicking outside of it, it invokes the handler synchronously. If + // that handler calls `.remove()` on the element, the data is cleared, + // leaving `result` undefined. We need to guard against this. + return result && result.value; + } + + // If this is an inner synthetic event for an event with a bubbling surrogate + // (focus or blur), assume that the surrogate already propagated from triggering the + // native event and prevent that from happening again here. + // This technically gets the ordering wrong w.r.t. to `.trigger()` (in which the + // bubbling surrogate propagates *after* the non-bubbling base), but that seems + // less bad than duplication. + } else if ( ( jQuery.event.special[ type ] || {} ).delegateType ) { + event.stopPropagation(); + } + + // If this is a native event triggered above, everything is now in order + // Fire an inner synthetic event with the original arguments + } else if ( saved.length ) { + + // ...and capture the result + dataPriv.set( this, type, { + value: jQuery.event.trigger( + + // Support: IE <=9 - 11+ + // Extend with the prototype to reset the above stopImmediatePropagation() + jQuery.extend( saved[ 0 ], jQuery.Event.prototype ), + saved.slice( 1 ), + this + ) + } ); + + // Abort handling of the native event + event.stopImmediatePropagation(); + } + } + } ); +} + +jQuery.removeEvent = function( elem, type, handle ) { + + // This "if" is needed for plain objects + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle ); + } +}; + +jQuery.Event = function( src, props ) { + + // Allow instantiation without the 'new' keyword + if ( !( this instanceof jQuery.Event ) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = src.defaultPrevented || + src.defaultPrevented === undefined && + + // Support: Android <=2.3 only + src.returnValue === false ? + returnTrue : + returnFalse; + + // Create target properties + // Support: Safari <=6 - 7 only + // Target should not be a text node (#504, #13143) + this.target = ( src.target && src.target.nodeType === 3 ) ? + src.target.parentNode : + src.target; + + this.currentTarget = src.currentTarget; + this.relatedTarget = src.relatedTarget; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || Date.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + constructor: jQuery.Event, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + isSimulated: false, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + + if ( e && !this.isSimulated ) { + e.preventDefault(); + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + + if ( e && !this.isSimulated ) { + e.stopPropagation(); + } + }, + stopImmediatePropagation: function() { + var e = this.originalEvent; + + this.isImmediatePropagationStopped = returnTrue; + + if ( e && !this.isSimulated ) { + e.stopImmediatePropagation(); + } + + this.stopPropagation(); + } +}; + +// Includes all common event props including KeyEvent and MouseEvent specific props +jQuery.each( { + altKey: true, + bubbles: true, + cancelable: true, + changedTouches: true, + ctrlKey: true, + detail: true, + eventPhase: true, + metaKey: true, + pageX: true, + pageY: true, + shiftKey: true, + view: true, + "char": true, + code: true, + charCode: true, + key: true, + keyCode: true, + button: true, + buttons: true, + clientX: true, + clientY: true, + offsetX: true, + offsetY: true, + pointerId: true, + pointerType: true, + screenX: true, + screenY: true, + targetTouches: true, + toElement: true, + touches: true, + which: true +}, jQuery.event.addProp ); + +jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) { + jQuery.event.special[ type ] = { + + // Utilize native event if possible so blur/focus sequence is correct + setup: function() { + + // Claim the first handler + // dataPriv.set( this, "focus", ... ) + // dataPriv.set( this, "blur", ... ) + leverageNative( this, type, expectSync ); + + // Return false to allow normal processing in the caller + return false; + }, + trigger: function() { + + // Force setup before trigger + leverageNative( this, type ); + + // Return non-false to allow normal event-path propagation + return true; + }, + + // Suppress native focus or blur as it's already being fired + // in leverageNative. + _default: function() { + return true; + }, + + delegateType: delegateType + }; +} ); + +// Create mouseenter/leave events using mouseover/out and event-time checks +// so that event delegation works in jQuery. +// Do the same for pointerenter/pointerleave and pointerover/pointerout +// +// Support: Safari 7 only +// Safari sends mouseenter too often; see: +// https://bugs.chromium.org/p/chromium/issues/detail?id=470258 +// for the description of the bug (it existed in older Chrome versions as well). +jQuery.each( { + mouseenter: "mouseover", + mouseleave: "mouseout", + pointerenter: "pointerover", + pointerleave: "pointerout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // For mouseenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +} ); + +jQuery.fn.extend( { + + on: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn ); + }, + one: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? + handleObj.origType + "." + handleObj.namespace : + handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each( function() { + jQuery.event.remove( this, types, fn, selector ); + } ); + } +} ); + + +var + + // Support: IE <=10 - 11, Edge 12 - 13 only + // In IE/Edge using regex groups here causes severe slowdowns. + // See https://connect.microsoft.com/IE/feedback/details/1736512/ + rnoInnerhtml = /<script|<style|<link/i, + + // checked="checked" or checked + rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, + rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g; + +// Prefer a tbody over its parent table for containing new rows +function manipulationTarget( elem, content ) { + if ( nodeName( elem, "table" ) && + nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) { + + return jQuery( elem ).children( "tbody" )[ 0 ] || elem; + } + + return elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + if ( ( elem.type || "" ).slice( 0, 5 ) === "true/" ) { + elem.type = elem.type.slice( 5 ); + } else { + elem.removeAttribute( "type" ); + } + + return elem; +} + +function cloneCopyEvent( src, dest ) { + var i, l, type, pdataOld, udataOld, udataCur, events; + + if ( dest.nodeType !== 1 ) { + return; + } + + // 1. Copy private data: events, handlers, etc. + if ( dataPriv.hasData( src ) ) { + pdataOld = dataPriv.get( src ); + events = pdataOld.events; + + if ( events ) { + dataPriv.remove( dest, "handle events" ); + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + } + + // 2. Copy user data + if ( dataUser.hasData( src ) ) { + udataOld = dataUser.access( src ); + udataCur = jQuery.extend( {}, udataOld ); + + dataUser.set( dest, udataCur ); + } +} + +// Fix IE bugs, see support tests +function fixInput( src, dest ) { + var nodeName = dest.nodeName.toLowerCase(); + + // Fails to persist the checked state of a cloned checkbox or radio button. + if ( nodeName === "input" && rcheckableType.test( src.type ) ) { + dest.checked = src.checked; + + // Fails to return the selected option to the default selected state when cloning options + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +function domManip( collection, args, callback, ignored ) { + + // Flatten any nested arrays + args = flat( args ); + + var fragment, first, scripts, hasScripts, node, doc, + i = 0, + l = collection.length, + iNoClone = l - 1, + value = args[ 0 ], + valueIsFunction = isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( valueIsFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return collection.each( function( index ) { + var self = collection.eq( index ); + if ( valueIsFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + domManip( self, args, callback, ignored ); + } ); + } + + if ( l ) { + fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + // Require either new content or an interest in ignored elements to invoke the callback + if ( first || ignored ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item + // instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( collection[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !dataPriv.access( node, "globalEval" ) && + jQuery.contains( doc, node ) ) { + + if ( node.src && ( node.type || "" ).toLowerCase() !== "module" ) { + + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl && !node.noModule ) { + jQuery._evalUrl( node.src, { + nonce: node.nonce || node.getAttribute( "nonce" ) + }, doc ); + } + } else { + DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc ); + } + } + } + } + } + } + + return collection; +} + +function remove( elem, selector, keepData ) { + var node, + nodes = selector ? jQuery.filter( selector, elem ) : elem, + i = 0; + + for ( ; ( node = nodes[ i ] ) != null; i++ ) { + if ( !keepData && node.nodeType === 1 ) { + jQuery.cleanData( getAll( node ) ); + } + + if ( node.parentNode ) { + if ( keepData && isAttached( node ) ) { + setGlobalEval( getAll( node, "script" ) ); + } + node.parentNode.removeChild( node ); + } + } + + return elem; +} + +jQuery.extend( { + htmlPrefilter: function( html ) { + return html; + }, + + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var i, l, srcElements, destElements, + clone = elem.cloneNode( true ), + inPage = isAttached( elem ); + + // Fix IE cloning issues + if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && + !jQuery.isXMLDoc( elem ) ) { + + // We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + fixInput( srcElements[ i ], destElements[ i ] ); + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + cloneCopyEvent( srcElements[ i ], destElements[ i ] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + // Return the cloned set + return clone; + }, + + cleanData: function( elems ) { + var data, elem, type, + special = jQuery.event.special, + i = 0; + + for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) { + if ( acceptData( elem ) ) { + if ( ( data = elem[ dataPriv.expando ] ) ) { + if ( data.events ) { + for ( type in data.events ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + + // Support: Chrome <=35 - 45+ + // Assign undefined instead of using delete, see Data#remove + elem[ dataPriv.expando ] = undefined; + } + if ( elem[ dataUser.expando ] ) { + + // Support: Chrome <=35 - 45+ + // Assign undefined instead of using delete, see Data#remove + elem[ dataUser.expando ] = undefined; + } + } + } + } +} ); + +jQuery.fn.extend( { + detach: function( selector ) { + return remove( this, selector, true ); + }, + + remove: function( selector ) { + return remove( this, selector ); + }, + + text: function( value ) { + return access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().each( function() { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + this.textContent = value; + } + } ); + }, null, value, arguments.length ); + }, + + append: function() { + return domManip( this, arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + } ); + }, + + prepend: function() { + return domManip( this, arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + } ); + }, + + before: function() { + return domManip( this, arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + } ); + }, + + after: function() { + return domManip( this, arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + } ); + }, + + empty: function() { + var elem, + i = 0; + + for ( ; ( elem = this[ i ] ) != null; i++ ) { + if ( elem.nodeType === 1 ) { + + // Prevent memory leaks + jQuery.cleanData( getAll( elem, false ) ); + + // Remove any remaining nodes + elem.textContent = ""; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map( function() { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + } ); + }, + + html: function( value ) { + return access( this, function( value ) { + var elem = this[ 0 ] || {}, + i = 0, + l = this.length; + + if ( value === undefined && elem.nodeType === 1 ) { + return elem.innerHTML; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + + value = jQuery.htmlPrefilter( value ); + + try { + for ( ; i < l; i++ ) { + elem = this[ i ] || {}; + + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch ( e ) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var ignored = []; + + // Make the changes, replacing each non-ignored context element with the new content + return domManip( this, arguments, function( elem ) { + var parent = this.parentNode; + + if ( jQuery.inArray( this, ignored ) < 0 ) { + jQuery.cleanData( getAll( this ) ); + if ( parent ) { + parent.replaceChild( elem, this ); + } + } + + // Force callback invocation + }, ignored ); + } +} ); + +jQuery.each( { + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1, + i = 0; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone( true ); + jQuery( insert[ i ] )[ original ]( elems ); + + // Support: Android <=4.0 only, PhantomJS 1 only + // .get() because push.apply(_, arraylike) throws on ancient WebKit + push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +} ); +var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" ); + +var getStyles = function( elem ) { + + // Support: IE <=11 only, Firefox <=30 (#15098, #14150) + // IE throws on elements created in popups + // FF meanwhile throws on frame elements through "defaultView.getComputedStyle" + var view = elem.ownerDocument.defaultView; + + if ( !view || !view.opener ) { + view = window; + } + + return view.getComputedStyle( elem ); + }; + +var swap = function( elem, options, callback ) { + var ret, name, + old = {}; + + // Remember the old values, and insert the new ones + for ( name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; + } + + ret = callback.call( elem ); + + // Revert the old values + for ( name in options ) { + elem.style[ name ] = old[ name ]; + } + + return ret; +}; + + +var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" ); + + + +( function() { + + // Executing both pixelPosition & boxSizingReliable tests require only one layout + // so they're executed at the same time to save the second computation. + function computeStyleTests() { + + // This is a singleton, we need to execute it only once + if ( !div ) { + return; + } + + container.style.cssText = "position:absolute;left:-11111px;width:60px;" + + "margin-top:1px;padding:0;border:0"; + div.style.cssText = + "position:relative;display:block;box-sizing:border-box;overflow:scroll;" + + "margin:auto;border:1px;padding:1px;" + + "width:60%;top:1%"; + documentElement.appendChild( container ).appendChild( div ); + + var divStyle = window.getComputedStyle( div ); + pixelPositionVal = divStyle.top !== "1%"; + + // Support: Android 4.0 - 4.3 only, Firefox <=3 - 44 + reliableMarginLeftVal = roundPixelMeasures( divStyle.marginLeft ) === 12; + + // Support: Android 4.0 - 4.3 only, Safari <=9.1 - 10.1, iOS <=7.0 - 9.3 + // Some styles come back with percentage values, even though they shouldn't + div.style.right = "60%"; + pixelBoxStylesVal = roundPixelMeasures( divStyle.right ) === 36; + + // Support: IE 9 - 11 only + // Detect misreporting of content dimensions for box-sizing:border-box elements + boxSizingReliableVal = roundPixelMeasures( divStyle.width ) === 36; + + // Support: IE 9 only + // Detect overflow:scroll screwiness (gh-3699) + // Support: Chrome <=64 + // Don't get tricked when zoom affects offsetWidth (gh-4029) + div.style.position = "absolute"; + scrollboxSizeVal = roundPixelMeasures( div.offsetWidth / 3 ) === 12; + + documentElement.removeChild( container ); + + // Nullify the div so it wouldn't be stored in the memory and + // it will also be a sign that checks already performed + div = null; + } + + function roundPixelMeasures( measure ) { + return Math.round( parseFloat( measure ) ); + } + + var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal, + reliableTrDimensionsVal, reliableMarginLeftVal, + container = document.createElement( "div" ), + div = document.createElement( "div" ); + + // Finish early in limited (non-browser) environments + if ( !div.style ) { + return; + } + + // Support: IE <=9 - 11 only + // Style of cloned element affects source element cloned (#8908) + div.style.backgroundClip = "content-box"; + div.cloneNode( true ).style.backgroundClip = ""; + support.clearCloneStyle = div.style.backgroundClip === "content-box"; + + jQuery.extend( support, { + boxSizingReliable: function() { + computeStyleTests(); + return boxSizingReliableVal; + }, + pixelBoxStyles: function() { + computeStyleTests(); + return pixelBoxStylesVal; + }, + pixelPosition: function() { + computeStyleTests(); + return pixelPositionVal; + }, + reliableMarginLeft: function() { + computeStyleTests(); + return reliableMarginLeftVal; + }, + scrollboxSize: function() { + computeStyleTests(); + return scrollboxSizeVal; + }, + + // Support: IE 9 - 11+, Edge 15 - 18+ + // IE/Edge misreport `getComputedStyle` of table rows with width/height + // set in CSS while `offset*` properties report correct values. + // Behavior in IE 9 is more subtle than in newer versions & it passes + // some versions of this test; make sure not to make it pass there! + // + // Support: Firefox 70+ + // Only Firefox includes border widths + // in computed dimensions. (gh-4529) + reliableTrDimensions: function() { + var table, tr, trChild, trStyle; + if ( reliableTrDimensionsVal == null ) { + table = document.createElement( "table" ); + tr = document.createElement( "tr" ); + trChild = document.createElement( "div" ); + + table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate"; + tr.style.cssText = "border:1px solid"; + + // Support: Chrome 86+ + // Height set through cssText does not get applied. + // Computed height then comes back as 0. + tr.style.height = "1px"; + trChild.style.height = "9px"; + + // Support: Android 8 Chrome 86+ + // In our bodyBackground.html iframe, + // display for all div elements is set to "inline", + // which causes a problem only in Android 8 Chrome 86. + // Ensuring the div is display: block + // gets around this issue. + trChild.style.display = "block"; + + documentElement + .appendChild( table ) + .appendChild( tr ) + .appendChild( trChild ); + + trStyle = window.getComputedStyle( tr ); + reliableTrDimensionsVal = ( parseInt( trStyle.height, 10 ) + + parseInt( trStyle.borderTopWidth, 10 ) + + parseInt( trStyle.borderBottomWidth, 10 ) ) === tr.offsetHeight; + + documentElement.removeChild( table ); + } + return reliableTrDimensionsVal; + } + } ); +} )(); + + +function curCSS( elem, name, computed ) { + var width, minWidth, maxWidth, ret, + + // Support: Firefox 51+ + // Retrieving style before computed somehow + // fixes an issue with getting wrong values + // on detached elements + style = elem.style; + + computed = computed || getStyles( elem ); + + // getPropertyValue is needed for: + // .css('filter') (IE 9 only, #12537) + // .css('--customProperty) (#3144) + if ( computed ) { + ret = computed.getPropertyValue( name ) || computed[ name ]; + + if ( ret === "" && !isAttached( elem ) ) { + ret = jQuery.style( elem, name ); + } + + // A tribute to the "awesome hack by Dean Edwards" + // Android Browser returns percentage for some values, + // but width seems to be reliably pixels. + // This is against the CSSOM draft spec: + // https://drafts.csswg.org/cssom/#resolved-values + if ( !support.pixelBoxStyles() && rnumnonpx.test( ret ) && rboxStyle.test( name ) ) { + + // Remember the original values + width = style.width; + minWidth = style.minWidth; + maxWidth = style.maxWidth; + + // Put in the new values to get a computed value out + style.minWidth = style.maxWidth = style.width = ret; + ret = computed.width; + + // Revert the changed values + style.width = width; + style.minWidth = minWidth; + style.maxWidth = maxWidth; + } + } + + return ret !== undefined ? + + // Support: IE <=9 - 11 only + // IE returns zIndex value as an integer. + ret + "" : + ret; +} + + +function addGetHookIf( conditionFn, hookFn ) { + + // Define the hook, we'll check on the first run if it's really needed. + return { + get: function() { + if ( conditionFn() ) { + + // Hook not needed (or it's not possible to use it due + // to missing dependency), remove it. + delete this.get; + return; + } + + // Hook needed; redefine it so that the support test is not executed again. + return ( this.get = hookFn ).apply( this, arguments ); + } + }; +} + + +var cssPrefixes = [ "Webkit", "Moz", "ms" ], + emptyStyle = document.createElement( "div" ).style, + vendorProps = {}; + +// Return a vendor-prefixed property or undefined +function vendorPropName( name ) { + + // Check for vendor prefixed names + var capName = name[ 0 ].toUpperCase() + name.slice( 1 ), + i = cssPrefixes.length; + + while ( i-- ) { + name = cssPrefixes[ i ] + capName; + if ( name in emptyStyle ) { + return name; + } + } +} + +// Return a potentially-mapped jQuery.cssProps or vendor prefixed property +function finalPropName( name ) { + var final = jQuery.cssProps[ name ] || vendorProps[ name ]; + + if ( final ) { + return final; + } + if ( name in emptyStyle ) { + return name; + } + return vendorProps[ name ] = vendorPropName( name ) || name; +} + + +var + + // Swappable if display is none or starts with table + // except "table", "table-cell", or "table-caption" + // See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display + rdisplayswap = /^(none|table(?!-c[ea]).+)/, + rcustomProp = /^--/, + cssShow = { position: "absolute", visibility: "hidden", display: "block" }, + cssNormalTransform = { + letterSpacing: "0", + fontWeight: "400" + }; + +function setPositiveNumber( _elem, value, subtract ) { + + // Any relative (+/-) values have already been + // normalized at this point + var matches = rcssNum.exec( value ); + return matches ? + + // Guard against undefined "subtract", e.g., when used as in cssHooks + Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) : + value; +} + +function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computedVal ) { + var i = dimension === "width" ? 1 : 0, + extra = 0, + delta = 0; + + // Adjustment may not be necessary + if ( box === ( isBorderBox ? "border" : "content" ) ) { + return 0; + } + + for ( ; i < 4; i += 2 ) { + + // Both box models exclude margin + if ( box === "margin" ) { + delta += jQuery.css( elem, box + cssExpand[ i ], true, styles ); + } + + // If we get here with a content-box, we're seeking "padding" or "border" or "margin" + if ( !isBorderBox ) { + + // Add padding + delta += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); + + // For "border" or "margin", add border + if ( box !== "padding" ) { + delta += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); + + // But still keep track of it otherwise + } else { + extra += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); + } + + // If we get here with a border-box (content + padding + border), we're seeking "content" or + // "padding" or "margin" + } else { + + // For "content", subtract padding + if ( box === "content" ) { + delta -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); + } + + // For "content" or "padding", subtract border + if ( box !== "margin" ) { + delta -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); + } + } + } + + // Account for positive content-box scroll gutter when requested by providing computedVal + if ( !isBorderBox && computedVal >= 0 ) { + + // offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border + // Assuming integer scroll gutter, subtract the rest and round down + delta += Math.max( 0, Math.ceil( + elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] - + computedVal - + delta - + extra - + 0.5 + + // If offsetWidth/offsetHeight is unknown, then we can't determine content-box scroll gutter + // Use an explicit zero to avoid NaN (gh-3964) + ) ) || 0; + } + + return delta; +} + +function getWidthOrHeight( elem, dimension, extra ) { + + // Start with computed style + var styles = getStyles( elem ), + + // To avoid forcing a reflow, only fetch boxSizing if we need it (gh-4322). + // Fake content-box until we know it's needed to know the true value. + boxSizingNeeded = !support.boxSizingReliable() || extra, + isBorderBox = boxSizingNeeded && + jQuery.css( elem, "boxSizing", false, styles ) === "border-box", + valueIsBorderBox = isBorderBox, + + val = curCSS( elem, dimension, styles ), + offsetProp = "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ); + + // Support: Firefox <=54 + // Return a confounding non-pixel value or feign ignorance, as appropriate. + if ( rnumnonpx.test( val ) ) { + if ( !extra ) { + return val; + } + val = "auto"; + } + + + // Support: IE 9 - 11 only + // Use offsetWidth/offsetHeight for when box sizing is unreliable. + // In those cases, the computed value can be trusted to be border-box. + if ( ( !support.boxSizingReliable() && isBorderBox || + + // Support: IE 10 - 11+, Edge 15 - 18+ + // IE/Edge misreport `getComputedStyle` of table rows with width/height + // set in CSS while `offset*` properties report correct values. + // Interestingly, in some cases IE 9 doesn't suffer from this issue. + !support.reliableTrDimensions() && nodeName( elem, "tr" ) || + + // Fall back to offsetWidth/offsetHeight when value is "auto" + // This happens for inline elements with no explicit setting (gh-3571) + val === "auto" || + + // Support: Android <=4.1 - 4.3 only + // Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602) + !parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) && + + // Make sure the element is visible & connected + elem.getClientRects().length ) { + + isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box"; + + // Where available, offsetWidth/offsetHeight approximate border box dimensions. + // Where not available (e.g., SVG), assume unreliable box-sizing and interpret the + // retrieved value as a content box dimension. + valueIsBorderBox = offsetProp in elem; + if ( valueIsBorderBox ) { + val = elem[ offsetProp ]; + } + } + + // Normalize "" and auto + val = parseFloat( val ) || 0; + + // Adjust for the element's box model + return ( val + + boxModelAdjustment( + elem, + dimension, + extra || ( isBorderBox ? "border" : "content" ), + valueIsBorderBox, + styles, + + // Provide the current computed size to request scroll gutter calculation (gh-3589) + val + ) + ) + "px"; +} + +jQuery.extend( { + + // Add in style property hooks for overriding the default + // behavior of getting and setting a style property + cssHooks: { + opacity: { + get: function( elem, computed ) { + if ( computed ) { + + // We should always get a number back from opacity + var ret = curCSS( elem, "opacity" ); + return ret === "" ? "1" : ret; + } + } + } + }, + + // Don't automatically add "px" to these possibly-unitless properties + cssNumber: { + "animationIterationCount": true, + "columnCount": true, + "fillOpacity": true, + "flexGrow": true, + "flexShrink": true, + "fontWeight": true, + "gridArea": true, + "gridColumn": true, + "gridColumnEnd": true, + "gridColumnStart": true, + "gridRow": true, + "gridRowEnd": true, + "gridRowStart": true, + "lineHeight": true, + "opacity": true, + "order": true, + "orphans": true, + "widows": true, + "zIndex": true, + "zoom": true + }, + + // Add in properties whose names you wish to fix before + // setting or getting the value + cssProps: {}, + + // Get and set the style property on a DOM Node + style: function( elem, name, value, extra ) { + + // Don't set styles on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) { + return; + } + + // Make sure that we're working with the right name + var ret, type, hooks, + origName = camelCase( name ), + isCustomProp = rcustomProp.test( name ), + style = elem.style; + + // Make sure that we're working with the right name. We don't + // want to query the value if it is a CSS custom property + // since they are user-defined. + if ( !isCustomProp ) { + name = finalPropName( origName ); + } + + // Gets hook for the prefixed version, then unprefixed version + hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; + + // Check if we're setting a value + if ( value !== undefined ) { + type = typeof value; + + // Convert "+=" or "-=" to relative numbers (#7345) + if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) { + value = adjustCSS( elem, name, ret ); + + // Fixes bug #9237 + type = "number"; + } + + // Make sure that null and NaN values aren't set (#7116) + if ( value == null || value !== value ) { + return; + } + + // If a number was passed in, add the unit (except for certain CSS properties) + // The isCustomProp check can be removed in jQuery 4.0 when we only auto-append + // "px" to a few hardcoded values. + if ( type === "number" && !isCustomProp ) { + value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" ); + } + + // background-* props affect original clone's values + if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) { + style[ name ] = "inherit"; + } + + // If a hook was provided, use that value, otherwise just set the specified value + if ( !hooks || !( "set" in hooks ) || + ( value = hooks.set( elem, value, extra ) ) !== undefined ) { + + if ( isCustomProp ) { + style.setProperty( name, value ); + } else { + style[ name ] = value; + } + } + + } else { + + // If a hook was provided get the non-computed value from there + if ( hooks && "get" in hooks && + ( ret = hooks.get( elem, false, extra ) ) !== undefined ) { + + return ret; + } + + // Otherwise just get the value from the style object + return style[ name ]; + } + }, + + css: function( elem, name, extra, styles ) { + var val, num, hooks, + origName = camelCase( name ), + isCustomProp = rcustomProp.test( name ); + + // Make sure that we're working with the right name. We don't + // want to modify the value if it is a CSS custom property + // since they are user-defined. + if ( !isCustomProp ) { + name = finalPropName( origName ); + } + + // Try prefixed name followed by the unprefixed name + hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; + + // If a hook was provided get the computed value from there + if ( hooks && "get" in hooks ) { + val = hooks.get( elem, true, extra ); + } + + // Otherwise, if a way to get the computed value exists, use that + if ( val === undefined ) { + val = curCSS( elem, name, styles ); + } + + // Convert "normal" to computed value + if ( val === "normal" && name in cssNormalTransform ) { + val = cssNormalTransform[ name ]; + } + + // Make numeric if forced or a qualifier was provided and val looks numeric + if ( extra === "" || extra ) { + num = parseFloat( val ); + return extra === true || isFinite( num ) ? num || 0 : val; + } + + return val; + } +} ); + +jQuery.each( [ "height", "width" ], function( _i, dimension ) { + jQuery.cssHooks[ dimension ] = { + get: function( elem, computed, extra ) { + if ( computed ) { + + // Certain elements can have dimension info if we invisibly show them + // but it must have a current display style that would benefit + return rdisplayswap.test( jQuery.css( elem, "display" ) ) && + + // Support: Safari 8+ + // Table columns in Safari have non-zero offsetWidth & zero + // getBoundingClientRect().width unless display is changed. + // Support: IE <=11 only + // Running getBoundingClientRect on a disconnected node + // in IE throws an error. + ( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ? + swap( elem, cssShow, function() { + return getWidthOrHeight( elem, dimension, extra ); + } ) : + getWidthOrHeight( elem, dimension, extra ); + } + }, + + set: function( elem, value, extra ) { + var matches, + styles = getStyles( elem ), + + // Only read styles.position if the test has a chance to fail + // to avoid forcing a reflow. + scrollboxSizeBuggy = !support.scrollboxSize() && + styles.position === "absolute", + + // To avoid forcing a reflow, only fetch boxSizing if we need it (gh-3991) + boxSizingNeeded = scrollboxSizeBuggy || extra, + isBorderBox = boxSizingNeeded && + jQuery.css( elem, "boxSizing", false, styles ) === "border-box", + subtract = extra ? + boxModelAdjustment( + elem, + dimension, + extra, + isBorderBox, + styles + ) : + 0; + + // Account for unreliable border-box dimensions by comparing offset* to computed and + // faking a content-box to get border and padding (gh-3699) + if ( isBorderBox && scrollboxSizeBuggy ) { + subtract -= Math.ceil( + elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] - + parseFloat( styles[ dimension ] ) - + boxModelAdjustment( elem, dimension, "border", false, styles ) - + 0.5 + ); + } + + // Convert to pixels if value adjustment is needed + if ( subtract && ( matches = rcssNum.exec( value ) ) && + ( matches[ 3 ] || "px" ) !== "px" ) { + + elem.style[ dimension ] = value; + value = jQuery.css( elem, dimension ); + } + + return setPositiveNumber( elem, value, subtract ); + } + }; +} ); + +jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft, + function( elem, computed ) { + if ( computed ) { + return ( parseFloat( curCSS( elem, "marginLeft" ) ) || + elem.getBoundingClientRect().left - + swap( elem, { marginLeft: 0 }, function() { + return elem.getBoundingClientRect().left; + } ) + ) + "px"; + } + } +); + +// These hooks are used by animate to expand properties +jQuery.each( { + margin: "", + padding: "", + border: "Width" +}, function( prefix, suffix ) { + jQuery.cssHooks[ prefix + suffix ] = { + expand: function( value ) { + var i = 0, + expanded = {}, + + // Assumes a single number if not a string + parts = typeof value === "string" ? value.split( " " ) : [ value ]; + + for ( ; i < 4; i++ ) { + expanded[ prefix + cssExpand[ i ] + suffix ] = + parts[ i ] || parts[ i - 2 ] || parts[ 0 ]; + } + + return expanded; + } + }; + + if ( prefix !== "margin" ) { + jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber; + } +} ); + +jQuery.fn.extend( { + css: function( name, value ) { + return access( this, function( elem, name, value ) { + var styles, len, + map = {}, + i = 0; + + if ( Array.isArray( name ) ) { + styles = getStyles( elem ); + len = name.length; + + for ( ; i < len; i++ ) { + map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles ); + } + + return map; + } + + return value !== undefined ? + jQuery.style( elem, name, value ) : + jQuery.css( elem, name ); + }, name, value, arguments.length > 1 ); + } +} ); + + +function Tween( elem, options, prop, end, easing ) { + return new Tween.prototype.init( elem, options, prop, end, easing ); +} +jQuery.Tween = Tween; + +Tween.prototype = { + constructor: Tween, + init: function( elem, options, prop, end, easing, unit ) { + this.elem = elem; + this.prop = prop; + this.easing = easing || jQuery.easing._default; + this.options = options; + this.start = this.now = this.cur(); + this.end = end; + this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" ); + }, + cur: function() { + var hooks = Tween.propHooks[ this.prop ]; + + return hooks && hooks.get ? + hooks.get( this ) : + Tween.propHooks._default.get( this ); + }, + run: function( percent ) { + var eased, + hooks = Tween.propHooks[ this.prop ]; + + if ( this.options.duration ) { + this.pos = eased = jQuery.easing[ this.easing ]( + percent, this.options.duration * percent, 0, 1, this.options.duration + ); + } else { + this.pos = eased = percent; + } + this.now = ( this.end - this.start ) * eased + this.start; + + if ( this.options.step ) { + this.options.step.call( this.elem, this.now, this ); + } + + if ( hooks && hooks.set ) { + hooks.set( this ); + } else { + Tween.propHooks._default.set( this ); + } + return this; + } +}; + +Tween.prototype.init.prototype = Tween.prototype; + +Tween.propHooks = { + _default: { + get: function( tween ) { + var result; + + // Use a property on the element directly when it is not a DOM element, + // or when there is no matching style property that exists. + if ( tween.elem.nodeType !== 1 || + tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) { + return tween.elem[ tween.prop ]; + } + + // Passing an empty string as a 3rd parameter to .css will automatically + // attempt a parseFloat and fallback to a string if the parse fails. + // Simple values such as "10px" are parsed to Float; + // complex values such as "rotate(1rad)" are returned as-is. + result = jQuery.css( tween.elem, tween.prop, "" ); + + // Empty strings, null, undefined and "auto" are converted to 0. + return !result || result === "auto" ? 0 : result; + }, + set: function( tween ) { + + // Use step hook for back compat. + // Use cssHook if its there. + // Use .style if available and use plain properties where available. + if ( jQuery.fx.step[ tween.prop ] ) { + jQuery.fx.step[ tween.prop ]( tween ); + } else if ( tween.elem.nodeType === 1 && ( + jQuery.cssHooks[ tween.prop ] || + tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) { + jQuery.style( tween.elem, tween.prop, tween.now + tween.unit ); + } else { + tween.elem[ tween.prop ] = tween.now; + } + } + } +}; + +// Support: IE <=9 only +// Panic based approach to setting things on disconnected nodes +Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = { + set: function( tween ) { + if ( tween.elem.nodeType && tween.elem.parentNode ) { + tween.elem[ tween.prop ] = tween.now; + } + } +}; + +jQuery.easing = { + linear: function( p ) { + return p; + }, + swing: function( p ) { + return 0.5 - Math.cos( p * Math.PI ) / 2; + }, + _default: "swing" +}; + +jQuery.fx = Tween.prototype.init; + +// Back compat <1.8 extension point +jQuery.fx.step = {}; + + + + +var + fxNow, inProgress, + rfxtypes = /^(?:toggle|show|hide)$/, + rrun = /queueHooks$/; + +function schedule() { + if ( inProgress ) { + if ( document.hidden === false && window.requestAnimationFrame ) { + window.requestAnimationFrame( schedule ); + } else { + window.setTimeout( schedule, jQuery.fx.interval ); + } + + jQuery.fx.tick(); + } +} + +// Animations created synchronously will run synchronously +function createFxNow() { + window.setTimeout( function() { + fxNow = undefined; + } ); + return ( fxNow = Date.now() ); +} + +// Generate parameters to create a standard animation +function genFx( type, includeWidth ) { + var which, + i = 0, + attrs = { height: type }; + + // If we include width, step value is 1 to do all cssExpand values, + // otherwise step value is 2 to skip over Left and Right + includeWidth = includeWidth ? 1 : 0; + for ( ; i < 4; i += 2 - includeWidth ) { + which = cssExpand[ i ]; + attrs[ "margin" + which ] = attrs[ "padding" + which ] = type; + } + + if ( includeWidth ) { + attrs.opacity = attrs.width = type; + } + + return attrs; +} + +function createTween( value, prop, animation ) { + var tween, + collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ), + index = 0, + length = collection.length; + for ( ; index < length; index++ ) { + if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) { + + // We're done with this property + return tween; + } + } +} + +function defaultPrefilter( elem, props, opts ) { + var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display, + isBox = "width" in props || "height" in props, + anim = this, + orig = {}, + style = elem.style, + hidden = elem.nodeType && isHiddenWithinTree( elem ), + dataShow = dataPriv.get( elem, "fxshow" ); + + // Queue-skipping animations hijack the fx hooks + if ( !opts.queue ) { + hooks = jQuery._queueHooks( elem, "fx" ); + if ( hooks.unqueued == null ) { + hooks.unqueued = 0; + oldfire = hooks.empty.fire; + hooks.empty.fire = function() { + if ( !hooks.unqueued ) { + oldfire(); + } + }; + } + hooks.unqueued++; + + anim.always( function() { + + // Ensure the complete handler is called before this completes + anim.always( function() { + hooks.unqueued--; + if ( !jQuery.queue( elem, "fx" ).length ) { + hooks.empty.fire(); + } + } ); + } ); + } + + // Detect show/hide animations + for ( prop in props ) { + value = props[ prop ]; + if ( rfxtypes.test( value ) ) { + delete props[ prop ]; + toggle = toggle || value === "toggle"; + if ( value === ( hidden ? "hide" : "show" ) ) { + + // Pretend to be hidden if this is a "show" and + // there is still data from a stopped show/hide + if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) { + hidden = true; + + // Ignore all other no-op show/hide data + } else { + continue; + } + } + orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop ); + } + } + + // Bail out if this is a no-op like .hide().hide() + propTween = !jQuery.isEmptyObject( props ); + if ( !propTween && jQuery.isEmptyObject( orig ) ) { + return; + } + + // Restrict "overflow" and "display" styles during box animations + if ( isBox && elem.nodeType === 1 ) { + + // Support: IE <=9 - 11, Edge 12 - 15 + // Record all 3 overflow attributes because IE does not infer the shorthand + // from identically-valued overflowX and overflowY and Edge just mirrors + // the overflowX value there. + opts.overflow = [ style.overflow, style.overflowX, style.overflowY ]; + + // Identify a display type, preferring old show/hide data over the CSS cascade + restoreDisplay = dataShow && dataShow.display; + if ( restoreDisplay == null ) { + restoreDisplay = dataPriv.get( elem, "display" ); + } + display = jQuery.css( elem, "display" ); + if ( display === "none" ) { + if ( restoreDisplay ) { + display = restoreDisplay; + } else { + + // Get nonempty value(s) by temporarily forcing visibility + showHide( [ elem ], true ); + restoreDisplay = elem.style.display || restoreDisplay; + display = jQuery.css( elem, "display" ); + showHide( [ elem ] ); + } + } + + // Animate inline elements as inline-block + if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) { + if ( jQuery.css( elem, "float" ) === "none" ) { + + // Restore the original display value at the end of pure show/hide animations + if ( !propTween ) { + anim.done( function() { + style.display = restoreDisplay; + } ); + if ( restoreDisplay == null ) { + display = style.display; + restoreDisplay = display === "none" ? "" : display; + } + } + style.display = "inline-block"; + } + } + } + + if ( opts.overflow ) { + style.overflow = "hidden"; + anim.always( function() { + style.overflow = opts.overflow[ 0 ]; + style.overflowX = opts.overflow[ 1 ]; + style.overflowY = opts.overflow[ 2 ]; + } ); + } + + // Implement show/hide animations + propTween = false; + for ( prop in orig ) { + + // General show/hide setup for this element animation + if ( !propTween ) { + if ( dataShow ) { + if ( "hidden" in dataShow ) { + hidden = dataShow.hidden; + } + } else { + dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } ); + } + + // Store hidden/visible for toggle so `.stop().toggle()` "reverses" + if ( toggle ) { + dataShow.hidden = !hidden; + } + + // Show elements before animating them + if ( hidden ) { + showHide( [ elem ], true ); + } + + /* eslint-disable no-loop-func */ + + anim.done( function() { + + /* eslint-enable no-loop-func */ + + // The final step of a "hide" animation is actually hiding the element + if ( !hidden ) { + showHide( [ elem ] ); + } + dataPriv.remove( elem, "fxshow" ); + for ( prop in orig ) { + jQuery.style( elem, prop, orig[ prop ] ); + } + } ); + } + + // Per-property setup + propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim ); + if ( !( prop in dataShow ) ) { + dataShow[ prop ] = propTween.start; + if ( hidden ) { + propTween.end = propTween.start; + propTween.start = 0; + } + } + } +} + +function propFilter( props, specialEasing ) { + var index, name, easing, value, hooks; + + // camelCase, specialEasing and expand cssHook pass + for ( index in props ) { + name = camelCase( index ); + easing = specialEasing[ name ]; + value = props[ index ]; + if ( Array.isArray( value ) ) { + easing = value[ 1 ]; + value = props[ index ] = value[ 0 ]; + } + + if ( index !== name ) { + props[ name ] = value; + delete props[ index ]; + } + + hooks = jQuery.cssHooks[ name ]; + if ( hooks && "expand" in hooks ) { + value = hooks.expand( value ); + delete props[ name ]; + + // Not quite $.extend, this won't overwrite existing keys. + // Reusing 'index' because we have the correct "name" + for ( index in value ) { + if ( !( index in props ) ) { + props[ index ] = value[ index ]; + specialEasing[ index ] = easing; + } + } + } else { + specialEasing[ name ] = easing; + } + } +} + +function Animation( elem, properties, options ) { + var result, + stopped, + index = 0, + length = Animation.prefilters.length, + deferred = jQuery.Deferred().always( function() { + + // Don't match elem in the :animated selector + delete tick.elem; + } ), + tick = function() { + if ( stopped ) { + return false; + } + var currentTime = fxNow || createFxNow(), + remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ), + + // Support: Android 2.3 only + // Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497) + temp = remaining / animation.duration || 0, + percent = 1 - temp, + index = 0, + length = animation.tweens.length; + + for ( ; index < length; index++ ) { + animation.tweens[ index ].run( percent ); + } + + deferred.notifyWith( elem, [ animation, percent, remaining ] ); + + // If there's more to do, yield + if ( percent < 1 && length ) { + return remaining; + } + + // If this was an empty animation, synthesize a final progress notification + if ( !length ) { + deferred.notifyWith( elem, [ animation, 1, 0 ] ); + } + + // Resolve the animation and report its conclusion + deferred.resolveWith( elem, [ animation ] ); + return false; + }, + animation = deferred.promise( { + elem: elem, + props: jQuery.extend( {}, properties ), + opts: jQuery.extend( true, { + specialEasing: {}, + easing: jQuery.easing._default + }, options ), + originalProperties: properties, + originalOptions: options, + startTime: fxNow || createFxNow(), + duration: options.duration, + tweens: [], + createTween: function( prop, end ) { + var tween = jQuery.Tween( elem, animation.opts, prop, end, + animation.opts.specialEasing[ prop ] || animation.opts.easing ); + animation.tweens.push( tween ); + return tween; + }, + stop: function( gotoEnd ) { + var index = 0, + + // If we are going to the end, we want to run all the tweens + // otherwise we skip this part + length = gotoEnd ? animation.tweens.length : 0; + if ( stopped ) { + return this; + } + stopped = true; + for ( ; index < length; index++ ) { + animation.tweens[ index ].run( 1 ); + } + + // Resolve when we played the last frame; otherwise, reject + if ( gotoEnd ) { + deferred.notifyWith( elem, [ animation, 1, 0 ] ); + deferred.resolveWith( elem, [ animation, gotoEnd ] ); + } else { + deferred.rejectWith( elem, [ animation, gotoEnd ] ); + } + return this; + } + } ), + props = animation.props; + + propFilter( props, animation.opts.specialEasing ); + + for ( ; index < length; index++ ) { + result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts ); + if ( result ) { + if ( isFunction( result.stop ) ) { + jQuery._queueHooks( animation.elem, animation.opts.queue ).stop = + result.stop.bind( result ); + } + return result; + } + } + + jQuery.map( props, createTween, animation ); + + if ( isFunction( animation.opts.start ) ) { + animation.opts.start.call( elem, animation ); + } + + // Attach callbacks from options + animation + .progress( animation.opts.progress ) + .done( animation.opts.done, animation.opts.complete ) + .fail( animation.opts.fail ) + .always( animation.opts.always ); + + jQuery.fx.timer( + jQuery.extend( tick, { + elem: elem, + anim: animation, + queue: animation.opts.queue + } ) + ); + + return animation; +} + +jQuery.Animation = jQuery.extend( Animation, { + + tweeners: { + "*": [ function( prop, value ) { + var tween = this.createTween( prop, value ); + adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween ); + return tween; + } ] + }, + + tweener: function( props, callback ) { + if ( isFunction( props ) ) { + callback = props; + props = [ "*" ]; + } else { + props = props.match( rnothtmlwhite ); + } + + var prop, + index = 0, + length = props.length; + + for ( ; index < length; index++ ) { + prop = props[ index ]; + Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || []; + Animation.tweeners[ prop ].unshift( callback ); + } + }, + + prefilters: [ defaultPrefilter ], + + prefilter: function( callback, prepend ) { + if ( prepend ) { + Animation.prefilters.unshift( callback ); + } else { + Animation.prefilters.push( callback ); + } + } +} ); + +jQuery.speed = function( speed, easing, fn ) { + var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : { + complete: fn || !fn && easing || + isFunction( speed ) && speed, + duration: speed, + easing: fn && easing || easing && !isFunction( easing ) && easing + }; + + // Go to the end state if fx are off + if ( jQuery.fx.off ) { + opt.duration = 0; + + } else { + if ( typeof opt.duration !== "number" ) { + if ( opt.duration in jQuery.fx.speeds ) { + opt.duration = jQuery.fx.speeds[ opt.duration ]; + + } else { + opt.duration = jQuery.fx.speeds._default; + } + } + } + + // Normalize opt.queue - true/undefined/null -> "fx" + if ( opt.queue == null || opt.queue === true ) { + opt.queue = "fx"; + } + + // Queueing + opt.old = opt.complete; + + opt.complete = function() { + if ( isFunction( opt.old ) ) { + opt.old.call( this ); + } + + if ( opt.queue ) { + jQuery.dequeue( this, opt.queue ); + } + }; + + return opt; +}; + +jQuery.fn.extend( { + fadeTo: function( speed, to, easing, callback ) { + + // Show any hidden elements after setting opacity to 0 + return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show() + + // Animate to the value specified + .end().animate( { opacity: to }, speed, easing, callback ); + }, + animate: function( prop, speed, easing, callback ) { + var empty = jQuery.isEmptyObject( prop ), + optall = jQuery.speed( speed, easing, callback ), + doAnimation = function() { + + // Operate on a copy of prop so per-property easing won't be lost + var anim = Animation( this, jQuery.extend( {}, prop ), optall ); + + // Empty animations, or finishing resolves immediately + if ( empty || dataPriv.get( this, "finish" ) ) { + anim.stop( true ); + } + }; + + doAnimation.finish = doAnimation; + + return empty || optall.queue === false ? + this.each( doAnimation ) : + this.queue( optall.queue, doAnimation ); + }, + stop: function( type, clearQueue, gotoEnd ) { + var stopQueue = function( hooks ) { + var stop = hooks.stop; + delete hooks.stop; + stop( gotoEnd ); + }; + + if ( typeof type !== "string" ) { + gotoEnd = clearQueue; + clearQueue = type; + type = undefined; + } + if ( clearQueue ) { + this.queue( type || "fx", [] ); + } + + return this.each( function() { + var dequeue = true, + index = type != null && type + "queueHooks", + timers = jQuery.timers, + data = dataPriv.get( this ); + + if ( index ) { + if ( data[ index ] && data[ index ].stop ) { + stopQueue( data[ index ] ); + } + } else { + for ( index in data ) { + if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) { + stopQueue( data[ index ] ); + } + } + } + + for ( index = timers.length; index--; ) { + if ( timers[ index ].elem === this && + ( type == null || timers[ index ].queue === type ) ) { + + timers[ index ].anim.stop( gotoEnd ); + dequeue = false; + timers.splice( index, 1 ); + } + } + + // Start the next in the queue if the last step wasn't forced. + // Timers currently will call their complete callbacks, which + // will dequeue but only if they were gotoEnd. + if ( dequeue || !gotoEnd ) { + jQuery.dequeue( this, type ); + } + } ); + }, + finish: function( type ) { + if ( type !== false ) { + type = type || "fx"; + } + return this.each( function() { + var index, + data = dataPriv.get( this ), + queue = data[ type + "queue" ], + hooks = data[ type + "queueHooks" ], + timers = jQuery.timers, + length = queue ? queue.length : 0; + + // Enable finishing flag on private data + data.finish = true; + + // Empty the queue first + jQuery.queue( this, type, [] ); + + if ( hooks && hooks.stop ) { + hooks.stop.call( this, true ); + } + + // Look for any active animations, and finish them + for ( index = timers.length; index--; ) { + if ( timers[ index ].elem === this && timers[ index ].queue === type ) { + timers[ index ].anim.stop( true ); + timers.splice( index, 1 ); + } + } + + // Look for any animations in the old queue and finish them + for ( index = 0; index < length; index++ ) { + if ( queue[ index ] && queue[ index ].finish ) { + queue[ index ].finish.call( this ); + } + } + + // Turn off finishing flag + delete data.finish; + } ); + } +} ); + +jQuery.each( [ "toggle", "show", "hide" ], function( _i, name ) { + var cssFn = jQuery.fn[ name ]; + jQuery.fn[ name ] = function( speed, easing, callback ) { + return speed == null || typeof speed === "boolean" ? + cssFn.apply( this, arguments ) : + this.animate( genFx( name, true ), speed, easing, callback ); + }; +} ); + +// Generate shortcuts for custom animations +jQuery.each( { + slideDown: genFx( "show" ), + slideUp: genFx( "hide" ), + slideToggle: genFx( "toggle" ), + fadeIn: { opacity: "show" }, + fadeOut: { opacity: "hide" }, + fadeToggle: { opacity: "toggle" } +}, function( name, props ) { + jQuery.fn[ name ] = function( speed, easing, callback ) { + return this.animate( props, speed, easing, callback ); + }; +} ); + +jQuery.timers = []; +jQuery.fx.tick = function() { + var timer, + i = 0, + timers = jQuery.timers; + + fxNow = Date.now(); + + for ( ; i < timers.length; i++ ) { + timer = timers[ i ]; + + // Run the timer and safely remove it when done (allowing for external removal) + if ( !timer() && timers[ i ] === timer ) { + timers.splice( i--, 1 ); + } + } + + if ( !timers.length ) { + jQuery.fx.stop(); + } + fxNow = undefined; +}; + +jQuery.fx.timer = function( timer ) { + jQuery.timers.push( timer ); + jQuery.fx.start(); +}; + +jQuery.fx.interval = 13; +jQuery.fx.start = function() { + if ( inProgress ) { + return; + } + + inProgress = true; + schedule(); +}; + +jQuery.fx.stop = function() { + inProgress = null; +}; + +jQuery.fx.speeds = { + slow: 600, + fast: 200, + + // Default speed + _default: 400 +}; + + +// Based off of the plugin by Clint Helfers, with permission. +// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/ +jQuery.fn.delay = function( time, type ) { + time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; + type = type || "fx"; + + return this.queue( type, function( next, hooks ) { + var timeout = window.setTimeout( next, time ); + hooks.stop = function() { + window.clearTimeout( timeout ); + }; + } ); +}; + + +( function() { + var input = document.createElement( "input" ), + select = document.createElement( "select" ), + opt = select.appendChild( document.createElement( "option" ) ); + + input.type = "checkbox"; + + // Support: Android <=4.3 only + // Default value for a checkbox should be "on" + support.checkOn = input.value !== ""; + + // Support: IE <=11 only + // Must access selectedIndex to make default options select + support.optSelected = opt.selected; + + // Support: IE <=11 only + // An input loses its value after becoming a radio + input = document.createElement( "input" ); + input.value = "t"; + input.type = "radio"; + support.radioValue = input.value === "t"; +} )(); + + +var boolHook, + attrHandle = jQuery.expr.attrHandle; + +jQuery.fn.extend( { + attr: function( name, value ) { + return access( this, jQuery.attr, name, value, arguments.length > 1 ); + }, + + removeAttr: function( name ) { + return this.each( function() { + jQuery.removeAttr( this, name ); + } ); + } +} ); + +jQuery.extend( { + attr: function( elem, name, value ) { + var ret, hooks, + nType = elem.nodeType; + + // Don't get/set attributes on text, comment and attribute nodes + if ( nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + // Fallback to prop when attributes are not supported + if ( typeof elem.getAttribute === "undefined" ) { + return jQuery.prop( elem, name, value ); + } + + // Attribute hooks are determined by the lowercase version + // Grab necessary hook if one is defined + if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { + hooks = jQuery.attrHooks[ name.toLowerCase() ] || + ( jQuery.expr.match.bool.test( name ) ? boolHook : undefined ); + } + + if ( value !== undefined ) { + if ( value === null ) { + jQuery.removeAttr( elem, name ); + return; + } + + if ( hooks && "set" in hooks && + ( ret = hooks.set( elem, value, name ) ) !== undefined ) { + return ret; + } + + elem.setAttribute( name, value + "" ); + return value; + } + + if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) { + return ret; + } + + ret = jQuery.find.attr( elem, name ); + + // Non-existent attributes return null, we normalize to undefined + return ret == null ? undefined : ret; + }, + + attrHooks: { + type: { + set: function( elem, value ) { + if ( !support.radioValue && value === "radio" && + nodeName( elem, "input" ) ) { + var val = elem.value; + elem.setAttribute( "type", value ); + if ( val ) { + elem.value = val; + } + return value; + } + } + } + }, + + removeAttr: function( elem, value ) { + var name, + i = 0, + + // Attribute names can contain non-HTML whitespace characters + // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2 + attrNames = value && value.match( rnothtmlwhite ); + + if ( attrNames && elem.nodeType === 1 ) { + while ( ( name = attrNames[ i++ ] ) ) { + elem.removeAttribute( name ); + } + } + } +} ); + +// Hooks for boolean attributes +boolHook = { + set: function( elem, value, name ) { + if ( value === false ) { + + // Remove boolean attributes when set to false + jQuery.removeAttr( elem, name ); + } else { + elem.setAttribute( name, name ); + } + return name; + } +}; + +jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) { + var getter = attrHandle[ name ] || jQuery.find.attr; + + attrHandle[ name ] = function( elem, name, isXML ) { + var ret, handle, + lowercaseName = name.toLowerCase(); + + if ( !isXML ) { + + // Avoid an infinite loop by temporarily removing this function from the getter + handle = attrHandle[ lowercaseName ]; + attrHandle[ lowercaseName ] = ret; + ret = getter( elem, name, isXML ) != null ? + lowercaseName : + null; + attrHandle[ lowercaseName ] = handle; + } + return ret; + }; +} ); + + + + +var rfocusable = /^(?:input|select|textarea|button)$/i, + rclickable = /^(?:a|area)$/i; + +jQuery.fn.extend( { + prop: function( name, value ) { + return access( this, jQuery.prop, name, value, arguments.length > 1 ); + }, + + removeProp: function( name ) { + return this.each( function() { + delete this[ jQuery.propFix[ name ] || name ]; + } ); + } +} ); + +jQuery.extend( { + prop: function( elem, name, value ) { + var ret, hooks, + nType = elem.nodeType; + + // Don't get/set properties on text, comment and attribute nodes + if ( nType === 3 || nType === 8 || nType === 2 ) { + return; + } + + if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { + + // Fix name and attach hooks + name = jQuery.propFix[ name ] || name; + hooks = jQuery.propHooks[ name ]; + } + + if ( value !== undefined ) { + if ( hooks && "set" in hooks && + ( ret = hooks.set( elem, value, name ) ) !== undefined ) { + return ret; + } + + return ( elem[ name ] = value ); + } + + if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) { + return ret; + } + + return elem[ name ]; + }, + + propHooks: { + tabIndex: { + get: function( elem ) { + + // Support: IE <=9 - 11 only + // elem.tabIndex doesn't always return the + // correct value when it hasn't been explicitly set + // https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + // Use proper attribute retrieval(#12072) + var tabindex = jQuery.find.attr( elem, "tabindex" ); + + if ( tabindex ) { + return parseInt( tabindex, 10 ); + } + + if ( + rfocusable.test( elem.nodeName ) || + rclickable.test( elem.nodeName ) && + elem.href + ) { + return 0; + } + + return -1; + } + } + }, + + propFix: { + "for": "htmlFor", + "class": "className" + } +} ); + +// Support: IE <=11 only +// Accessing the selectedIndex property +// forces the browser to respect setting selected +// on the option +// The getter ensures a default option is selected +// when in an optgroup +// eslint rule "no-unused-expressions" is disabled for this code +// since it considers such accessions noop +if ( !support.optSelected ) { + jQuery.propHooks.selected = { + get: function( elem ) { + + /* eslint no-unused-expressions: "off" */ + + var parent = elem.parentNode; + if ( parent && parent.parentNode ) { + parent.parentNode.selectedIndex; + } + return null; + }, + set: function( elem ) { + + /* eslint no-unused-expressions: "off" */ + + var parent = elem.parentNode; + if ( parent ) { + parent.selectedIndex; + + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; + } + } + } + }; +} + +jQuery.each( [ + "tabIndex", + "readOnly", + "maxLength", + "cellSpacing", + "cellPadding", + "rowSpan", + "colSpan", + "useMap", + "frameBorder", + "contentEditable" +], function() { + jQuery.propFix[ this.toLowerCase() ] = this; +} ); + + + + + // Strip and collapse whitespace according to HTML spec + // https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace + function stripAndCollapse( value ) { + var tokens = value.match( rnothtmlwhite ) || []; + return tokens.join( " " ); + } + + +function getClass( elem ) { + return elem.getAttribute && elem.getAttribute( "class" ) || ""; +} + +function classesToArray( value ) { + if ( Array.isArray( value ) ) { + return value; + } + if ( typeof value === "string" ) { + return value.match( rnothtmlwhite ) || []; + } + return []; +} + +jQuery.fn.extend( { + addClass: function( value ) { + var classes, elem, cur, curValue, clazz, j, finalValue, + i = 0; + + if ( isFunction( value ) ) { + return this.each( function( j ) { + jQuery( this ).addClass( value.call( this, j, getClass( this ) ) ); + } ); + } + + classes = classesToArray( value ); + + if ( classes.length ) { + while ( ( elem = this[ i++ ] ) ) { + curValue = getClass( elem ); + cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " ); + + if ( cur ) { + j = 0; + while ( ( clazz = classes[ j++ ] ) ) { + if ( cur.indexOf( " " + clazz + " " ) < 0 ) { + cur += clazz + " "; + } + } + + // Only assign if different to avoid unneeded rendering. + finalValue = stripAndCollapse( cur ); + if ( curValue !== finalValue ) { + elem.setAttribute( "class", finalValue ); + } + } + } + } + + return this; + }, + + removeClass: function( value ) { + var classes, elem, cur, curValue, clazz, j, finalValue, + i = 0; + + if ( isFunction( value ) ) { + return this.each( function( j ) { + jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) ); + } ); + } + + if ( !arguments.length ) { + return this.attr( "class", "" ); + } + + classes = classesToArray( value ); + + if ( classes.length ) { + while ( ( elem = this[ i++ ] ) ) { + curValue = getClass( elem ); + + // This expression is here for better compressibility (see addClass) + cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " ); + + if ( cur ) { + j = 0; + while ( ( clazz = classes[ j++ ] ) ) { + + // Remove *all* instances + while ( cur.indexOf( " " + clazz + " " ) > -1 ) { + cur = cur.replace( " " + clazz + " ", " " ); + } + } + + // Only assign if different to avoid unneeded rendering. + finalValue = stripAndCollapse( cur ); + if ( curValue !== finalValue ) { + elem.setAttribute( "class", finalValue ); + } + } + } + } + + return this; + }, + + toggleClass: function( value, stateVal ) { + var type = typeof value, + isValidValue = type === "string" || Array.isArray( value ); + + if ( typeof stateVal === "boolean" && isValidValue ) { + return stateVal ? this.addClass( value ) : this.removeClass( value ); + } + + if ( isFunction( value ) ) { + return this.each( function( i ) { + jQuery( this ).toggleClass( + value.call( this, i, getClass( this ), stateVal ), + stateVal + ); + } ); + } + + return this.each( function() { + var className, i, self, classNames; + + if ( isValidValue ) { + + // Toggle individual class names + i = 0; + self = jQuery( this ); + classNames = classesToArray( value ); + + while ( ( className = classNames[ i++ ] ) ) { + + // Check each className given, space separated list + if ( self.hasClass( className ) ) { + self.removeClass( className ); + } else { + self.addClass( className ); + } + } + + // Toggle whole class name + } else if ( value === undefined || type === "boolean" ) { + className = getClass( this ); + if ( className ) { + + // Store className if set + dataPriv.set( this, "__className__", className ); + } + + // If the element has a class name or if we're passed `false`, + // then remove the whole classname (if there was one, the above saved it). + // Otherwise bring back whatever was previously saved (if anything), + // falling back to the empty string if nothing was stored. + if ( this.setAttribute ) { + this.setAttribute( "class", + className || value === false ? + "" : + dataPriv.get( this, "__className__" ) || "" + ); + } + } + } ); + }, + + hasClass: function( selector ) { + var className, elem, + i = 0; + + className = " " + selector + " "; + while ( ( elem = this[ i++ ] ) ) { + if ( elem.nodeType === 1 && + ( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) { + return true; + } + } + + return false; + } +} ); + + + + +var rreturn = /\r/g; + +jQuery.fn.extend( { + val: function( value ) { + var hooks, ret, valueIsFunction, + elem = this[ 0 ]; + + if ( !arguments.length ) { + if ( elem ) { + hooks = jQuery.valHooks[ elem.type ] || + jQuery.valHooks[ elem.nodeName.toLowerCase() ]; + + if ( hooks && + "get" in hooks && + ( ret = hooks.get( elem, "value" ) ) !== undefined + ) { + return ret; + } + + ret = elem.value; + + // Handle most common string cases + if ( typeof ret === "string" ) { + return ret.replace( rreturn, "" ); + } + + // Handle cases where value is null/undef or number + return ret == null ? "" : ret; + } + + return; + } + + valueIsFunction = isFunction( value ); + + return this.each( function( i ) { + var val; + + if ( this.nodeType !== 1 ) { + return; + } + + if ( valueIsFunction ) { + val = value.call( this, i, jQuery( this ).val() ); + } else { + val = value; + } + + // Treat null/undefined as ""; convert numbers to string + if ( val == null ) { + val = ""; + + } else if ( typeof val === "number" ) { + val += ""; + + } else if ( Array.isArray( val ) ) { + val = jQuery.map( val, function( value ) { + return value == null ? "" : value + ""; + } ); + } + + hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; + + // If set returns undefined, fall back to normal setting + if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) { + this.value = val; + } + } ); + } +} ); + +jQuery.extend( { + valHooks: { + option: { + get: function( elem ) { + + var val = jQuery.find.attr( elem, "value" ); + return val != null ? + val : + + // Support: IE <=10 - 11 only + // option.text throws exceptions (#14686, #14858) + // Strip and collapse whitespace + // https://html.spec.whatwg.org/#strip-and-collapse-whitespace + stripAndCollapse( jQuery.text( elem ) ); + } + }, + select: { + get: function( elem ) { + var value, option, i, + options = elem.options, + index = elem.selectedIndex, + one = elem.type === "select-one", + values = one ? null : [], + max = one ? index + 1 : options.length; + + if ( index < 0 ) { + i = max; + + } else { + i = one ? index : 0; + } + + // Loop through all the selected options + for ( ; i < max; i++ ) { + option = options[ i ]; + + // Support: IE <=9 only + // IE8-9 doesn't update selected after form reset (#2551) + if ( ( option.selected || i === index ) && + + // Don't return options that are disabled or in a disabled optgroup + !option.disabled && + ( !option.parentNode.disabled || + !nodeName( option.parentNode, "optgroup" ) ) ) { + + // Get the specific value for the option + value = jQuery( option ).val(); + + // We don't need an array for one selects + if ( one ) { + return value; + } + + // Multi-Selects return an array + values.push( value ); + } + } + + return values; + }, + + set: function( elem, value ) { + var optionSet, option, + options = elem.options, + values = jQuery.makeArray( value ), + i = options.length; + + while ( i-- ) { + option = options[ i ]; + + /* eslint-disable no-cond-assign */ + + if ( option.selected = + jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 + ) { + optionSet = true; + } + + /* eslint-enable no-cond-assign */ + } + + // Force browsers to behave consistently when non-matching value is set + if ( !optionSet ) { + elem.selectedIndex = -1; + } + return values; + } + } + } +} ); + +// Radios and checkboxes getter/setter +jQuery.each( [ "radio", "checkbox" ], function() { + jQuery.valHooks[ this ] = { + set: function( elem, value ) { + if ( Array.isArray( value ) ) { + return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 ); + } + } + }; + if ( !support.checkOn ) { + jQuery.valHooks[ this ].get = function( elem ) { + return elem.getAttribute( "value" ) === null ? "on" : elem.value; + }; + } +} ); + + + + +// Return jQuery for attributes-only inclusion + + +support.focusin = "onfocusin" in window; + + +var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + stopPropagationCallback = function( e ) { + e.stopPropagation(); + }; + +jQuery.extend( jQuery.event, { + + trigger: function( event, data, elem, onlyHandlers ) { + + var i, cur, tmp, bubbleType, ontype, handle, special, lastElement, + eventPath = [ elem || document ], + type = hasOwn.call( event, "type" ) ? event.type : event, + namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : []; + + cur = lastElement = tmp = elem = elem || document; + + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf( "." ) > -1 ) { + + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split( "." ); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf( ":" ) < 0 && "on" + type; + + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); + + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join( "." ); + event.rnamespace = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) : + null; + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === ( elem.ownerDocument || document ) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } + } + + // Fire handlers on the event path + i = 0; + while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) { + lastElement = cur; + event.type = i > 1 ? + bubbleType : + special.bindType || type; + + // jQuery handler + handle = ( dataPriv.get( cur, "events" ) || Object.create( null ) )[ event.type ] && + dataPriv.get( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && handle.apply && acceptData( cur ) ) { + event.result = handle.apply( cur, data ); + if ( event.result === false ) { + event.preventDefault(); + } + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( ( !special._default || + special._default.apply( eventPath.pop(), data ) === false ) && + acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name as the event. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && isFunction( elem[ type ] ) && !isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; + + if ( tmp ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + + if ( event.isPropagationStopped() ) { + lastElement.addEventListener( type, stopPropagationCallback ); + } + + elem[ type ](); + + if ( event.isPropagationStopped() ) { + lastElement.removeEventListener( type, stopPropagationCallback ); + } + + jQuery.event.triggered = undefined; + + if ( tmp ) { + elem[ ontype ] = tmp; + } + } + } + } + + return event.result; + }, + + // Piggyback on a donor event to simulate a different one + // Used only for `focus(in | out)` events + simulate: function( type, elem, event ) { + var e = jQuery.extend( + new jQuery.Event(), + event, + { + type: type, + isSimulated: true + } + ); + + jQuery.event.trigger( e, null, elem ); + } + +} ); + +jQuery.fn.extend( { + + trigger: function( type, data ) { + return this.each( function() { + jQuery.event.trigger( type, data, this ); + } ); + }, + triggerHandler: function( type, data ) { + var elem = this[ 0 ]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); + } + } +} ); + + +// Support: Firefox <=44 +// Firefox doesn't have focus(in | out) events +// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787 +// +// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1 +// focus(in | out) events fire after focus & blur events, +// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order +// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857 +if ( !support.focusin ) { + jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler on the document while someone wants focusin/focusout + var handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + + // Handle: regular nodes (via `this.ownerDocument`), window + // (via `this.document`) & document (via `this`). + var doc = this.ownerDocument || this.document || this, + attaches = dataPriv.access( doc, fix ); + + if ( !attaches ) { + doc.addEventListener( orig, handler, true ); + } + dataPriv.access( doc, fix, ( attaches || 0 ) + 1 ); + }, + teardown: function() { + var doc = this.ownerDocument || this.document || this, + attaches = dataPriv.access( doc, fix ) - 1; + + if ( !attaches ) { + doc.removeEventListener( orig, handler, true ); + dataPriv.remove( doc, fix ); + + } else { + dataPriv.access( doc, fix, attaches ); + } + } + }; + } ); +} +var location = window.location; + +var nonce = { guid: Date.now() }; + +var rquery = ( /\?/ ); + + + +// Cross-browser xml parsing +jQuery.parseXML = function( data ) { + var xml, parserErrorElem; + if ( !data || typeof data !== "string" ) { + return null; + } + + // Support: IE 9 - 11 only + // IE throws on parseFromString with invalid input. + try { + xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" ); + } catch ( e ) {} + + parserErrorElem = xml && xml.getElementsByTagName( "parsererror" )[ 0 ]; + if ( !xml || parserErrorElem ) { + jQuery.error( "Invalid XML: " + ( + parserErrorElem ? + jQuery.map( parserErrorElem.childNodes, function( el ) { + return el.textContent; + } ).join( "\n" ) : + data + ) ); + } + return xml; +}; + + +var + rbracket = /\[\]$/, + rCRLF = /\r?\n/g, + rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i, + rsubmittable = /^(?:input|select|textarea|keygen)/i; + +function buildParams( prefix, obj, traditional, add ) { + var name; + + if ( Array.isArray( obj ) ) { + + // Serialize array item. + jQuery.each( obj, function( i, v ) { + if ( traditional || rbracket.test( prefix ) ) { + + // Treat each array item as a scalar. + add( prefix, v ); + + } else { + + // Item is non-scalar (array or object), encode its numeric index. + buildParams( + prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]", + v, + traditional, + add + ); + } + } ); + + } else if ( !traditional && toType( obj ) === "object" ) { + + // Serialize object item. + for ( name in obj ) { + buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add ); + } + + } else { + + // Serialize scalar item. + add( prefix, obj ); + } +} + +// Serialize an array of form elements or a set of +// key/values into a query string +jQuery.param = function( a, traditional ) { + var prefix, + s = [], + add = function( key, valueOrFunction ) { + + // If value is a function, invoke it and use its return value + var value = isFunction( valueOrFunction ) ? + valueOrFunction() : + valueOrFunction; + + s[ s.length ] = encodeURIComponent( key ) + "=" + + encodeURIComponent( value == null ? "" : value ); + }; + + if ( a == null ) { + return ""; + } + + // If an array was passed in, assume that it is an array of form elements. + if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) { + + // Serialize the form elements + jQuery.each( a, function() { + add( this.name, this.value ); + } ); + + } else { + + // If traditional, encode the "old" way (the way 1.3.2 or older + // did it), otherwise encode params recursively. + for ( prefix in a ) { + buildParams( prefix, a[ prefix ], traditional, add ); + } + } + + // Return the resulting serialization + return s.join( "&" ); +}; + +jQuery.fn.extend( { + serialize: function() { + return jQuery.param( this.serializeArray() ); + }, + serializeArray: function() { + return this.map( function() { + + // Can add propHook for "elements" to filter or add form elements + var elements = jQuery.prop( this, "elements" ); + return elements ? jQuery.makeArray( elements ) : this; + } ).filter( function() { + var type = this.type; + + // Use .is( ":disabled" ) so that fieldset[disabled] works + return this.name && !jQuery( this ).is( ":disabled" ) && + rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) && + ( this.checked || !rcheckableType.test( type ) ); + } ).map( function( _i, elem ) { + var val = jQuery( this ).val(); + + if ( val == null ) { + return null; + } + + if ( Array.isArray( val ) ) { + return jQuery.map( val, function( val ) { + return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) }; + } ); + } + + return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) }; + } ).get(); + } +} ); + + +var + r20 = /%20/g, + rhash = /#.*$/, + rantiCache = /([?&])_=[^&]*/, + rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg, + + // #7653, #8125, #8152: local protocol detection + rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/, + rnoContent = /^(?:GET|HEAD)$/, + rprotocol = /^\/\//, + + /* Prefilters + * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example) + * 2) These are called: + * - BEFORE asking for a transport + * - AFTER param serialization (s.data is a string if s.processData is true) + * 3) key is the dataType + * 4) the catchall symbol "*" can be used + * 5) execution will start with transport dataType and THEN continue down to "*" if needed + */ + prefilters = {}, + + /* Transports bindings + * 1) key is the dataType + * 2) the catchall symbol "*" can be used + * 3) selection will start with transport dataType and THEN go to "*" if needed + */ + transports = {}, + + // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression + allTypes = "*/".concat( "*" ), + + // Anchor tag for parsing the document origin + originAnchor = document.createElement( "a" ); + +originAnchor.href = location.href; + +// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport +function addToPrefiltersOrTransports( structure ) { + + // dataTypeExpression is optional and defaults to "*" + return function( dataTypeExpression, func ) { + + if ( typeof dataTypeExpression !== "string" ) { + func = dataTypeExpression; + dataTypeExpression = "*"; + } + + var dataType, + i = 0, + dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || []; + + if ( isFunction( func ) ) { + + // For each dataType in the dataTypeExpression + while ( ( dataType = dataTypes[ i++ ] ) ) { + + // Prepend if requested + if ( dataType[ 0 ] === "+" ) { + dataType = dataType.slice( 1 ) || "*"; + ( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func ); + + // Otherwise append + } else { + ( structure[ dataType ] = structure[ dataType ] || [] ).push( func ); + } + } + } + }; +} + +// Base inspection function for prefilters and transports +function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) { + + var inspected = {}, + seekingTransport = ( structure === transports ); + + function inspect( dataType ) { + var selected; + inspected[ dataType ] = true; + jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) { + var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR ); + if ( typeof dataTypeOrTransport === "string" && + !seekingTransport && !inspected[ dataTypeOrTransport ] ) { + + options.dataTypes.unshift( dataTypeOrTransport ); + inspect( dataTypeOrTransport ); + return false; + } else if ( seekingTransport ) { + return !( selected = dataTypeOrTransport ); + } + } ); + return selected; + } + + return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" ); +} + +// A special extend for ajax options +// that takes "flat" options (not to be deep extended) +// Fixes #9887 +function ajaxExtend( target, src ) { + var key, deep, + flatOptions = jQuery.ajaxSettings.flatOptions || {}; + + for ( key in src ) { + if ( src[ key ] !== undefined ) { + ( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ]; + } + } + if ( deep ) { + jQuery.extend( true, target, deep ); + } + + return target; +} + +/* Handles responses to an ajax request: + * - finds the right dataType (mediates between content-type and expected dataType) + * - returns the corresponding response + */ +function ajaxHandleResponses( s, jqXHR, responses ) { + + var ct, type, finalDataType, firstDataType, + contents = s.contents, + dataTypes = s.dataTypes; + + // Remove auto dataType and get content-type in the process + while ( dataTypes[ 0 ] === "*" ) { + dataTypes.shift(); + if ( ct === undefined ) { + ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" ); + } + } + + // Check if we're dealing with a known content-type + if ( ct ) { + for ( type in contents ) { + if ( contents[ type ] && contents[ type ].test( ct ) ) { + dataTypes.unshift( type ); + break; + } + } + } + + // Check to see if we have a response for the expected dataType + if ( dataTypes[ 0 ] in responses ) { + finalDataType = dataTypes[ 0 ]; + } else { + + // Try convertible dataTypes + for ( type in responses ) { + if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) { + finalDataType = type; + break; + } + if ( !firstDataType ) { + firstDataType = type; + } + } + + // Or just use first one + finalDataType = finalDataType || firstDataType; + } + + // If we found a dataType + // We add the dataType to the list if needed + // and return the corresponding response + if ( finalDataType ) { + if ( finalDataType !== dataTypes[ 0 ] ) { + dataTypes.unshift( finalDataType ); + } + return responses[ finalDataType ]; + } +} + +/* Chain conversions given the request and the original response + * Also sets the responseXXX fields on the jqXHR instance + */ +function ajaxConvert( s, response, jqXHR, isSuccess ) { + var conv2, current, conv, tmp, prev, + converters = {}, + + // Work with a copy of dataTypes in case we need to modify it for conversion + dataTypes = s.dataTypes.slice(); + + // Create converters map with lowercased keys + if ( dataTypes[ 1 ] ) { + for ( conv in s.converters ) { + converters[ conv.toLowerCase() ] = s.converters[ conv ]; + } + } + + current = dataTypes.shift(); + + // Convert to each sequential dataType + while ( current ) { + + if ( s.responseFields[ current ] ) { + jqXHR[ s.responseFields[ current ] ] = response; + } + + // Apply the dataFilter if provided + if ( !prev && isSuccess && s.dataFilter ) { + response = s.dataFilter( response, s.dataType ); + } + + prev = current; + current = dataTypes.shift(); + + if ( current ) { + + // There's only work to do if current dataType is non-auto + if ( current === "*" ) { + + current = prev; + + // Convert response if prev dataType is non-auto and differs from current + } else if ( prev !== "*" && prev !== current ) { + + // Seek a direct converter + conv = converters[ prev + " " + current ] || converters[ "* " + current ]; + + // If none found, seek a pair + if ( !conv ) { + for ( conv2 in converters ) { + + // If conv2 outputs current + tmp = conv2.split( " " ); + if ( tmp[ 1 ] === current ) { + + // If prev can be converted to accepted input + conv = converters[ prev + " " + tmp[ 0 ] ] || + converters[ "* " + tmp[ 0 ] ]; + if ( conv ) { + + // Condense equivalence converters + if ( conv === true ) { + conv = converters[ conv2 ]; + + // Otherwise, insert the intermediate dataType + } else if ( converters[ conv2 ] !== true ) { + current = tmp[ 0 ]; + dataTypes.unshift( tmp[ 1 ] ); + } + break; + } + } + } + } + + // Apply converter (if not an equivalence) + if ( conv !== true ) { + + // Unless errors are allowed to bubble, catch and return them + if ( conv && s.throws ) { + response = conv( response ); + } else { + try { + response = conv( response ); + } catch ( e ) { + return { + state: "parsererror", + error: conv ? e : "No conversion from " + prev + " to " + current + }; + } + } + } + } + } + } + + return { state: "success", data: response }; +} + +jQuery.extend( { + + // Counter for holding the number of active queries + active: 0, + + // Last-Modified header cache for next request + lastModified: {}, + etag: {}, + + ajaxSettings: { + url: location.href, + type: "GET", + isLocal: rlocalProtocol.test( location.protocol ), + global: true, + processData: true, + async: true, + contentType: "application/x-www-form-urlencoded; charset=UTF-8", + + /* + timeout: 0, + data: null, + dataType: null, + username: null, + password: null, + cache: null, + throws: false, + traditional: false, + headers: {}, + */ + + accepts: { + "*": allTypes, + text: "text/plain", + html: "text/html", + xml: "application/xml, text/xml", + json: "application/json, text/javascript" + }, + + contents: { + xml: /\bxml\b/, + html: /\bhtml/, + json: /\bjson\b/ + }, + + responseFields: { + xml: "responseXML", + text: "responseText", + json: "responseJSON" + }, + + // Data converters + // Keys separate source (or catchall "*") and destination types with a single space + converters: { + + // Convert anything to text + "* text": String, + + // Text to html (true = no transformation) + "text html": true, + + // Evaluate text as a json expression + "text json": JSON.parse, + + // Parse text as xml + "text xml": jQuery.parseXML + }, + + // For options that shouldn't be deep extended: + // you can add your own custom options here if + // and when you create one that shouldn't be + // deep extended (see ajaxExtend) + flatOptions: { + url: true, + context: true + } + }, + + // Creates a full fledged settings object into target + // with both ajaxSettings and settings fields. + // If target is omitted, writes into ajaxSettings. + ajaxSetup: function( target, settings ) { + return settings ? + + // Building a settings object + ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) : + + // Extending ajaxSettings + ajaxExtend( jQuery.ajaxSettings, target ); + }, + + ajaxPrefilter: addToPrefiltersOrTransports( prefilters ), + ajaxTransport: addToPrefiltersOrTransports( transports ), + + // Main method + ajax: function( url, options ) { + + // If url is an object, simulate pre-1.5 signature + if ( typeof url === "object" ) { + options = url; + url = undefined; + } + + // Force options to be an object + options = options || {}; + + var transport, + + // URL without anti-cache param + cacheURL, + + // Response headers + responseHeadersString, + responseHeaders, + + // timeout handle + timeoutTimer, + + // Url cleanup var + urlAnchor, + + // Request state (becomes false upon send and true upon completion) + completed, + + // To know if global events are to be dispatched + fireGlobals, + + // Loop variable + i, + + // uncached part of the url + uncached, + + // Create the final options object + s = jQuery.ajaxSetup( {}, options ), + + // Callbacks context + callbackContext = s.context || s, + + // Context for global events is callbackContext if it is a DOM node or jQuery collection + globalEventContext = s.context && + ( callbackContext.nodeType || callbackContext.jquery ) ? + jQuery( callbackContext ) : + jQuery.event, + + // Deferreds + deferred = jQuery.Deferred(), + completeDeferred = jQuery.Callbacks( "once memory" ), + + // Status-dependent callbacks + statusCode = s.statusCode || {}, + + // Headers (they are sent all at once) + requestHeaders = {}, + requestHeadersNames = {}, + + // Default abort message + strAbort = "canceled", + + // Fake xhr + jqXHR = { + readyState: 0, + + // Builds headers hashtable if needed + getResponseHeader: function( key ) { + var match; + if ( completed ) { + if ( !responseHeaders ) { + responseHeaders = {}; + while ( ( match = rheaders.exec( responseHeadersString ) ) ) { + responseHeaders[ match[ 1 ].toLowerCase() + " " ] = + ( responseHeaders[ match[ 1 ].toLowerCase() + " " ] || [] ) + .concat( match[ 2 ] ); + } + } + match = responseHeaders[ key.toLowerCase() + " " ]; + } + return match == null ? null : match.join( ", " ); + }, + + // Raw string + getAllResponseHeaders: function() { + return completed ? responseHeadersString : null; + }, + + // Caches the header + setRequestHeader: function( name, value ) { + if ( completed == null ) { + name = requestHeadersNames[ name.toLowerCase() ] = + requestHeadersNames[ name.toLowerCase() ] || name; + requestHeaders[ name ] = value; + } + return this; + }, + + // Overrides response content-type header + overrideMimeType: function( type ) { + if ( completed == null ) { + s.mimeType = type; + } + return this; + }, + + // Status-dependent callbacks + statusCode: function( map ) { + var code; + if ( map ) { + if ( completed ) { + + // Execute the appropriate callbacks + jqXHR.always( map[ jqXHR.status ] ); + } else { + + // Lazy-add the new callbacks in a way that preserves old ones + for ( code in map ) { + statusCode[ code ] = [ statusCode[ code ], map[ code ] ]; + } + } + } + return this; + }, + + // Cancel the request + abort: function( statusText ) { + var finalText = statusText || strAbort; + if ( transport ) { + transport.abort( finalText ); + } + done( 0, finalText ); + return this; + } + }; + + // Attach deferreds + deferred.promise( jqXHR ); + + // Add protocol if not provided (prefilters might expect it) + // Handle falsy url in the settings object (#10093: consistency with old signature) + // We also use the url parameter if available + s.url = ( ( url || s.url || location.href ) + "" ) + .replace( rprotocol, location.protocol + "//" ); + + // Alias method option to type as per ticket #12004 + s.type = options.method || options.type || s.method || s.type; + + // Extract dataTypes list + s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ]; + + // A cross-domain request is in order when the origin doesn't match the current origin. + if ( s.crossDomain == null ) { + urlAnchor = document.createElement( "a" ); + + // Support: IE <=8 - 11, Edge 12 - 15 + // IE throws exception on accessing the href property if url is malformed, + // e.g. http://example.com:80x/ + try { + urlAnchor.href = s.url; + + // Support: IE <=8 - 11 only + // Anchor's host property isn't correctly set when s.url is relative + urlAnchor.href = urlAnchor.href; + s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !== + urlAnchor.protocol + "//" + urlAnchor.host; + } catch ( e ) { + + // If there is an error parsing the URL, assume it is crossDomain, + // it can be rejected by the transport if it is invalid + s.crossDomain = true; + } + } + + // Convert data if not already a string + if ( s.data && s.processData && typeof s.data !== "string" ) { + s.data = jQuery.param( s.data, s.traditional ); + } + + // Apply prefilters + inspectPrefiltersOrTransports( prefilters, s, options, jqXHR ); + + // If request was aborted inside a prefilter, stop there + if ( completed ) { + return jqXHR; + } + + // We can fire global events as of now if asked to + // Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118) + fireGlobals = jQuery.event && s.global; + + // Watch for a new set of requests + if ( fireGlobals && jQuery.active++ === 0 ) { + jQuery.event.trigger( "ajaxStart" ); + } + + // Uppercase the type + s.type = s.type.toUpperCase(); + + // Determine if request has content + s.hasContent = !rnoContent.test( s.type ); + + // Save the URL in case we're toying with the If-Modified-Since + // and/or If-None-Match header later on + // Remove hash to simplify url manipulation + cacheURL = s.url.replace( rhash, "" ); + + // More options handling for requests with no content + if ( !s.hasContent ) { + + // Remember the hash so we can put it back + uncached = s.url.slice( cacheURL.length ); + + // If data is available and should be processed, append data to url + if ( s.data && ( s.processData || typeof s.data === "string" ) ) { + cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data; + + // #9682: remove data so that it's not used in an eventual retry + delete s.data; + } + + // Add or update anti-cache param if needed + if ( s.cache === false ) { + cacheURL = cacheURL.replace( rantiCache, "$1" ); + uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) + + uncached; + } + + // Put hash and anti-cache on the URL that will be requested (gh-1732) + s.url = cacheURL + uncached; + + // Change '%20' to '+' if this is encoded form body content (gh-2658) + } else if ( s.data && s.processData && + ( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) { + s.data = s.data.replace( r20, "+" ); + } + + // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. + if ( s.ifModified ) { + if ( jQuery.lastModified[ cacheURL ] ) { + jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] ); + } + if ( jQuery.etag[ cacheURL ] ) { + jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] ); + } + } + + // Set the correct header, if data is being sent + if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) { + jqXHR.setRequestHeader( "Content-Type", s.contentType ); + } + + // Set the Accepts header for the server, depending on the dataType + jqXHR.setRequestHeader( + "Accept", + s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ? + s.accepts[ s.dataTypes[ 0 ] ] + + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) : + s.accepts[ "*" ] + ); + + // Check for headers option + for ( i in s.headers ) { + jqXHR.setRequestHeader( i, s.headers[ i ] ); + } + + // Allow custom headers/mimetypes and early abort + if ( s.beforeSend && + ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) { + + // Abort if not done already and return + return jqXHR.abort(); + } + + // Aborting is no longer a cancellation + strAbort = "abort"; + + // Install callbacks on deferreds + completeDeferred.add( s.complete ); + jqXHR.done( s.success ); + jqXHR.fail( s.error ); + + // Get transport + transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR ); + + // If no transport, we auto-abort + if ( !transport ) { + done( -1, "No Transport" ); + } else { + jqXHR.readyState = 1; + + // Send global event + if ( fireGlobals ) { + globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] ); + } + + // If request was aborted inside ajaxSend, stop there + if ( completed ) { + return jqXHR; + } + + // Timeout + if ( s.async && s.timeout > 0 ) { + timeoutTimer = window.setTimeout( function() { + jqXHR.abort( "timeout" ); + }, s.timeout ); + } + + try { + completed = false; + transport.send( requestHeaders, done ); + } catch ( e ) { + + // Rethrow post-completion exceptions + if ( completed ) { + throw e; + } + + // Propagate others as results + done( -1, e ); + } + } + + // Callback for when everything is done + function done( status, nativeStatusText, responses, headers ) { + var isSuccess, success, error, response, modified, + statusText = nativeStatusText; + + // Ignore repeat invocations + if ( completed ) { + return; + } + + completed = true; + + // Clear timeout if it exists + if ( timeoutTimer ) { + window.clearTimeout( timeoutTimer ); + } + + // Dereference transport for early garbage collection + // (no matter how long the jqXHR object will be used) + transport = undefined; + + // Cache response headers + responseHeadersString = headers || ""; + + // Set readyState + jqXHR.readyState = status > 0 ? 4 : 0; + + // Determine if successful + isSuccess = status >= 200 && status < 300 || status === 304; + + // Get response data + if ( responses ) { + response = ajaxHandleResponses( s, jqXHR, responses ); + } + + // Use a noop converter for missing script but not if jsonp + if ( !isSuccess && + jQuery.inArray( "script", s.dataTypes ) > -1 && + jQuery.inArray( "json", s.dataTypes ) < 0 ) { + s.converters[ "text script" ] = function() {}; + } + + // Convert no matter what (that way responseXXX fields are always set) + response = ajaxConvert( s, response, jqXHR, isSuccess ); + + // If successful, handle type chaining + if ( isSuccess ) { + + // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. + if ( s.ifModified ) { + modified = jqXHR.getResponseHeader( "Last-Modified" ); + if ( modified ) { + jQuery.lastModified[ cacheURL ] = modified; + } + modified = jqXHR.getResponseHeader( "etag" ); + if ( modified ) { + jQuery.etag[ cacheURL ] = modified; + } + } + + // if no content + if ( status === 204 || s.type === "HEAD" ) { + statusText = "nocontent"; + + // if not modified + } else if ( status === 304 ) { + statusText = "notmodified"; + + // If we have data, let's convert it + } else { + statusText = response.state; + success = response.data; + error = response.error; + isSuccess = !error; + } + } else { + + // Extract error from statusText and normalize for non-aborts + error = statusText; + if ( status || !statusText ) { + statusText = "error"; + if ( status < 0 ) { + status = 0; + } + } + } + + // Set data for the fake xhr object + jqXHR.status = status; + jqXHR.statusText = ( nativeStatusText || statusText ) + ""; + + // Success/Error + if ( isSuccess ) { + deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] ); + } else { + deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] ); + } + + // Status-dependent callbacks + jqXHR.statusCode( statusCode ); + statusCode = undefined; + + if ( fireGlobals ) { + globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError", + [ jqXHR, s, isSuccess ? success : error ] ); + } + + // Complete + completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] ); + + if ( fireGlobals ) { + globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] ); + + // Handle the global AJAX counter + if ( !( --jQuery.active ) ) { + jQuery.event.trigger( "ajaxStop" ); + } + } + } + + return jqXHR; + }, + + getJSON: function( url, data, callback ) { + return jQuery.get( url, data, callback, "json" ); + }, + + getScript: function( url, callback ) { + return jQuery.get( url, undefined, callback, "script" ); + } +} ); + +jQuery.each( [ "get", "post" ], function( _i, method ) { + jQuery[ method ] = function( url, data, callback, type ) { + + // Shift arguments if data argument was omitted + if ( isFunction( data ) ) { + type = type || callback; + callback = data; + data = undefined; + } + + // The url can be an options object (which then must have .url) + return jQuery.ajax( jQuery.extend( { + url: url, + type: method, + dataType: type, + data: data, + success: callback + }, jQuery.isPlainObject( url ) && url ) ); + }; +} ); + +jQuery.ajaxPrefilter( function( s ) { + var i; + for ( i in s.headers ) { + if ( i.toLowerCase() === "content-type" ) { + s.contentType = s.headers[ i ] || ""; + } + } +} ); + + +jQuery._evalUrl = function( url, options, doc ) { + return jQuery.ajax( { + url: url, + + // Make this explicit, since user can override this through ajaxSetup (#11264) + type: "GET", + dataType: "script", + cache: true, + async: false, + global: false, + + // Only evaluate the response if it is successful (gh-4126) + // dataFilter is not invoked for failure responses, so using it instead + // of the default converter is kludgy but it works. + converters: { + "text script": function() {} + }, + dataFilter: function( response ) { + jQuery.globalEval( response, options, doc ); + } + } ); +}; + + +jQuery.fn.extend( { + wrapAll: function( html ) { + var wrap; + + if ( this[ 0 ] ) { + if ( isFunction( html ) ) { + html = html.call( this[ 0 ] ); + } + + // The elements to wrap the target around + wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true ); + + if ( this[ 0 ].parentNode ) { + wrap.insertBefore( this[ 0 ] ); + } + + wrap.map( function() { + var elem = this; + + while ( elem.firstElementChild ) { + elem = elem.firstElementChild; + } + + return elem; + } ).append( this ); + } + + return this; + }, + + wrapInner: function( html ) { + if ( isFunction( html ) ) { + return this.each( function( i ) { + jQuery( this ).wrapInner( html.call( this, i ) ); + } ); + } + + return this.each( function() { + var self = jQuery( this ), + contents = self.contents(); + + if ( contents.length ) { + contents.wrapAll( html ); + + } else { + self.append( html ); + } + } ); + }, + + wrap: function( html ) { + var htmlIsFunction = isFunction( html ); + + return this.each( function( i ) { + jQuery( this ).wrapAll( htmlIsFunction ? html.call( this, i ) : html ); + } ); + }, + + unwrap: function( selector ) { + this.parent( selector ).not( "body" ).each( function() { + jQuery( this ).replaceWith( this.childNodes ); + } ); + return this; + } +} ); + + +jQuery.expr.pseudos.hidden = function( elem ) { + return !jQuery.expr.pseudos.visible( elem ); +}; +jQuery.expr.pseudos.visible = function( elem ) { + return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length ); +}; + + + + +jQuery.ajaxSettings.xhr = function() { + try { + return new window.XMLHttpRequest(); + } catch ( e ) {} +}; + +var xhrSuccessStatus = { + + // File protocol always yields status code 0, assume 200 + 0: 200, + + // Support: IE <=9 only + // #1450: sometimes IE returns 1223 when it should be 204 + 1223: 204 + }, + xhrSupported = jQuery.ajaxSettings.xhr(); + +support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported ); +support.ajax = xhrSupported = !!xhrSupported; + +jQuery.ajaxTransport( function( options ) { + var callback, errorCallback; + + // Cross domain only allowed if supported through XMLHttpRequest + if ( support.cors || xhrSupported && !options.crossDomain ) { + return { + send: function( headers, complete ) { + var i, + xhr = options.xhr(); + + xhr.open( + options.type, + options.url, + options.async, + options.username, + options.password + ); + + // Apply custom fields if provided + if ( options.xhrFields ) { + for ( i in options.xhrFields ) { + xhr[ i ] = options.xhrFields[ i ]; + } + } + + // Override mime type if needed + if ( options.mimeType && xhr.overrideMimeType ) { + xhr.overrideMimeType( options.mimeType ); + } + + // X-Requested-With header + // For cross-domain requests, seeing as conditions for a preflight are + // akin to a jigsaw puzzle, we simply never set it to be sure. + // (it can always be set on a per-request basis or even using ajaxSetup) + // For same-domain requests, won't change header if already provided. + if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) { + headers[ "X-Requested-With" ] = "XMLHttpRequest"; + } + + // Set headers + for ( i in headers ) { + xhr.setRequestHeader( i, headers[ i ] ); + } + + // Callback + callback = function( type ) { + return function() { + if ( callback ) { + callback = errorCallback = xhr.onload = + xhr.onerror = xhr.onabort = xhr.ontimeout = + xhr.onreadystatechange = null; + + if ( type === "abort" ) { + xhr.abort(); + } else if ( type === "error" ) { + + // Support: IE <=9 only + // On a manual native abort, IE9 throws + // errors on any property access that is not readyState + if ( typeof xhr.status !== "number" ) { + complete( 0, "error" ); + } else { + complete( + + // File: protocol always yields status 0; see #8605, #14207 + xhr.status, + xhr.statusText + ); + } + } else { + complete( + xhrSuccessStatus[ xhr.status ] || xhr.status, + xhr.statusText, + + // Support: IE <=9 only + // IE9 has no XHR2 but throws on binary (trac-11426) + // For XHR2 non-text, let the caller handle it (gh-2498) + ( xhr.responseType || "text" ) !== "text" || + typeof xhr.responseText !== "string" ? + { binary: xhr.response } : + { text: xhr.responseText }, + xhr.getAllResponseHeaders() + ); + } + } + }; + }; + + // Listen to events + xhr.onload = callback(); + errorCallback = xhr.onerror = xhr.ontimeout = callback( "error" ); + + // Support: IE 9 only + // Use onreadystatechange to replace onabort + // to handle uncaught aborts + if ( xhr.onabort !== undefined ) { + xhr.onabort = errorCallback; + } else { + xhr.onreadystatechange = function() { + + // Check readyState before timeout as it changes + if ( xhr.readyState === 4 ) { + + // Allow onerror to be called first, + // but that will not handle a native abort + // Also, save errorCallback to a variable + // as xhr.onerror cannot be accessed + window.setTimeout( function() { + if ( callback ) { + errorCallback(); + } + } ); + } + }; + } + + // Create the abort callback + callback = callback( "abort" ); + + try { + + // Do send the request (this may raise an exception) + xhr.send( options.hasContent && options.data || null ); + } catch ( e ) { + + // #14683: Only rethrow if this hasn't been notified as an error yet + if ( callback ) { + throw e; + } + } + }, + + abort: function() { + if ( callback ) { + callback(); + } + } + }; + } +} ); + + + + +// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432) +jQuery.ajaxPrefilter( function( s ) { + if ( s.crossDomain ) { + s.contents.script = false; + } +} ); + +// Install script dataType +jQuery.ajaxSetup( { + accepts: { + script: "text/javascript, application/javascript, " + + "application/ecmascript, application/x-ecmascript" + }, + contents: { + script: /\b(?:java|ecma)script\b/ + }, + converters: { + "text script": function( text ) { + jQuery.globalEval( text ); + return text; + } + } +} ); + +// Handle cache's special case and crossDomain +jQuery.ajaxPrefilter( "script", function( s ) { + if ( s.cache === undefined ) { + s.cache = false; + } + if ( s.crossDomain ) { + s.type = "GET"; + } +} ); + +// Bind script tag hack transport +jQuery.ajaxTransport( "script", function( s ) { + + // This transport only deals with cross domain or forced-by-attrs requests + if ( s.crossDomain || s.scriptAttrs ) { + var script, callback; + return { + send: function( _, complete ) { + script = jQuery( "<script>" ) + .attr( s.scriptAttrs || {} ) + .prop( { charset: s.scriptCharset, src: s.url } ) + .on( "load error", callback = function( evt ) { + script.remove(); + callback = null; + if ( evt ) { + complete( evt.type === "error" ? 404 : 200, evt.type ); + } + } ); + + // Use native DOM manipulation to avoid our domManip AJAX trickery + document.head.appendChild( script[ 0 ] ); + }, + abort: function() { + if ( callback ) { + callback(); + } + } + }; + } +} ); + + + + +var oldCallbacks = [], + rjsonp = /(=)\?(?=&|$)|\?\?/; + +// Default jsonp settings +jQuery.ajaxSetup( { + jsonp: "callback", + jsonpCallback: function() { + var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce.guid++ ) ); + this[ callback ] = true; + return callback; + } +} ); + +// Detect, normalize options and install callbacks for jsonp requests +jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { + + var callbackName, overwritten, responseContainer, + jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ? + "url" : + typeof s.data === "string" && + ( s.contentType || "" ) + .indexOf( "application/x-www-form-urlencoded" ) === 0 && + rjsonp.test( s.data ) && "data" + ); + + // Handle iff the expected data type is "jsonp" or we have a parameter to set + if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) { + + // Get callback name, remembering preexisting value associated with it + callbackName = s.jsonpCallback = isFunction( s.jsonpCallback ) ? + s.jsonpCallback() : + s.jsonpCallback; + + // Insert callback into url or form data + if ( jsonProp ) { + s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName ); + } else if ( s.jsonp !== false ) { + s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName; + } + + // Use data converter to retrieve json after script execution + s.converters[ "script json" ] = function() { + if ( !responseContainer ) { + jQuery.error( callbackName + " was not called" ); + } + return responseContainer[ 0 ]; + }; + + // Force json dataType + s.dataTypes[ 0 ] = "json"; + + // Install callback + overwritten = window[ callbackName ]; + window[ callbackName ] = function() { + responseContainer = arguments; + }; + + // Clean-up function (fires after converters) + jqXHR.always( function() { + + // If previous value didn't exist - remove it + if ( overwritten === undefined ) { + jQuery( window ).removeProp( callbackName ); + + // Otherwise restore preexisting value + } else { + window[ callbackName ] = overwritten; + } + + // Save back as free + if ( s[ callbackName ] ) { + + // Make sure that re-using the options doesn't screw things around + s.jsonpCallback = originalSettings.jsonpCallback; + + // Save the callback name for future use + oldCallbacks.push( callbackName ); + } + + // Call if it was a function and we have a response + if ( responseContainer && isFunction( overwritten ) ) { + overwritten( responseContainer[ 0 ] ); + } + + responseContainer = overwritten = undefined; + } ); + + // Delegate to script + return "script"; + } +} ); + + + + +// Support: Safari 8 only +// In Safari 8 documents created via document.implementation.createHTMLDocument +// collapse sibling forms: the second one becomes a child of the first one. +// Because of that, this security measure has to be disabled in Safari 8. +// https://bugs.webkit.org/show_bug.cgi?id=137337 +support.createHTMLDocument = ( function() { + var body = document.implementation.createHTMLDocument( "" ).body; + body.innerHTML = "<form></form><form></form>"; + return body.childNodes.length === 2; +} )(); + + +// Argument "data" should be string of html +// context (optional): If specified, the fragment will be created in this context, +// defaults to document +// keepScripts (optional): If true, will include scripts passed in the html string +jQuery.parseHTML = function( data, context, keepScripts ) { + if ( typeof data !== "string" ) { + return []; + } + if ( typeof context === "boolean" ) { + keepScripts = context; + context = false; + } + + var base, parsed, scripts; + + if ( !context ) { + + // Stop scripts or inline event handlers from being executed immediately + // by using document.implementation + if ( support.createHTMLDocument ) { + context = document.implementation.createHTMLDocument( "" ); + + // Set the base href for the created document + // so any parsed elements with URLs + // are based on the document's URL (gh-2965) + base = context.createElement( "base" ); + base.href = document.location.href; + context.head.appendChild( base ); + } else { + context = document; + } + } + + parsed = rsingleTag.exec( data ); + scripts = !keepScripts && []; + + // Single tag + if ( parsed ) { + return [ context.createElement( parsed[ 1 ] ) ]; + } + + parsed = buildFragment( [ data ], context, scripts ); + + if ( scripts && scripts.length ) { + jQuery( scripts ).remove(); + } + + return jQuery.merge( [], parsed.childNodes ); +}; + + +/** + * Load a url into a page + */ +jQuery.fn.load = function( url, params, callback ) { + var selector, type, response, + self = this, + off = url.indexOf( " " ); + + if ( off > -1 ) { + selector = stripAndCollapse( url.slice( off ) ); + url = url.slice( 0, off ); + } + + // If it's a function + if ( isFunction( params ) ) { + + // We assume that it's the callback + callback = params; + params = undefined; + + // Otherwise, build a param string + } else if ( params && typeof params === "object" ) { + type = "POST"; + } + + // If we have elements to modify, make the request + if ( self.length > 0 ) { + jQuery.ajax( { + url: url, + + // If "type" variable is undefined, then "GET" method will be used. + // Make value of this field explicit since + // user can override it through ajaxSetup method + type: type || "GET", + dataType: "html", + data: params + } ).done( function( responseText ) { + + // Save response for use in complete callback + response = arguments; + + self.html( selector ? + + // If a selector was specified, locate the right elements in a dummy div + // Exclude scripts to avoid IE 'Permission Denied' errors + jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) : + + // Otherwise use the full result + responseText ); + + // If the request succeeds, this function gets "data", "status", "jqXHR" + // but they are ignored because response was set above. + // If it fails, this function gets "jqXHR", "status", "error" + } ).always( callback && function( jqXHR, status ) { + self.each( function() { + callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] ); + } ); + } ); + } + + return this; +}; + + + + +jQuery.expr.pseudos.animated = function( elem ) { + return jQuery.grep( jQuery.timers, function( fn ) { + return elem === fn.elem; + } ).length; +}; + + + + +jQuery.offset = { + setOffset: function( elem, options, i ) { + var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition, + position = jQuery.css( elem, "position" ), + curElem = jQuery( elem ), + props = {}; + + // Set position first, in-case top/left are set even on static elem + if ( position === "static" ) { + elem.style.position = "relative"; + } + + curOffset = curElem.offset(); + curCSSTop = jQuery.css( elem, "top" ); + curCSSLeft = jQuery.css( elem, "left" ); + calculatePosition = ( position === "absolute" || position === "fixed" ) && + ( curCSSTop + curCSSLeft ).indexOf( "auto" ) > -1; + + // Need to be able to calculate position if either + // top or left is auto and position is either absolute or fixed + if ( calculatePosition ) { + curPosition = curElem.position(); + curTop = curPosition.top; + curLeft = curPosition.left; + + } else { + curTop = parseFloat( curCSSTop ) || 0; + curLeft = parseFloat( curCSSLeft ) || 0; + } + + if ( isFunction( options ) ) { + + // Use jQuery.extend here to allow modification of coordinates argument (gh-1848) + options = options.call( elem, i, jQuery.extend( {}, curOffset ) ); + } + + if ( options.top != null ) { + props.top = ( options.top - curOffset.top ) + curTop; + } + if ( options.left != null ) { + props.left = ( options.left - curOffset.left ) + curLeft; + } + + if ( "using" in options ) { + options.using.call( elem, props ); + + } else { + curElem.css( props ); + } + } +}; + +jQuery.fn.extend( { + + // offset() relates an element's border box to the document origin + offset: function( options ) { + + // Preserve chaining for setter + if ( arguments.length ) { + return options === undefined ? + this : + this.each( function( i ) { + jQuery.offset.setOffset( this, options, i ); + } ); + } + + var rect, win, + elem = this[ 0 ]; + + if ( !elem ) { + return; + } + + // Return zeros for disconnected and hidden (display: none) elements (gh-2310) + // Support: IE <=11 only + // Running getBoundingClientRect on a + // disconnected node in IE throws an error + if ( !elem.getClientRects().length ) { + return { top: 0, left: 0 }; + } + + // Get document-relative position by adding viewport scroll to viewport-relative gBCR + rect = elem.getBoundingClientRect(); + win = elem.ownerDocument.defaultView; + return { + top: rect.top + win.pageYOffset, + left: rect.left + win.pageXOffset + }; + }, + + // position() relates an element's margin box to its offset parent's padding box + // This corresponds to the behavior of CSS absolute positioning + position: function() { + if ( !this[ 0 ] ) { + return; + } + + var offsetParent, offset, doc, + elem = this[ 0 ], + parentOffset = { top: 0, left: 0 }; + + // position:fixed elements are offset from the viewport, which itself always has zero offset + if ( jQuery.css( elem, "position" ) === "fixed" ) { + + // Assume position:fixed implies availability of getBoundingClientRect + offset = elem.getBoundingClientRect(); + + } else { + offset = this.offset(); + + // Account for the *real* offset parent, which can be the document or its root element + // when a statically positioned element is identified + doc = elem.ownerDocument; + offsetParent = elem.offsetParent || doc.documentElement; + while ( offsetParent && + ( offsetParent === doc.body || offsetParent === doc.documentElement ) && + jQuery.css( offsetParent, "position" ) === "static" ) { + + offsetParent = offsetParent.parentNode; + } + if ( offsetParent && offsetParent !== elem && offsetParent.nodeType === 1 ) { + + // Incorporate borders into its offset, since they are outside its content origin + parentOffset = jQuery( offsetParent ).offset(); + parentOffset.top += jQuery.css( offsetParent, "borderTopWidth", true ); + parentOffset.left += jQuery.css( offsetParent, "borderLeftWidth", true ); + } + } + + // Subtract parent offsets and element margins + return { + top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ), + left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true ) + }; + }, + + // This method will return documentElement in the following cases: + // 1) For the element inside the iframe without offsetParent, this method will return + // documentElement of the parent window + // 2) For the hidden or detached element + // 3) For body or html element, i.e. in case of the html node - it will return itself + // + // but those exceptions were never presented as a real life use-cases + // and might be considered as more preferable results. + // + // This logic, however, is not guaranteed and can change at any point in the future + offsetParent: function() { + return this.map( function() { + var offsetParent = this.offsetParent; + + while ( offsetParent && jQuery.css( offsetParent, "position" ) === "static" ) { + offsetParent = offsetParent.offsetParent; + } + + return offsetParent || documentElement; + } ); + } +} ); + +// Create scrollLeft and scrollTop methods +jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) { + var top = "pageYOffset" === prop; + + jQuery.fn[ method ] = function( val ) { + return access( this, function( elem, method, val ) { + + // Coalesce documents and windows + var win; + if ( isWindow( elem ) ) { + win = elem; + } else if ( elem.nodeType === 9 ) { + win = elem.defaultView; + } + + if ( val === undefined ) { + return win ? win[ prop ] : elem[ method ]; + } + + if ( win ) { + win.scrollTo( + !top ? val : win.pageXOffset, + top ? val : win.pageYOffset + ); + + } else { + elem[ method ] = val; + } + }, method, val, arguments.length ); + }; +} ); + +// Support: Safari <=7 - 9.1, Chrome <=37 - 49 +// Add the top/left cssHooks using jQuery.fn.position +// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084 +// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347 +// getComputedStyle returns percent when specified for top/left/bottom/right; +// rather than make the css module depend on the offset module, just check for it here +jQuery.each( [ "top", "left" ], function( _i, prop ) { + jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition, + function( elem, computed ) { + if ( computed ) { + computed = curCSS( elem, prop ); + + // If curCSS returns percentage, fallback to offset + return rnumnonpx.test( computed ) ? + jQuery( elem ).position()[ prop ] + "px" : + computed; + } + } + ); +} ); + + +// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods +jQuery.each( { Height: "height", Width: "width" }, function( name, type ) { + jQuery.each( { + padding: "inner" + name, + content: type, + "": "outer" + name + }, function( defaultExtra, funcName ) { + + // Margin is only for outerHeight, outerWidth + jQuery.fn[ funcName ] = function( margin, value ) { + var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ), + extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" ); + + return access( this, function( elem, type, value ) { + var doc; + + if ( isWindow( elem ) ) { + + // $( window ).outerWidth/Height return w/h including scrollbars (gh-1729) + return funcName.indexOf( "outer" ) === 0 ? + elem[ "inner" + name ] : + elem.document.documentElement[ "client" + name ]; + } + + // Get document width or height + if ( elem.nodeType === 9 ) { + doc = elem.documentElement; + + // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], + // whichever is greatest + return Math.max( + elem.body[ "scroll" + name ], doc[ "scroll" + name ], + elem.body[ "offset" + name ], doc[ "offset" + name ], + doc[ "client" + name ] + ); + } + + return value === undefined ? + + // Get width or height on the element, requesting but not forcing parseFloat + jQuery.css( elem, type, extra ) : + + // Set width or height on the element + jQuery.style( elem, type, value, extra ); + }, type, chainable ? margin : undefined, chainable ); + }; + } ); +} ); + + +jQuery.each( [ + "ajaxStart", + "ajaxStop", + "ajaxComplete", + "ajaxError", + "ajaxSuccess", + "ajaxSend" +], function( _i, type ) { + jQuery.fn[ type ] = function( fn ) { + return this.on( type, fn ); + }; +} ); + + + + +jQuery.fn.extend( { + + bind: function( types, data, fn ) { + return this.on( types, null, data, fn ); + }, + unbind: function( types, fn ) { + return this.off( types, null, fn ); + }, + + delegate: function( selector, types, data, fn ) { + return this.on( types, selector, data, fn ); + }, + undelegate: function( selector, types, fn ) { + + // ( namespace ) or ( selector, types [, fn] ) + return arguments.length === 1 ? + this.off( selector, "**" ) : + this.off( types, selector || "**", fn ); + }, + + hover: function( fnOver, fnOut ) { + return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); + } +} ); + +jQuery.each( + ( "blur focus focusin focusout resize scroll click dblclick " + + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + + "change select submit keydown keypress keyup contextmenu" ).split( " " ), + function( _i, name ) { + + // Handle event binding + jQuery.fn[ name ] = function( data, fn ) { + return arguments.length > 0 ? + this.on( name, null, data, fn ) : + this.trigger( name ); + }; + } +); + + + + +// Support: Android <=4.0 only +// Make sure we trim BOM and NBSP +var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g; + +// Bind a function to a context, optionally partially applying any +// arguments. +// jQuery.proxy is deprecated to promote standards (specifically Function#bind) +// However, it is not slated for removal any time soon +jQuery.proxy = function( fn, context ) { + var tmp, args, proxy; + + if ( typeof context === "string" ) { + tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + args = slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || jQuery.guid++; + + return proxy; +}; + +jQuery.holdReady = function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } +}; +jQuery.isArray = Array.isArray; +jQuery.parseJSON = JSON.parse; +jQuery.nodeName = nodeName; +jQuery.isFunction = isFunction; +jQuery.isWindow = isWindow; +jQuery.camelCase = camelCase; +jQuery.type = toType; + +jQuery.now = Date.now; + +jQuery.isNumeric = function( obj ) { + + // As of jQuery 3.0, isNumeric is limited to + // strings and numbers (primitives or objects) + // that can be coerced to finite numbers (gh-2662) + var type = jQuery.type( obj ); + return ( type === "number" || type === "string" ) && + + // parseFloat NaNs numeric-cast false positives ("") + // ...but misinterprets leading-number strings, particularly hex literals ("0x...") + // subtraction forces infinities to NaN + !isNaN( obj - parseFloat( obj ) ); +}; + +jQuery.trim = function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); +}; + + + +// Register as a named AMD module, since jQuery can be concatenated with other +// files that may use define, but not via a proper concatenation script that +// understands anonymous AMD modules. A named AMD is safest and most robust +// way to register. Lowercase jquery is used because AMD module names are +// derived from file names, and jQuery is normally delivered in a lowercase +// file name. Do this after creating the global so that if an AMD module wants +// to call noConflict to hide this version of jQuery, it will work. + +// Note that for maximum portability, libraries that are not jQuery should +// declare themselves as anonymous modules, and avoid setting a global if an +// AMD loader is present. jQuery is a special case. For more information, see +// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon + +if ( typeof define === "function" && define.amd ) { + define( "jquery", [], function() { + return jQuery; + } ); +} + + + + +var + + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$; + +jQuery.noConflict = function( deep ) { + if ( window.$ === jQuery ) { + window.$ = _$; + } + + if ( deep && window.jQuery === jQuery ) { + window.jQuery = _jQuery; + } + + return jQuery; +}; + +// Expose jQuery and $ identifiers, even in AMD +// (#7102#comment:10, https://github.com/jquery/jquery/pull/557) +// and CommonJS for browser emulators (#13566) +if ( typeof noGlobal === "undefined" ) { + window.jQuery = window.$ = jQuery; +} + + + + +return jQuery; +} ); diff --git a/sphinxcontrib/jquery/jquery.js b/sphinxcontrib/jquery/jquery.js new file mode 100644 index 0000000..c4c6022 --- /dev/null +++ b/sphinxcontrib/jquery/jquery.js @@ -0,0 +1,2 @@ +/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=qt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+Rt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Wt(Pt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Bt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
Bundle jQuery instead of using CDN There are a couple of things from [the proposal](https://github.com/readthedocs/readthedocs.org/pull/9665) that aren't implemented. But I wanted to flag the usage of a CDN jQuery since it's currently implemented in a way that conflicts with the proposal.
We should probably also include the compat module from Sphinx 5, for projects relying on the changes Sphinx made to global JS state. A @AA-Turner can you elaborate? I'm not familiar with the concept, is it the module listed here from 7 years ago? https://www.npmjs.com/package/jquery-compat It'd be great to have a release that's 1:1 with Sphinx 5.x and then do subsequent updates. https://github.com/sphinx-doc/sphinx/blob/v5.3.0/sphinx/themes/basic/static/_sphinx_javascript_frameworks_compat.js Thanks! I will include it :+1: I understand from this quick explainer that it shouldn't be considered necessary moving forwards: https://www.oreilly.com/library/view/advancing-from-jquery/9781491963333/video255838.html Sorry, I don't understand your link. This compatability module factored out the patches Sphinx used to make to jQuery in doctools.js. I don't believe it has anything to do with the jQuery version? A Aaaaah okay, I got it confused with https://www.npmjs.com/package/jquery-compat Can you say something about the relevance of [_sphinx_javascript_frameworks_compat.js](https://github.com/sphinx-doc/sphinx/blob/v5.3.0/sphinx/themes/basic/static/_sphinx_javascript_frameworks_compat.js) moving forwards? If extensions rely on the patches to jQuery defined within it, and we remove the patches to jQuery, the extensions will break. A I've added a 3.0.0 and 4.0.0 milestone to distinguish between the releases so we can have 1:1 Sphinx 5.x support and then move forwards after that. Does that sound good?
2022-10-26T17:18:36
0.0
[]
[]
Open-EO/openeo-processes-dask
Open-EO__openeo-processes-dask-152
b1a1196be7d09e143f16aa8eb691f20ecaeac3af
diff --git a/openeo_processes_dask/process_implementations/arrays.py b/openeo_processes_dask/process_implementations/arrays.py index 58734514..3f8876e4 100644 --- a/openeo_processes_dask/process_implementations/arrays.py +++ b/openeo_processes_dask/process_implementations/arrays.py @@ -126,7 +126,7 @@ def array_concat(array1: ArrayLike, array2: ArrayLike) -> ArrayLike: return concat -def array_contains(data: ArrayLike, value: Any) -> bool: +def array_contains(data: ArrayLike, value: Any, axis=None) -> bool: # TODO: Contrary to the process spec, our implementation does interpret temporal strings before checking them here # This is somewhat implicit in how we currently parse parameters, so cannot be easily changed. @@ -135,15 +135,14 @@ def array_contains(data: ArrayLike, value: Any) -> bool: for dtype in valid_dtypes: if np.issubdtype(type(value), dtype): value_is_valid = True - if not value_is_valid: + if len(np.shape(data)) != 1 and axis is None: return False - - if len(np.shape(data)) != 1: + if not value_is_valid: return False if pd.isnull(value): - return np.isnan(data).any() + return np.isnan(data).any(axis=axis) else: - return np.isin(data, value).any() + return np.isin(data, value).any(axis=axis) def array_find(
Support `axis` keyword for array_contains `array_contains` is supposed to be a reducer, but doesn't currently support the required axis keyword.
2023-08-16T15:25:29
0.0
[]
[]
Open-EO/openeo-processes-dask
Open-EO__openeo-processes-dask-147
d60a2861b33898dcde57deffc4f9b24746fa918d
diff --git a/openeo_processes_dask/process_implementations/cubes/__init__.py b/openeo_processes_dask/process_implementations/cubes/__init__.py index aa4ade45..164a5795 100644 --- a/openeo_processes_dask/process_implementations/cubes/__init__.py +++ b/openeo_processes_dask/process_implementations/cubes/__init__.py @@ -2,6 +2,7 @@ from .aggregate import * from .apply import * from .general import * +from .indices import * from .load import * from .merge import * from .reduce import * diff --git a/openeo_processes_dask/process_implementations/cubes/indices.py b/openeo_processes_dask/process_implementations/cubes/indices.py new file mode 100644 index 00000000..a9a7ec75 --- /dev/null +++ b/openeo_processes_dask/process_implementations/cubes/indices.py @@ -0,0 +1,59 @@ +import xarray as xr + +from openeo_processes_dask.process_implementations.data_model import RasterCube +from openeo_processes_dask.process_implementations.exceptions import ( + BandExists, + DimensionAmbiguous, + NirBandAmbiguous, + RedBandAmbiguous, +) +from openeo_processes_dask.process_implementations.math import normalized_difference + +__all__ = ["ndvi"] + + +def ndvi(data: RasterCube, nir="nir", red="red", target_band=None): + if len(data.openeo.band_dims) == 0: + raise DimensionAmbiguous( + "Dimension of type `bands` is not available or is ambiguous." + ) + band_dim = data.openeo.band_dims[0] + available_bands = data.coords[band_dim] + + if nir not in available_bands or red not in available_bands: + try: + data = data.set_xindex("common_name") + except (ValueError, KeyError): + pass + + if ( + nir not in available_bands + and "common_name" in data.xindexes._coord_name_id.keys() + and nir not in data.coords["common_name"].data + ): + raise NirBandAmbiguous( + "The NIR band can't be resolved, please specify the specific NIR band name." + ) + elif ( + red not in available_bands + and "common_name" in data.xindexes._coord_name_id.keys() + and red not in data.coords["common_name"].data + ): + raise RedBandAmbiguous( + "The Red band can't be resolved, please specify the specific Red band name." + ) + + nir_band_dim = "common_name" if nir not in available_bands else band_dim + red_band_dim = "common_name" if red not in available_bands else band_dim + + nir_band = data.sel({nir_band_dim: nir}) + red_band = data.sel({red_band_dim: red}) + + nd = normalized_difference(nir_band, red_band) + if target_band is not None: + if target_band in data.coords: + raise BandExists("A band with the specified target name exists.") + nd = nd.expand_dims(band_dim).assign_coords({band_dim: [target_band]}) + nd = xr.merge([data, nd]) + nd.attrs = data.attrs + return nd diff --git a/openeo_processes_dask/process_implementations/exceptions.py b/openeo_processes_dask/process_implementations/exceptions.py index 42a67bd5..6d1cf128 100644 --- a/openeo_processes_dask/process_implementations/exceptions.py +++ b/openeo_processes_dask/process_implementations/exceptions.py @@ -64,3 +64,19 @@ class NoDataAvailable(OpenEOException): class TemporalExtentEmpty(OpenEOException): pass + + +class DimensionAmbiguous(OpenEOException): + pass + + +class NirBandAmbiguous(OpenEOException): + pass + + +class RedBandAmbiguous(OpenEOException): + pass + + +class BandExists(OpenEOException): + pass diff --git a/openeo_processes_dask/process_implementations/math.py b/openeo_processes_dask/process_implementations/math.py index 9ebd2bf9..d71ab8e2 100644 --- a/openeo_processes_dask/process_implementations/math.py +++ b/openeo_processes_dask/process_implementations/math.py @@ -59,7 +59,6 @@ "quantiles", "product", "normalized_difference", - "ndvi", ] @@ -326,41 +325,3 @@ def product(data, ignore_nodata=True, axis=None, keepdims=False): def normalized_difference(x, y): nd = (x - y) / (x + y) return nd - - -def ndvi(data, nir="nir", red="red", target_band=None): - r = np.nan - n = np.nan - if "bands" in data.dims: - if red == "red": - if "B04" in data["bands"].values: - r = data.sel(bands="B04") - elif red == "rededge": - if "B05" in data["bands"].values: - r = data.sel(bands="B05") - elif "B06" in data["bands"].values: - r = data.sel(bands="B06") - elif "B07" in data["bands"].values: - r = data.sel(bands="B07") - if nir == "nir": - n = data.sel(bands="B08") - elif nir == "nir08": - if "B8a" in data["bands"].values: - n = data.sel(bands="B8a") - elif "B8A" in data["bands"].values: - n = data.sel(bands="B8A") - elif "B05" in data["bands"].values: - n = data.sel(bands="B05") - elif nir == "nir09": - if "B09" in data["bands"].values: - n = data.sel(bands="B09") - if red in data["bands"].values: - r = data.sel(bands=red) - if nir in data["bands"].values: - n = data.sel(bands=nir) - nd = normalized_difference(n, r) - if target_band is not None: - nd = nd.assign_coords(bands=target_band) - # TODO: Remove this once we have the .openeo accessor - nd.attrs = data.attrs - return nd
NDVI process bugs There are multiple things to fix in the NDVI procesess: 1. The bands dimension is hardcoded, it should get it from the .openeo accessor instead 2. It calls multiple times data["bands"].values. It is not necessary, we just need to get the list once and use it multiple times. https://github.com/Open-EO/openeo-processes-dask/blob/6563c1809fc4108581b78763a970b3bea1d5d935/openeo_processes_dask/process_implementations/math.py#L331
2023-07-28T13:29:04
0.0
[]
[]
Open-EO/openeo-processes-dask
Open-EO__openeo-processes-dask-136
afca7c63b89a258b105d19d9a48cf76a135752e4
diff --git a/openeo_processes_dask/process_implementations/cubes/general.py b/openeo_processes_dask/process_implementations/cubes/general.py index d464f45a..d99e5e74 100644 --- a/openeo_processes_dask/process_implementations/cubes/general.py +++ b/openeo_processes_dask/process_implementations/cubes/general.py @@ -21,7 +21,7 @@ def drop_dimension(data: RasterCube, name: str) -> RasterCube: raise DimensionLabelCountMismatch( f"The number of dimension labels exceeds one, which requires a reducer. Dimension ({name}) has {len(data[name])} labels." ) - return data.drop(name) + return data.drop_vars(name).squeeze() def create_raster_cube() -> RasterCube:
Test for `drop_dimension` missing A test for the implemented `drop_dimension` process is currently missing.
2023-07-14T14:05:26
0.0
[]
[]
Open-EO/openeo-processes-dask
Open-EO__openeo-processes-dask-109
19d626f8cc1caaefffe6354d0120b1a1ff135d51
diff --git a/openeo_processes_dask/process_implementations/cubes/merge.py b/openeo_processes_dask/process_implementations/cubes/merge.py index aedb34b0..d59416e9 100644 --- a/openeo_processes_dask/process_implementations/cubes/merge.py +++ b/openeo_processes_dask/process_implementations/cubes/merge.py @@ -69,8 +69,8 @@ def merge_cubes( merged_cube = concat_both_cubes_rechunked else: # Example 3.2: Elementwise operation - positional_parameters = {"data": 0} - named_parameters = {"context": context} + positional_parameters = {} + named_parameters = {"x": cube1, "y": cube2, "context": context} merged_cube = concat_both_cubes_rechunked.reduce( overlap_resolver, @@ -153,8 +153,20 @@ def merge_cubes( | {dim: "auto" for dim in cube1.dims if dim != NEW_DIM_NAME} ) - positional_parameters = {"data": 0} - named_parameters = {"context": context} + conflicts_cube_1 = cube1.sel( + **{overlapping_dim: overlap_per_shared_dim[overlapping_dim].in_both} + ) + + conflicts_cube_2 = cube2.sel( + **{overlapping_dim: overlap_per_shared_dim[overlapping_dim].in_both} + ) + + positional_parameters = {} + named_parameters = { + "x": conflicts_cube_1, + "y": conflicts_cube_2, + "context": context, + } merge_conflicts = stacked_conflicts_rechunked.reduce( overlap_resolver, @@ -194,8 +206,16 @@ def merge_cubes( ) # Example 4: broadcast lower dimension cube to higher-dimension cube - lower_dim_cube = cube1 if len(cube1.dims) < len(cube2.dims) else cube2 - higher_dim_cube = cube1 if len(cube1.dims) >= len(cube2.dims) else cube2 + if len(cube1.dims) < len(cube2.dims): + lower_dim_cube = cube1 + higher_dim_cube = cube2 + is_cube1_lower_dim = True + + else: + lower_dim_cube = cube2 + higher_dim_cube = cube1 + is_cube1_lower_dim = False + lower_dim_cube_broadcast = lower_dim_cube.broadcast_like(higher_dim_cube) # Stack both cubes and use overlap resolver to resolve each pixel @@ -209,8 +229,16 @@ def merge_cubes( | {dim: "auto" for dim in cube1.dims if dim != NEW_DIM_NAME} ) - positional_parameters = {"data": 0} + positional_parameters = {} + named_parameters = {"context": context} + if is_cube1_lower_dim: + named_parameters["x"] = lower_dim_cube_broadcast + named_parameters["y"] = higher_dim_cube + else: + named_parameters["x"] = higher_dim_cube + named_parameters["y"] = lower_dim_cube_broadcast + merged_cube = both_stacked_rechunked.reduce( overlap_resolver, dim=NEW_DIM_NAME,
merge_cubes doesn't pass the right parameters to overlap_resolver In the current implementation, `merge_cubes` passes `data` to the resolver, but according to the spec it should be `x` and `y`. This needs to be fixed, otherwise any merge_cubes calls that require resolving an overlap will auto-fail.
2023-05-11T08:56:07
0.0
[]
[]
Open-EO/openeo-processes-dask
Open-EO__openeo-processes-dask-64
51b6926cfcad5514850809d66100a45fb68a087c
diff --git a/openeo_processes_dask/process_implementations/arrays.py b/openeo_processes_dask/process_implementations/arrays.py index ea7849ef..70058aeb 100644 --- a/openeo_processes_dask/process_implementations/arrays.py +++ b/openeo_processes_dask/process_implementations/arrays.py @@ -38,7 +38,7 @@ def array_element( index: Optional[int] = None, label: Optional[str] = None, return_nodata: Optional[bool] = False, - axis=-1, + axis=None, ): if index is None and label is None: raise ArrayElementParameterMissing( diff --git a/openeo_processes_dask/process_implementations/math.py b/openeo_processes_dask/process_implementations/math.py index dd686fda..38b18644 100644 --- a/openeo_processes_dask/process_implementations/math.py +++ b/openeo_processes_dask/process_implementations/math.py @@ -107,42 +107,42 @@ def add(x, y): return result -def _min(data, ignore_nodata=True, axis=-1): +def _min(data, ignore_nodata=True, axis=None): if ignore_nodata: return np.nanmin(data, axis=axis) else: return np.min(data, axis=axis) -def _max(data, ignore_nodata=True, axis=-1): +def _max(data, ignore_nodata=True, axis=None): if ignore_nodata: return np.nanmax(data, axis=axis) else: return np.max(data, axis=axis) -def median(data, ignore_nodata=True, axis=-1): +def median(data, ignore_nodata=True, axis=None): if ignore_nodata: return np.nanmedian(data, axis=axis) else: return np.median(data, axis=axis) -def mean(data, ignore_nodata=False, axis=-1): +def mean(data, ignore_nodata=False, axis=None): if ignore_nodata: return np.nanmean(data, axis=axis) else: return np.mean(data, axis=axis) -def sd(data, ignore_nodata=False, axis=-1): +def sd(data, ignore_nodata=False, axis=None): if ignore_nodata: return np.nanstd(data, axis=axis, ddof=1) else: return np.std(data, axis=axis, ddof=1) -def variance(data, ignore_nodata=False, axis=-1): +def variance(data, ignore_nodata=False, axis=None): if ignore_nodata: return np.nanvar(data, axis=axis, ddof=1) else: @@ -260,7 +260,7 @@ def power(base, p): return e -def extrema(data, ignore_nodata=True, axis=-1): +def extrema(data, ignore_nodata=True, axis=None): # TODO: Could be sped up by only iterating over array once minimum = _min(data, skipna=ignore_nodata, axis=axis) maximum = _max(data, skipna=ignore_nodata, axis=axis) @@ -273,7 +273,7 @@ def clip(x, min, max): return np.clip(x, min, max) -def quantiles(data, probabilities=None, q=None, ignore_nodata=True, axis=-1): +def quantiles(data, probabilities=None, q=None, ignore_nodata=True, axis=None): if probabilities is not None and q is not None: raise QuantilesParameterConflict( "The process `quantiles` requires either the `probabilities` or `q` parameter to be set." @@ -305,7 +305,7 @@ def quantiles(data, probabilities=None, q=None, ignore_nodata=True, axis=-1): return result -def _sum(data, ignore_nodata=True, axis=-1): +def _sum(data, ignore_nodata=True, axis=None): if len(data) == 0: return nan(data=data) @@ -316,7 +316,7 @@ def _sum(data, ignore_nodata=True, axis=-1): return result -def product(data, ignore_nodata=True, axis=-1): +def product(data, ignore_nodata=True, axis=None): if len(data) == 0: return nan(data=data)
Reducer processes should default to `axis=None` not to `axis=-1` Hadn't realised that -1 in numpy actually selects the last axis, even though we want to reduce over the flattened array. This is currently wrong in all the processes that take the axis parameter.
2023-02-21T13:12:01
0.0
[]
[]
DovaX/dbhydra
DovaX__dbhydra-29
16a43153977eb6feb23d56cd1978e0f3c96b83a4
diff --git a/dbhydra/dbhydra_core.py b/dbhydra/dbhydra_core.py index f9558f6..eb5c299 100644 --- a/dbhydra/dbhydra_core.py +++ b/dbhydra/dbhydra_core.py @@ -17,6 +17,28 @@ MONGO_OPERATOR_DICT = {"=": "$eq", ">": "$gt", ">=": "$gte", " IN ": "$in", "<": "$lt", "<=": "$lte", "<>": "$ne"} +POSTGRES_TO_MYSQL_DATA_MAPPING = { + "int": "int", + "integer": "int", + "bigint": "bigint", + "smallint": "smallint", + "character varying": "varchar", + "text": "longtext", + "boolean": "tinyint", + "double precision": "double", + "real": "float", + "numeric": "decimal", + "date": "date", + "timestamp": "timestamp" +} + +PYTHON_TO_MYSQL_DATA_MAPPING = { + 'int': "int", + 'float': "double", + 'str': "varchar(255)", + 'bool': "tinyint", + 'datetime': "datetime" +} def read_file(file): """Reads txt file -> list""" @@ -80,9 +102,14 @@ def new_function(instance, *args, **kw): return (new_function) +# class DataMigrator: + + + class Migrator: - def __init__(self, db=None): + def __init__(self, db=None, db2=None): self.db = db + self.db2 = db2 self.migration_number = 1 self.migration_list = [] @@ -92,10 +119,10 @@ def process_migration_dict(self, migration_dict): options = migration_dict[operation] if operation == "create": if (isinstance(self.db, Mysqldb)): - table = MysqlTable(self.db, options["table_name"], options["columns"], options["types"]) elif (isinstance(self.db, PostgresDb)): table = PostgresTable(self.db, options["table_name"], options["columns"], options["types"]) + table.convert_types_from_mysql() table.create() elif operation == "drop": if (isinstance(self.db, Mysqldb)): @@ -110,6 +137,7 @@ def process_migration_dict(self, migration_dict): table = PostgresTable(self.db, options["table_name"]) table.initialize_columns() table.initialize_types() + table.convert_types_from_mysql() table.add_column(options["column_name"], options["column_type"]) elif operation == "modify_column": if (isinstance(self.db, Mysqldb)): @@ -118,6 +146,7 @@ def process_migration_dict(self, migration_dict): table = PostgresTable(self.db, options["table_name"]) table.initialize_columns() table.initialize_types() + table.convert_types_from_mysql() table.modify_column(options["column_name"], options["column_type"]) elif operation == "drop_column": if (isinstance(self.db, Mysqldb)): @@ -128,6 +157,8 @@ def process_migration_dict(self, migration_dict): table.initialize_types() table.drop_column(options["column_name"]) + + def next_migration(self): self.migration_number += 1 self.migration_list = [] @@ -151,7 +182,7 @@ def migration_list_to_json(self, filename=None): with open("migrations/migration-" + str(self.migration_number) + ".json", "w+") as f: f.write(result) else: - with open(f"{filename}.json", "w+") as f: + with open(f"migrations/{filename}.json", "w+") as f: f.write(result) def create_migrations_from_df(self, name, dataframe): @@ -167,10 +198,24 @@ def extract_columns_and_types_from_df(self, dataframe): columns = list(dataframe.columns) return_types = [] + + if columns == []: + return ["id"], ["int"] + for column in dataframe: + if dataframe.empty: + return_types.append(type(None).__name__) + continue + t = dataframe.loc[0, column] try: - return_types.append(type(t.item()).__name__) + if pd.isna(t): + return_types.append(type(None).__name__) + else: + try: + return_types.append(type(t.item()).__name__) + except: + return_types.append(type(t).__name__) except: # length = 2**( int(dataframe[col].str.len().max()) - 1).bit_length() length = int(dataframe[column].str.len().max()) @@ -276,8 +321,8 @@ def close_connection(self): self.connection.close() print("DB connection closed") - def initialize_migrator(self): - self.migrator = Migrator(self) + def initialize_migrator(self, other_db=None): + self.migrator = Migrator(self, other_db) class AbstractDBPostgres(AbstractDB): @@ -439,7 +484,8 @@ def execute(self, query): def get_all_tables(self): self.cursor.execute("""SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'""") - return [''.join(i) for i in self.cursor.fetchall()] + tables = [''.join(x) for x in self.cursor.fetchall()] + return tables def generate_table_dict(self): tables = self.get_all_tables() @@ -450,22 +496,22 @@ def generate_table_dict(self): return (table_dict) -class BigQueryDb: - def __init__(self, credentials_path, project_id): +class BigQueryDb(AbstractDB): + def __init__(self, credentials_path, project_id, dataset_name): # super().__init__(None,None) self.credentials_path = credentials_path self.project_id = project_id + self.dataset = dataset_name self.credentials = service_account.Credentials.from_service_account_file(self.credentials_path, scopes=[ "https://www.googleapis.com/auth/cloud-platform"], ) - self.client = bigquery.Client(credentials=self.credentials, project=self.credentials.project_id, ) def connect_remotely(self): - print("Connect remotely") + self.client = bigquery.Client(credentials=self.credentials, project=self.credentials.project_id) def connect_locally(self): - print("Connect locally") + raise Exception("Cannot connect locally to Big Query") def close_connection(self): self.client.close() @@ -476,6 +522,26 @@ def select_to_df(self, query): return df + def get_all_tables(self): + query = f""" + SELECT table_name + FROM {self.dataset}.INFORMATION_SCHEMA.TABLES + """ + rows = list(self.client.query(query)) + table_names = [row[0] for row in rows] + return table_names + + def generate_table_dict(self): + tables = self.get_all_tables() + table_dict = dict() + for i, table in enumerate(tables): + table_dict[table] = BigQueryTable.init_all_columns(self, table) + + return (table_dict) + + + + def execute(self, query): # query_job = self.client.query( # """ @@ -530,7 +596,8 @@ def get_all_tables(self): return self.database.list_collection_names() def create_table(self, name): - return self.database[name] + table = self.database[name] + return table def createTable(self, name): print("WARNING: `createTable` method will be deprecated in favor of `create_table`") @@ -586,9 +653,15 @@ def select(self, query): return (cleared_rows_list) def select_all(self): - list1 = self.select("SELECT * FROM " + self.name) + all_cols_query = "" + for col in self.columns: + all_cols_query = all_cols_query + col + "," + if all_cols_query[-1] == ",": + all_cols_query = all_cols_query[:-1] + list1 = self.select(f"SELECT {all_cols_query} FROM " + self.name) return (list1) + def select_to_df(self): rows = self.select_all() table_columns = self.columns @@ -682,13 +755,15 @@ def _adjust_df(self, df: pd.DataFrame, debug_mode=False) -> pd.DataFrame: return df_copy - def insert_from_df(self, df, batch=1, try_mode=False, debug_mode=False, adjust_df=False): + def insert_from_df(self, df, batch=1, try_mode=False, debug_mode=False, adjust_df=False, insert_id=False): if adjust_df: df = self._adjust_df(df, debug_mode) - assert len(df.columns) + 1 == len(self.columns) # +1 because of id column - + if insert_id: + assert len(df.columns) == len(self.columns) + else: + assert len(df.columns) + 1 == len(self.columns) # +1 because of id column pd_nullable_dtypes = {pd.Int8Dtype(), pd.Int16Dtype(), pd.Int32Dtype(), pd.Int64Dtype(), pd.UInt8Dtype(), pd.UInt16Dtype(), pd.UInt32Dtype(), pd.UInt64Dtype(), pd.Float32Dtype(), pd.Float64Dtype()} @@ -708,7 +783,7 @@ def insert_from_df(self, df, batch=1, try_mode=False, debug_mode=False, adjust_d for j, record in enumerate(row): if type(record) == str: rows[i][j] = "'" + record + "'" - self.insert(rows, batch=batch, try_mode=try_mode, debug_mode=False) + self.insert(rows, batch=batch, try_mode=try_mode, debug_mode=False, insert_id=insert_id) def delete(self, where=None): @@ -724,21 +799,50 @@ class PostgresTable(AbstractTable): def __init__(self, db1, name, columns=None, types=None): super().__init__(db1, name, columns) self.types = types + print("==========================================") + def initialize_columns(self): + information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS') + query = f"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "';" + columns = information_schema_table.select(query) + self.columns = columns + + def initialize_types(self): + # information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS', ['DATA_TYPE'], ['nvarchar(50)']) + # query = f"SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "'" + # types = information_schema_table.select(query) + self.types = self.get_all_types() + def get_all_columns(self): information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS') query = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "'" columns = information_schema_table.select(query) - print(columns) + return (columns) + def convert_types_from_mysql(self): + inverse_dict_mysql_to_postgres = dict(zip(POSTGRES_TO_MYSQL_DATA_MAPPING.values(), POSTGRES_TO_MYSQL_DATA_MAPPING.keys())) + postgres_types = list(map(lambda x: inverse_dict_mysql_to_postgres.get(x, x), self.types)) + self.types = postgres_types + def get_all_types(self): + information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS', ['DATA_TYPE'], ['nvarchar(50)']) - query = "SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "'" + query = "SELECT DATA_TYPE,character_maximum_length FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "'" types = information_schema_table.select(query) - print(types) - return (types) + types = [x[0] for x in types] + types = [x.lower() for x in types] + lengths = [x[1] for x in types] + + mysql_types = list(map(lambda x: POSTGRES_TO_MYSQL_DATA_MAPPING.get(x, x), types)) + + for i in range(len(mysql_types)): + if lengths[i] is not None: + mysql_types[i] = mysql_types[i] + f"({lengths[i]})" + + return (mysql_types) + def select_all(self): print(super().select_all()) @@ -749,74 +853,94 @@ def init_all_columns(cls, db1, name): temporary_table = cls(db1, name) columns = temporary_table.get_all_columns() types = temporary_table.get_all_types() + + if "id" in columns: + id_col_index = columns.index("id") + columns.pop(id_col_index) + columns.insert(0, "id") + types.pop(id_col_index) + types.insert(0, "int") + return (cls(db1, name, columns, types)) - @save_migration + # @save_migration def create(self, foreign_keys=None): assert len(self.columns) == len(self.types) assert self.columns[0] == "id" - assert self.types[0] == "int" + assert self.types[0].lower() == "int" or self.types[0].lower() == "integer" query = "CREATE TABLE " + self.name + "(id SERIAL PRIMARY KEY," for i in range(1, len(self.columns)): query += self.columns[i] + " " + self.types[i] + "," query = query[:-1] - query += ")" + query += ");" print(query) try: - self.db1.cursor.execute(query) + self.db1.execute(query) except Exception as e: print("Table " + self.name + " already exists:", e) print("Check the specification of table columns and their types") - def insert(self, rows, batch=1, replace_apostrophes=True, try_mode=False, debug_mode=False): + def insert(self, rows, batch=1, replace_apostrophes=True, try_mode=False, debug_mode=False, insert_id=False): + start_index = 0 if insert_id else 1 print("INSERTING!!!") assert len(self.columns) == len(self.types) print(self.types) for k in range(len(rows)): if k % batch == 0: query = "INSERT INTO " + self.name + " (" - for i in range(1, len(self.columns)): + for i in range(start_index, len(self.columns)): if i < len(rows[k]) + 1: query += self.columns[i] + "," if len(rows) < len(self.columns): print(len(self.columns) - len(rows), "columns were not specified") - query = query[:-1] + ") VALUES " + if query[-1] == ',': + query = query[:-1] + query = query + ") VALUES " + elif query[-1] == '(': + query = query[:-1] + query = query + " VALUES " + + query += "(" for j in range(len(rows[k])): if rows[k][j] == "NULL" or rows[k][j] == "'NULL'" or rows[k][j] == None or rows[k][ j] == "None": # NaN hodnoty - if "int" in self.types[j + 1]: + if "int" in self.types[j + start_index]: if replace_apostrophes: rows[k][j] = str(rows[k][j]).replace("'", "") query += "NULL," else: query += "NULL," - elif "nvarchar" in self.types[j + 1]: + elif "nvarchar" in self.types[j + start_index]: if replace_apostrophes: rows[k][j] = str(rows[k][j]).replace("'", "") query += "N'" + str(rows[k][j]) + "'," - elif "varchar" in self.types[j + 1]: + elif "varchar" in self.types[j + start_index]: if replace_apostrophes: rows[k][j] = str(rows[k][j]).replace("'", "") query += "'" + str(rows[k][j]) + "'," - elif self.types[j + 1] == "int": + elif self.types[j + start_index] == "int": query += str(rows[k][j]) + "," - elif "datetime" in self.types[j + 1]: + elif "datetime" in self.types[j + start_index]: if replace_apostrophes: rows[k][j] = str(rows[k][j]).replace("'", "") query += "'" + str(rows[k][j]) + "'," - elif "date" in self.types[j + 1]: + elif "date" in self.types[j + start_index]: query += "'" + str(rows[k][j]) + "'," else: query += str(rows[k][j]) + "," + if query[-1] == ",": + query = query[:-1] + elif query[-1] == '(': + query = query + "DEFAULT" - query = query[:-1] + ")," + query = query + ")," if k % batch == batch - 1 or k == len(rows) - 1: query = query[:-1] @@ -873,6 +997,27 @@ def modify_column(self, column_name, new_column_type): except Exception as e: print("Cant add column to table.") +class BigQueryTable(): + def __init__(self, db, name, columns=None, types=None): + self.name = name + self.db = db + self.columns = columns + self.types = types + + @classmethod + def init_all_columns(cls, db1, name): + temporary_table = cls(db1, name) + columns,types = temporary_table.get_all_columns_and_types() + + return (cls(db1, name, columns, types)) + + def get_all_columns_and_types(self): + results = self.db.client.get_table(self.name) + column_names = [x.name for x in results.schema ] + column_types = [x.field_type for x in results.schema] + return column_names, column_types + + class MongoTable(): def __init__(self, db, name, columns=[], types=[]): @@ -881,6 +1026,8 @@ def __init__(self, db, name, columns=[], types=[]): print("==========================================") print(type(db)) print(db) + self.columns = columns + self.types = types self.collection = self.db1.create_table(name) def create(self): @@ -933,7 +1080,9 @@ def delete(self, query={}): def update(self, newvalues, query): return self.collection.update_many(query, newvalues) - def insert_from_df(self, dataframe): + def insert_from_df(self, dataframe, insert_id=None): + if dataframe.empty: + return dataframe = dataframe.replace({pd.NA: None}) dict_from_df = dataframe.to_dict('records') # dict_from_df = dataframe.apply(lambda x : x.dropna().to_dict(),axis=1).tolist() #get rid of nans @@ -953,8 +1102,19 @@ def init_all_columns(cls, db1, name): temporary_table = cls(db1, name) values = temporary_table.get_columns_types() - columns = values[0] - types = values[1] + columns = values[0][1:] + types = values[1][1:] + + if "id" in columns: + index = columns.index("id") + columns.pop(index) + types.pop(index) + + columns.insert(0, "id") + types.insert(0, "int") + types = [x.lower() for x in types] + types_ = [PYTHON_TO_MYSQL_DATA_MAPPING[x] for x in types] + types = types_ return (cls(db1, name, columns, types)) def keys_exists(self, element, *keys): @@ -999,6 +1159,8 @@ def get_columns_types(self): for dict_j in self.collection.find(): self.print_nested_keys(dict_j, columns, types) types = self.get_all_types(types) + self.columns = columns + self.types = types return columns, types def get_all_types(self, types): @@ -1048,7 +1210,7 @@ def get_all_types(self): def create(self): assert len(self.columns) == len(self.types) assert self.columns[0] == "id" - assert self.types[0] == "int" + assert self.types[0].lower() == "int" query = "CREATE TABLE " + self.name + "(id INT IDENTITY(1,1) NOT NULL," for i in range(1, len(self.columns)): query += self.columns[i] + " " + self.types[i] + "," @@ -1145,19 +1307,22 @@ def __init__(self, db1, name, columns=None, types=None): def initialize_columns(self): information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS') - query = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "';" + query = f"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '{self.db1.DB_DATABASE}' AND TABLE_NAME = '" + self.name + "';" columns = information_schema_table.select(query) self.columns = columns + def convert_types_from_mysql(self): + pass + def initialize_types(self): - information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS', ['DATA_TYPE'], ['nvarchar(50)']) - query = "SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "'" - types = information_schema_table.select(query) - self.types = types + # information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS', ['DATA_TYPE'], ['nvarchar(50)']) + # query = f"SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '{self.db1.DB_DATABASE}' AND TABLE_NAME = '" + self.name + "'" + # types = information_schema_table.select(query) + self.types = self.get_all_types() def get_all_columns(self): information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS') - query = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "'" + query = f"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '{self.db1.DB_DATABASE}' AND TABLE_NAME = '" + self.name + "'" columns = information_schema_table.select(query) return (columns) @@ -1165,15 +1330,33 @@ def get_all_columns(self): def get_all_types(self): information_schema_table = Table(self.db1, 'INFORMATION_SCHEMA.COLUMNS', ['DATA_TYPE'], ['nvarchar(50)']) - query = "SELECT DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" + self.name + "'" + query = f"SELECT DATA_TYPE,character_maximum_length FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '{self.db1.DB_DATABASE}' AND TABLE_NAME = '" + self.name + "'" types = information_schema_table.select(query) - return (types) + only_types = [x[0] for x in types] + lengths = [x[1] for x in types] + + for i in range(len(only_types)): + if lengths[i] is not None: + only_types[i] = only_types[i] + f"({lengths[i]})" + return (only_types) + + @classmethod def init_all_columns(cls, db1, name): temporary_table = cls(db1, name) columns = temporary_table.get_all_columns() types = temporary_table.get_all_types() + + if "id" in columns: + id_col_index = columns.index("id") + columns.pop(id_col_index) + columns.insert(0, "id") + types.pop(id_col_index) + types.insert(0, "int") + + + return (cls(db1, name, columns, types)) def get_last_id(self): @@ -1194,7 +1377,7 @@ def drop(self): def create(self, foreign_keys=None): assert len(self.columns) == len(self.types) assert self.columns[0] == "id" - assert self.types[0] == "int" + assert self.types[0].lower() == "int" query = "CREATE TABLE " + self.name + "(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY," for i in range(1, len(self.columns)): query += self.columns[i] + " " + self.types[i] + "," @@ -1209,54 +1392,59 @@ def create(self, foreign_keys=None): print("Table " + self.name + " already exists:", e) print("Check the specification of table columns and their types") - def insert(self, rows, batch=1, replace_apostrophes=True, try_mode=False, debug_mode=False): + def insert(self, rows, batch=1, replace_apostrophes=True, try_mode=False, debug_mode=False, insert_id=False): + start_index = 0 if insert_id else 1 print("INSERTING!!!") assert len(self.columns) == len(self.types) print(self.types) for k in range(len(rows)): if k % batch == 0: query = "INSERT INTO " + self.name + " (" - for i in range(1, len(self.columns)): + for i in range(start_index, len(self.columns)): if i < len(rows[k]) + 1: query += self.columns[i] + "," if len(rows) < len(self.columns): print(len(self.columns) - len(rows), "columns were not specified") - query = query[:-1] + ") VALUES " + if query[-1] == ',': + query = query[:-1] + query = query + ") VALUES " query += "(" for j in range(len(rows[k])): if rows[k][j] == "NULL" or rows[k][j] == "'NULL'" or rows[k][j] == None or rows[k][ j] == "None": # NaN hodnoty - if "int" in self.types[j + 1]: + if "int" in self.types[j + start_index]: if replace_apostrophes: rows[k][j] = str(rows[k][j]).replace("'", "") query += "NULL," else: query += "NULL," - elif "nvarchar" in self.types[j + 1]: + elif "nvarchar" in self.types[j + start_index]: if replace_apostrophes: rows[k][j] = str(rows[k][j]).replace("'", "") query += "N'" + str(rows[k][j]) + "'," - elif "varchar" in self.types[j + 1]: + elif "varchar" in self.types[j + start_index]: if replace_apostrophes: rows[k][j] = str(rows[k][j]).replace("'", "") query += "'" + str(rows[k][j]) + "'," - elif self.types[j + 1] == "int": + elif self.types[j + start_index] == "int": query += str(rows[k][j]) + "," - elif "datetime" in self.types[j + 1]: + elif "datetime" in self.types[j + start_index]: if replace_apostrophes: rows[k][j] = str(rows[k][j]).replace("'", "") query += "'" + str(rows[k][j]) + "'," - elif "date" in self.types[j + 1]: + elif "date" in self.types[j + start_index]: query += "'" + str(rows[k][j]) + "'," else: query += str(rows[k][j]) + "," + if query[-1] == ",": + query = query[:-1] - query = query[:-1] + ")," + query = query + ")," if k % batch == batch - 1 or k == len(rows) - 1: query = query[:-1] @@ -1305,7 +1493,7 @@ def drop_column(self, column_name): try: print(command) self.db1.execute(command) - index = self.db1.columns.index(column_name) + index = self.columns.index(column_name) self.db1.columns.remove(column_name) self.db1.types.remove(self.db1.types[index]) except Exception as e:
tobias to dev Big Query preparations
2023-03-12T23:52:09
0.0
[]
[]
ljnsn/cz-conventional-gitmoji
ljnsn__cz-conventional-gitmoji-232
6b01786c9eee818606f9949005cee352a357080f
diff --git a/pyproject.toml b/pyproject.toml index b5b92cd..76857a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,6 +56,18 @@ line-ending = "lf" indent-style = "space" [tool.ruff.lint] +extend-select = [ + # pydocstyle + "D", + # isort + "I", + # pep8-naming + "N", + # pygrep hooks (formerly done by pre-commit) + "PGH", + # tidy imports + "TID", +] ignore = [ # Line too long "E501", @@ -63,6 +75,12 @@ ignore = [ "F403", # may be undefined or defined from star imports "F405", + # Missing docstring in public module + "D100", + # Missing docstring in `__init__` + "D107", + # Multi-line docstring summary should start at the first line + "D212", ] unfixable = ["F401", "F841"] diff --git a/src/cz_gitmoji/main.py b/src/cz_gitmoji/main.py index e1b3dc4..a97f8d6 100644 --- a/src/cz_gitmoji/main.py +++ b/src/cz_gitmoji/main.py @@ -31,6 +31,8 @@ def parse_subject(text: str) -> str: class CommitizenGitmojiCz(BaseCommitizen): + """Cz Gitmoji plugin.""" + # pattern to match messages for bumping # if none of these match, version will not be bumped (unless manually specified) bump_pattern = ( diff --git a/src/gitmojify/mojify.py b/src/gitmojify/mojify.py index 06b7773..44694fa 100644 --- a/src/gitmojify/mojify.py +++ b/src/gitmojify/mojify.py @@ -5,8 +5,8 @@ from typing import Dict, List, Optional from shared.model import Gitmoji -from shared.utils import get_gitmojis, get_pattern from shared.settings import get_settings +from shared.utils import get_gitmojis, get_pattern def _get_args() -> argparse.Namespace: diff --git a/src/shared/settings.py b/src/shared/settings.py index 76ffbe6..c276687 100644 --- a/src/shared/settings.py +++ b/src/shared/settings.py @@ -3,7 +3,6 @@ from typing import List, Optional import attrs - from commitizen import config DEFAULT_CONVERT_PREFIXES = ["Merge", "Revert", "Squash"] diff --git a/uv.lock b/uv.lock index ec35eff..b757238 100644 --- a/uv.lock +++ b/uv.lock @@ -278,7 +278,7 @@ toml = [ [[package]] name = "cz-conventional-gitmoji" -version = "0.5.0" +version = "0.5.4" source = { editable = "." } dependencies = [ { name = "attrs" },
Ruff isort is not enabled In this repo original `pyproject.toml`, I saw the [ruff isort settings](https://github.com/ljnsn/cz-conventional-gitmoji/blob/6b01786c9eee818606f9949005cee352a357080f/pyproject.toml#L73). But the project hasn't enabled the I-series checks (pre-commit won't check them either). ![image](https://github.com/user-attachments/assets/b56ca7a9-a898-4635-b788-29ba5646464b) Could you consider enabling this check?
2024-10-13T11:49:48
0.0
[]
[]
facelessuser/mkdocs-material-extensions
facelessuser__mkdocs-material-extensions-16
e2a379b0be9ea6b0d7a4abb722fd4ecdf5b5f825
diff --git a/.gitignore b/.gitignore index b6e4761..c821c84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.DS_Store + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/LICENSE.md b/LICENSE.md index d302fae..c0b7dcd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Isaac Muse +Copyright (c) 2021 Isaac Muse Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 8cb1e77..4eabffd 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,19 @@ Markdown extension resources for [MkDocs for Material][mkdocs-material] ## Install +Generally, just installing MkDocs Material will automatically install `mkdocs-material-extensions`. But if you had a +need to manually install it, you can use pip. + ``` pip install mkdocs-material-extensions ``` +But make sure you've also installed MkDocs Material as well as this won't work without it. + +``` +pip install mkdocs-material +``` + ## Inline SVG Icons MkDocs Material provides numerous icons from Material, FontAwesome, and Octicons, but it does so by inlining the SVG diff --git a/changelog.md b/changelog.md index 52e9cc5..fe25e8e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 1.0.2 + +- **FIX**: No longer specify `mkdocs-material` as a dependency as `mkdocs-material` specifies these extensions as a + dependency. This created a circular dependency. While `pip` has no issues with such scenarios, this created issues + for some versioning packages. `mkdocs-material` (the only package this works with) will now manage which version of + `mkdocs-material-extensions` it needs. + ## 1.0.1 - **FIX**: Ensure we don't modify the original icon path setting. diff --git a/materialx/__meta__.py b/materialx/__meta__.py index becc312..543c77e 100644 --- a/materialx/__meta__.py +++ b/materialx/__meta__.py @@ -185,5 +185,5 @@ def parse_version(ver, pre=False): return Version(major, minor, micro, release, pre, post, dev) -__version_info__ = Version(1, 0, 1, "final") +__version_info__ = Version(1, 0, 2, "final") __version__ = __version_info__._get_canonical() diff --git a/materialx/emoji.py b/materialx/emoji.py index e75a621..3e2c6bb 100644 --- a/materialx/emoji.py +++ b/materialx/emoji.py @@ -10,12 +10,24 @@ import inspect import material import pymdownx +import warnings from pymdownx.emoji import TWEMOJI_SVG_CDN, add_attriubtes import xml.etree.ElementTree as etree # noqa: N813 +import pkg_resources +EXPECTED_M_VER = (5, 0, 0) +M_VER = tuple(int(x) for x in pkg_resources.require('mkdocs-material')[0].version.split('.')[:3]) OPTION_SUPPORT = pymdownx.__version_info__ >= (7, 1, 0) RESOURCES = os.path.dirname(inspect.getfile(material)) +# Check that we have the expected version running +if M_VER < EXPECTED_M_VER: # pragma: no cover + warnings.warn( + 'mkdocs-material-extensions expects a mkdocs-material version of at least {} to work properly'.format( + EXPECTED_M_VER + ) + ) + def _patch_index(options): """Patch the given index.""" diff --git a/requirements/project.txt b/requirements/project.txt index b677987..e69de29 100644 --- a/requirements/project.txt +++ b/requirements/project.txt @@ -1,1 +0,0 @@ -mkdocs-material>=5.0.0
Create tests that don't break everytime upstream icons change
2021-09-03T13:43:06
0.0
[]
[]
foundation-model-stack/foundation-model-stack
foundation-model-stack__foundation-model-stack-356
e3276bd424248d786a7219d8b612e9be15cf3c62
diff --git a/fms/models/__init__.py b/fms/models/__init__.py index 01e6e9ba..3078ace1 100644 --- a/fms/models/__init__.py +++ b/fms/models/__init__.py @@ -513,4 +513,4 @@ def model_wrap(model): return fms_model -from fms.models import gpt_bigcode, llama, mixtral, roberta +from fms.models import gpt_bigcode, granite, llama, mixtral, roberta diff --git a/fms/models/granite.py b/fms/models/granite.py new file mode 100644 index 00000000..f8f58293 --- /dev/null +++ b/fms/models/granite.py @@ -0,0 +1,503 @@ +import logging +import math +import re +from dataclasses import dataclass +from typing import Any, Mapping, Optional, Tuple + +import torch +import torch.nn as nn + +from fms import models +from fms.distributed.strategy import ( + DistributedStrategy, + NoOpStrategy, + TensorParallelStrategy, + UniformModelParallelStrategy, +) +from fms.modules.attention import MultiHeadAttention +from fms.modules.feedforward import GatedLinearUnit +from fms.modules.layernorm import LayerNormParameterized +from fms.modules.positions import RotaryEmbedding +from fms.utils import serialization +from fms.utils.activation import str_to_activation +from fms.utils.config import ModelConfig +from fms.utils.tokenizers import _has_hf, get_tokenizer + + +logger = logging.getLogger(__name__) + + +@dataclass +class GraniteConfig(ModelConfig): + src_vocab_size: int = 32_000 # can be set by tokenizer + emb_dim: int = 4096 + norm_eps: float = 1e-5 + nheads: int = 32 + kvheads: int = 0 + nlayers: int = 32 + pad_id: int = -1 + hidden_grow_factor: float = 8 / 3 + multiple_of: int = 256 + activation_fn: str = "swish" + p_dropout: float = 0.0 + max_expected_seq_len: int = 4096 + ntk_scaling: bool = False + attn_bias: bool = False + mlp_bias: bool = False + tie_heads: bool = False + rope_theta: float = 10_000.0 + embedding_multiplier: float = 1.0 + logits_scaling: float = 1.0 + residual_multiplier: float = 1.0 + attention_multiplier: float = 1.0 + linear_config: Optional[Mapping[str, Any]] = None + unfuse_strategy: Optional[str] = None # TODO: could be an Enum + + +class GraniteBlock(nn.Module): + def __init__(self, config: GraniteConfig, rotary_emb: RotaryEmbedding): + super(GraniteBlock, self).__init__() + self.config = config + emb_kq = self.config.emb_dim // self.config.nheads + emb_v = self.config.emb_dim // self.config.nheads + + self.ln = LayerNormParameterized( + self.config.emb_dim, + elementwise_scale=True, + elementwise_shift=False, + use_mean=False, + eps=self.config.norm_eps, + use_high_precision_pow=True, + ) + self.ff_ln = LayerNormParameterized( + self.config.emb_dim, + elementwise_scale=True, + elementwise_shift=False, + use_mean=False, + eps=self.config.norm_eps, + use_high_precision_pow=True, + ) + + if self.config.kvheads == 0: + kvheads = self.config.nheads + else: + kvheads = self.config.kvheads + assert self.config.nheads % self.config.kvheads == 0 + + self.attn = MultiHeadAttention( + self.config.emb_dim, + emb_kq, + emb_v, + self.config.nheads, + kvheads, + p_dropout=self.config.p_dropout, + use_bias=self.config.attn_bias, + position_encoder=rotary_emb, + fused=(self.config.unfuse_strategy != "pre"), + linear_config=self.config.linear_config, + scale_factor=self.config.attention_multiplier, + ) + self.ff_sub_layer = GatedLinearUnit( + self.config.emb_dim, + hidden_grow_factor=self.config.hidden_grow_factor, + multiple_of=self.config.multiple_of, + activation_fn=str_to_activation(self.config.activation_fn), + p_dropout=self.config.p_dropout, + use_bias=self.config.mlp_bias, + fused=(self.config.unfuse_strategy != "pre"), + linear_config=self.config.linear_config, + ) + + if self.config.p_dropout != 0: + self.dropout = nn.Dropout(self.config.p_dropout) + + def forward( + self, + x, + *, + mask=None, + position_ids=None, + past_key_value_state=None, + use_cache=False, + is_causal_mask=False, + attn_algorithm=None, + ): + # if the cache is not empty, we need to get the kv cache for self and cross attention + self_attn_past_key_value = past_key_value_state + + # first we do MHA and Add&Norm + residual = x + x = self.ln(x) + x = self.attn( + q=x, + mask=mask, + position_ids=position_ids, + attn_algorithm=attn_algorithm, + past_key_value_state=self_attn_past_key_value, + use_cache=use_cache, + is_self=True, + is_causal_mask=is_causal_mask, + ) + cache = None + if use_cache: + x, cache = x + if self.config.p_dropout != 0: + x = self.dropout(x) + # residual connection + x = x * self.config.residual_multiplier + residual + + # then we do FF and Add&Norm + residual = x + x = self.ff_ln(x) + x = self.ff_sub_layer(x) + if self.config.p_dropout != 0: + x = self.dropout(x) + # another residual + x = x * self.config.residual_multiplier + residual + + if use_cache: + return (x, cache) + else: + return x + + +class GraniteHeadless(nn.Module): + def __init__( + self, + config: GraniteConfig, + distributed_strategy: DistributedStrategy = NoOpStrategy, + ): + super(GraniteHeadless, self).__init__() + self.config = config + self.distributed_strategy = distributed_strategy + + self.width = self.config.emb_dim + self.pad_id = self.config.pad_id + self.max_expected_seq_len = self.config.max_expected_seq_len + + self.embedding = nn.Embedding( + self.config.src_vocab_size, + self.config.emb_dim, + padding_idx=self.config.pad_id, + ) + + self.rot_emb = RotaryEmbedding( + dim=self.config.emb_dim // self.config.nheads, + ntk_scaling=self.config.ntk_scaling, + max_seq_len=self.config.max_expected_seq_len, + ratio=self.config.rope_theta, + ) + # RoPE init + for device in set( + [param.device for param in self.parameters()] + + [buffer.device for buffer in self.buffers()] + ): + self.rot_emb.compute_freqs_cis(device, self.config.max_expected_seq_len) + + layers = [] + for i in range(self.config.nlayers): + block: nn.Module = GraniteBlock(self.config, self.rot_emb) + block = self.distributed_strategy.distribute_layer(block, i) + layers.append(block) + self.layers = nn.ModuleList(layers) + + dec_norm = LayerNormParameterized( + self.config.emb_dim, + elementwise_scale=True, + elementwise_shift=False, + use_mean=False, + eps=self.config.norm_eps, + use_high_precision_pow=True, + ) + self.dec_norm = self.distributed_strategy.distribute_module( + dec_norm, final_layers=True + ) + + if self.config.p_dropout: + self.dropout = nn.Dropout(self.config.p_dropout) + + def reset_parameters(self): + nn.init.trunc_normal_( + self.embedding.weight, mean=0.0, std=self.config.emb_dim**-0.5 + ) + + # RoPE init + for device in set( + [param.device for param in self.parameters()] + + [buffer.device for buffer in self.buffers()] + ): + self.rot_emb.compute_freqs_cis(device, self.config.max_expected_seq_len) + + # Call reset_parameters for relevant sub-layers + for m in self.modules(): + if ( + isinstance(m, MultiHeadAttention) + or isinstance(m, GatedLinearUnit) + or isinstance(m, LayerNormParameterized) + ): + m.reset_parameters() + + def _clean_up_rot_emb_cache( + self, + cached_freqs: dict[Optional[torch.device], dict[int, torch.Tensor]], + max_seq_len_cached: dict[Optional[torch.device], int], + ): + # remove meta tensors from cached_freqs + for dev in list(cached_freqs.keys()): + for alp in list(cached_freqs[dev].keys()): + if cached_freqs[dev][alp].device == torch.device("meta"): + del cached_freqs[dev][alp] + if len(cached_freqs[dev]) == 0: + del cached_freqs[dev] + del max_seq_len_cached[dev] + + def post_init(self): + # This function is called in `get_model` after the model is + # fully initalized on the correct device + + self._clean_up_rot_emb_cache( + self.rot_emb.cached_freqs, + self.rot_emb.max_seq_len_cached, + ) + + # init RoPE on the right device(s) + for device in set( + [param.device for param in self.parameters()] + + [buffer.device for buffer in self.buffers()] + ): + self.rot_emb.compute_freqs_cis(device, self.config.max_expected_seq_len) + + def forward( + self, + x_in, + mask=None, + position_ids=None, + past_key_value_states=None, + use_cache=False, + attn_algorithm=None, + ): + # Embed the given vocabulary indices using the given attention mask, with pre-/post-norm and dropout as specified + # x_in: batch_size x seq_len + # mask: batch_size x seq_len x seq_len + # bias: nheads x seq_len x seq_len + if past_key_value_states is None or len(past_key_value_states) == 0: + past_key_value_states = [None for _ in range(len(self.layers))] + + qlen = x_in.size(1) + klen = x_in.size(1) + + # if we are using the cache, the key length needs to be extended with the past keys length + if use_cache and past_key_value_states[0] is not None: + klen += past_key_value_states[0][0].size(-2) + + # if mask is none, we need to specify causal mask + if mask is None: + # we are caching and can assume all 1s in the mask + if use_cache and klen != 1 and qlen == 1: + # b x h x qlen x kvlen + is_causal_mask = False + else: + is_causal_mask = True + else: + is_causal_mask = False + + x_in = self.embedding(x_in) + x_in = x_in * self.config.embedding_multiplier + + # this is the output cache for all the decoder layers + present_key_value_states = [] + + for i, layer in enumerate(self.layers): + output = layer( + x=x_in, + mask=mask, + position_ids=position_ids, + past_key_value_state=past_key_value_states[i], + use_cache=use_cache, + is_causal_mask=is_causal_mask, + attn_algorithm=attn_algorithm, + ) + + if use_cache: + x_in, present_key_value_state = output + present_key_value_states.append(present_key_value_state) + + else: + x_in = output + + dec_out = x_in + dec_out = self.dec_norm(dec_out) + if self.config.p_dropout: + dec_out = self.dropout(dec_out) + + return dec_out, present_key_value_states + + +class Granite(nn.Module): + def __init__( + self, + config: Optional[GraniteConfig] = None, + distributed_strategy: DistributedStrategy = NoOpStrategy, + **kwargs, + ): + super(Granite, self).__init__() + if config is not None: + self.config = config + else: + self.config = GraniteConfig() + self.config = self.config.updated(**kwargs) + self.distributed_strategy = distributed_strategy + + self.base_model = GraniteHeadless(self.config, self.distributed_strategy) + self.head = nn.Linear( + self.config.emb_dim, self.config.src_vocab_size, bias=False + ) + + @classmethod + def from_config(cls, config: GraniteConfig) -> "Granite": + return cls(config) + + def get_config(self) -> GraniteConfig: + return self.config + + def reset_parameters(self): + self.head.weight.data.normal_( + 0, + 1 / math.sqrt(math.sqrt(self.config.emb_dim * self.config.src_vocab_size)), + ) + self.base_model.reset_parameters() + + def post_init(self): + # if this model ties weights, they are tied here + if self.config.tie_heads: + # handle assignment of non-meta weights to meta parameters + if self.head.weight.device == torch.device("meta"): + self.head.weight = self.base_model.embedding.weight + else: + self.base_model.embedding.weight = self.head.weight + + self.base_model.post_init() + + def forward( + self, + x: torch.LongTensor, + mask: Optional[torch.Tensor] = None, + position_ids: Optional[torch.LongTensor] = None, + past_key_value_states: Optional[Tuple[torch.FloatTensor,]] = None, + use_cache: bool = False, + only_last_token: bool = False, + attn_algorithm: Optional[str] = None, + ): + output, cache = self.base_model( + x, mask, position_ids, past_key_value_states, use_cache, attn_algorithm + ) + + if only_last_token: + output = output[:, -1, :] + preds = self.head(output) + preds = preds / self.config.logits_scaling + + if use_cache: + return preds, cache + else: + return preds + + +_8b_config = GraniteConfig( + src_vocab_size=49155, + emb_dim=4096, + norm_eps=1e-5, + nheads=32, + kvheads=8, + nlayers=40, + hidden_grow_factor=12800 / 4096, + max_expected_seq_len=8192, + rope_theta=10_000.0, + pad_id=0, + p_dropout=0.0, # overwriting config.json + tie_heads=True, + embedding_multiplier=12.0, + logits_scaling=16.0, + residual_multiplier=0.22, + attention_multiplier=0.0078125, +) + +_architecture_name = "granite" + + +def _granite_factory_factory(config): + def factory(**kwargs): + return Granite(config, **kwargs) + + return factory + + +models.register_model(_architecture_name, "8b", _granite_factory_factory(_8b_config)) + + +_convert_to_fused = lambda sd: serialization._legacy_mlp_glu_unfused_to_fused_adapter( + serialization._legacy_attn_unfused_to_fused_adapter(sd) +) + + +def _hf_sd_to_fms_sd(hf_sd: Mapping) -> Mapping: + replacements = [ + (r"^lm_head.weight", "head.weight"), + (r"^model.embed_tokens.weight", "base_model.embedding.weight"), + (r"^model.norm", "base_model.dec_norm"), + (r"^model.layers", "base_model.layers"), + (r"self_attn\.k_proj", "attn.key"), + (r"self_attn\.v_proj", "attn.value"), + (r"self_attn\.q_proj", "attn.query"), + (r"self_attn\.o_proj", "attn.dense"), + (r"mlp\.gate_proj", "ff_sub_layer.wg"), + (r"mlp\.up_proj", "ff_sub_layer.w1"), + (r"mlp\.down_proj", "ff_sub_layer.w2"), + (r"input_layernorm", "ln"), + (r"post_attention_layernorm", "ff_ln"), + ] + new_sd = {} + + trans_required_pattern = re.compile( + "base_model.layers.[0-9]+.attn.(query|key).(weight|bias)" + ) + for name, param in hf_sd.items(): + new_name = name + for pattern, repl in replacements: + new_name = re.sub(pattern, repl, new_name) + new_sd[new_name] = param + + # hf -> fms requires a transpose operation for the query and key + # weight and bias parameters + # This transpose is due to the different implementation of RoPE in + # HF and FMS. While FMS follows the original RoPE paper + # (https://arxiv.org/abs/2104.09864), HF has its own implementation + # that doesn't respect the order of outputs. This is OK as long as you + # rearrange the weights of the query and key projections, as the + # combination projection + RoPE ends up producing the same outputs. + # Therefore, to make FMS produce the correct order of outputs when + # loading from an HF checkpoint, we need to undo the transformation + # that HF does from the original Meta weights: + if bool(trans_required_pattern.match(new_name)): + temp = new_sd[new_name] + # nheads is used in the transformation required for hf->fms + if temp.size(0) == 2560: + head_size = 80 # granite 3b code + else: + head_size = 128 # every other Granite model in existence + nheads = int(temp.size(0) / head_size) + + if temp.dim() == 2: # weight + temp_view = temp.view(nheads, 2, -1, temp.size(1)) + else: # bias + temp_view = temp.view(nheads, 2, -1) + temp = temp_view.transpose(1, 2).reshape(*temp.size()) + + new_sd[new_name] = temp + + fused_sd = _convert_to_fused(new_sd) + + return fused_sd + + +serialization.register_adapter("granite", "hf", _hf_sd_to_fms_sd) diff --git a/fms/models/hf/utils.py b/fms/models/hf/utils.py index 2dc59b69..6ba0eeb4 100644 --- a/fms/models/hf/utils.py +++ b/fms/models/hf/utils.py @@ -204,9 +204,23 @@ def _infer_model_configuration( config_params["p_dropout"] = config.hidden_dropout_prob config_params["norm_eps"] = config.layer_norm_eps config_params["activation_fn"] = config.hidden_act + elif architecture == "GraniteForCausalLM": + inner_dim = config.intermediate_size + architecture = "granite" + config_params["attn_bias"] = getattr(config, "attention_bias", False) + config_params["mlp_bias"] = getattr(config, "mlp_bias", False) + config_params["kvheads"] = config.num_key_value_heads + config_params["norm_eps"] = config.rms_norm_eps + config_params["multiple_of"] = 1 + config_params["emb_dim"] = config.hidden_size + config_params["max_expected_seq_len"] = config.max_position_embeddings + config_params["residual_multiplier"] = config.residual_multiplier + config_params["attention_multiplier"] = config.attention_multiplier + config_params["logits_scaling"] = config.logits_scaling + config_params["embedding_multiplier"] = config.embedding_multiplier else: raise ValueError( - "FMS model implementations currently only support LlamaForCausalLM, GPTBigCodeForCausalLM, MixtralForCausalLM, and RobertaForMaskedLM" + "FMS model implementations currently only support LlamaForCausalLM, GPTBigCodeForCausalLM, MixtralForCausalLM, RobertaForMaskedLM and GraniteForCausalLM" ) # infer common params diff --git a/fms/modules/attention.py b/fms/modules/attention.py index d6715abf..15120ffb 100644 --- a/fms/modules/attention.py +++ b/fms/modules/attention.py @@ -268,6 +268,7 @@ def __init__( position_encoder: Optional[PositionEncoder] = None, fused: bool = True, linear_config: Optional[Mapping[str, Any]] = None, + scale_factor: Optional[float] = None, ): super(MultiHeadAttention, self).__init__() self.nheads = nheads @@ -280,6 +281,7 @@ def __init__( self.fused = fused self.linear_config = linear_config self.linear_type = get_linear_type(linear_config) + self.scale_factor = scale_factor self.in_proj: QKV = (FusedQKV if self.fused else UnfusedQKV)( self.emb_dim, @@ -440,6 +442,7 @@ def forward( attn_mask=attn_mask, dropout_p=self.p_dropout if self.training else 0.0, is_causal=is_causal_mask, + scale=self.scale_factor, ) if attn_algorithm:
granite arch Based off of https://github.com/huggingface/transformers/blob/main/src/transformers/models/granite/modeling_granite.py and https://github.com/foundation-model-stack/foundation-model-stack/blob/main/fms/models/llama.py [Only needed slight modifications to the llama arch implementation]
@sahilsuneja1 Can we add tests for this similar to other models: https://github.com/foundation-model-stack/foundation-model-stack/blob/main/tests/models/test_llama.py This PR also needs to include support for inferring the config from huggingface. This would be done here: https://github.com/foundation-model-stack/foundation-model-stack/blob/e3276bd424248d786a7219d8b612e9be15cf3c62/fms/models/hf/utils.py#L139
2024-10-25T20:54:33
0.0
[]
[]
foundation-model-stack/foundation-model-stack
foundation-model-stack__foundation-model-stack-279
f30be2ab8f0cdcf03ee5848840b198c049636a55
diff --git a/fms/utils/generation.py b/fms/utils/generation.py index 3e99ddd9..ca115f9c 100644 --- a/fms/utils/generation.py +++ b/fms/utils/generation.py @@ -122,7 +122,9 @@ def generate( return result -def truncate_after_eos(result, eos_token_id): +def truncate_after_eos( + result: torch.Tensor, eos_token_id: Union[int, "Any | None"] +) -> torch.Tensor: """ Helper function to return a truncated sequence of token IDs stopping at (and including) the 'end of sentence' token. @@ -130,10 +132,9 @@ def truncate_after_eos(result, eos_token_id): """ if eos_token_id is None: return result - eos_idx = torch.where(result == eos_token_id) - eos_idx = eos_idx[0] - if eos_idx.shape[0] >= 1: - eos_idx = eos_idx[0].item() - result = result[: eos_idx + 1] + eos_index = eos_idx[0] + if eos_index.shape[0] >= 1: + index = eos_index[0] + result = result[: index + 1] return result diff --git a/fms/utils/tokenizers.py b/fms/utils/tokenizers.py index 53a25962..1a230c5a 100644 --- a/fms/utils/tokenizers.py +++ b/fms/utils/tokenizers.py @@ -40,7 +40,10 @@ def convert_ids_to_tokens(self, ids: torch.LongTensor): raise NotImplementedError def convert_tokens_to_ids(self, tokens: Union[str, list[str]]): - """a str parameter will be interpreted as a single token""" + """ + for all tokenizers, a str parameter will be interpreted as a single token, + and its output will be a single integer that represents the id. + """ raise NotImplementedError def convert_tokens_to_string(self, tokens: list[str]): @@ -67,7 +70,15 @@ def convert_ids_to_tokens(self, ids: torch.LongTensor): return [chr(i) for i in ids] def convert_tokens_to_ids(self, tokens: Union[str, list[str]]): - return [ord(t) if ord(t) < 256 else 0 for t in tokens] + if isinstance(tokens, str): + # returning a single integer to be compatible with other tokenizers + if len(tokens) != 1: + raise RuntimeError( + f"Only single character str tokens can be converted using the CharTokenizer." + ) + token_id = ord(tokens) + return token_id if token_id < 256 else 0 + return [ord(t) if len(t) == 1 and ord(t) < 256 else 0 for t in tokens] def convert_tokens_to_string(self, tokens: list[str]): return "".join(tokens) @@ -96,8 +107,6 @@ def convert_ids_to_tokens(self, ids: Union[List[int], torch.LongTensor]): return self.sp_model.id_to_piece(ids) def convert_tokens_to_ids(self, tokens: Union[str, list[str]]): - if isinstance(tokens, str): - tokens = [tokens] return self.sp_model.piece_to_id(tokens) def convert_tokens_to_string(self, tokens: list[str]): diff --git a/scripts/inference.py b/scripts/inference.py index 729ccc59..9aaaf277 100644 --- a/scripts/inference.py +++ b/scripts/inference.py @@ -189,9 +189,7 @@ def print_result(result): if local_rank != 0: return # stop at EOS token if present - result = generation.truncate_after_eos( - result, tokenizer.convert_tokens_to_ids("</s>") - ) + result = generation.truncate_after_eos(result, tokenizer.eos_token_id) # print(result) # print(tokenizer.convert_ids_to_tokens(result)) print(tokenizer.convert_tokens_to_string(tokenizer.convert_ids_to_tokens(result)))
bug in handling of tokens vs list of tokens in this code: https://github.com/foundation-model-stack/foundation-model-stack/blob/main/fms/utils/tokenizers.py sentencepiece vs char tokenizer convert_tokens_to_ids, when passed a list of tokens or a single token may behave differently for different implementations. we should make sure it works consistently in the same way. This broke some testing code when switching between tokenizers.
Assigned to me.
2024-06-07T20:28:59
0.0
[]
[]
foundation-model-stack/foundation-model-stack
foundation-model-stack__foundation-model-stack-278
97ed3a5f09bc9b62f743adce82693787a9c3e706
diff --git a/fms/utils/tokenizers.py b/fms/utils/tokenizers.py index ac849202..53a25962 100644 --- a/fms/utils/tokenizers.py +++ b/fms/utils/tokenizers.py @@ -39,7 +39,8 @@ def tokenize(self, text: str): def convert_ids_to_tokens(self, ids: torch.LongTensor): raise NotImplementedError - def convert_tokens_to_ids(self, tokens: list[str]): + def convert_tokens_to_ids(self, tokens: Union[str, list[str]]): + """a str parameter will be interpreted as a single token""" raise NotImplementedError def convert_tokens_to_string(self, tokens: list[str]): @@ -65,7 +66,7 @@ def tokenize(self, text: str): def convert_ids_to_tokens(self, ids: torch.LongTensor): return [chr(i) for i in ids] - def convert_tokens_to_ids(self, tokens: list[str]): + def convert_tokens_to_ids(self, tokens: Union[str, list[str]]): return [ord(t) if ord(t) < 256 else 0 for t in tokens] def convert_tokens_to_string(self, tokens: list[str]): @@ -94,7 +95,9 @@ def convert_ids_to_tokens(self, ids: Union[List[int], torch.LongTensor]): ids = ids.tolist() return self.sp_model.id_to_piece(ids) - def convert_tokens_to_ids(self, tokens: list[str]): + def convert_tokens_to_ids(self, tokens: Union[str, list[str]]): + if isinstance(tokens, str): + tokens = [tokens] return self.sp_model.piece_to_id(tokens) def convert_tokens_to_string(self, tokens: list[str]): @@ -121,7 +124,7 @@ def tokenize(self, text: str): def convert_ids_to_tokens(self, ids: torch.LongTensor): return self.tokenizer.convert_ids_to_tokens(ids) - def convert_tokens_to_ids(self, tokens: list[str]): + def convert_tokens_to_ids(self, tokens: Union[str, list[str]]): return self.tokenizer.convert_tokens_to_ids(tokens) def convert_tokens_to_string(self, tokens: list[str]):
bug in handling of tokens vs list of tokens in this code: https://github.com/foundation-model-stack/foundation-model-stack/blob/main/fms/utils/tokenizers.py sentencepiece vs char tokenizer convert_tokens_to_ids, when passed a list of tokens or a single token may behave differently for different implementations. we should make sure it works consistently in the same way. This broke some testing code when switching between tokenizers.
Assigned to me.
2024-05-31T14:16:16
0.0
[]
[]
foundation-model-stack/foundation-model-stack
foundation-model-stack__foundation-model-stack-203
67a923095e64e638558c2aa13a2a24dedd061b7f
diff --git a/fms/models/__init__.py b/fms/models/__init__.py index 568d2e60..f467d84b 100644 --- a/fms/models/__init__.py +++ b/fms/models/__init__.py @@ -323,4 +323,4 @@ def model_wrap(model): return fms_model -from fms.models import gpt_bigcode, llama, roberta +from fms.models import gpt_bigcode, llama, mixtral, roberta diff --git a/fms/models/mixtral.py b/fms/models/mixtral.py new file mode 100644 index 00000000..c6ef65f5 --- /dev/null +++ b/fms/models/mixtral.py @@ -0,0 +1,434 @@ +import math +import re +from dataclasses import dataclass +from typing import List, Mapping, Optional, Tuple + +import torch +import torch.nn as nn + +from fms import models +from fms.distributed.strategy import ( + DistributedStrategy, + NoOpStrategy, + UniformModelParallelStrategy, +) +from fms.modules.attention import MultiHeadAttention +from fms.modules.feedforward import MOEFeedForward +from fms.modules.head import LinearClassificationHead +from fms.modules.layernorm import LayerNormParameterized +from fms.modules.positions import RotaryEmbedding +from fms.utils import serialization +from fms.utils.config import ModelConfig + + +@dataclass +class MixtralConfig(ModelConfig): + src_vocab_size: int = 32_000 # can be set by tokenizer + dim: int = 4096 + norm_eps: float = 1e-5 + nheads: int = 32 + kvheads: int = 8 + nlayers: int = 32 + hidden_dim: int = 14336 + p_dropout: float = 0.0 + num_experts: int = 8 + top_k_experts: int = 2 + max_expected_seq_len: int = 32768 + rope_base: float = 1000000.0 + ntk_scaling: bool = False + + +class MixtralBlock(nn.Module): + def __init__(self, config: MixtralConfig, rotary_emb: RotaryEmbedding): + super(MixtralBlock, self).__init__() + self.config = config + emb_kq = self.config.dim // self.config.nheads + emb_v = self.config.dim // self.config.nheads + + self.ln = LayerNormParameterized( + self.config.dim, + elementwise_scale=True, + elementwise_shift=False, + use_mean=False, + eps=self.config.norm_eps, + use_high_precision_pow=True, + ) + self.ff_ln = LayerNormParameterized( + self.config.dim, + elementwise_scale=True, + elementwise_shift=False, + use_mean=False, + eps=self.config.norm_eps, + use_high_precision_pow=True, + ) + + if self.config.kvheads == 0: + kvheads = self.config.nheads + else: + kvheads = self.config.kvheads + assert self.config.nheads % self.config.kvheads == 0 + + self.attn = MultiHeadAttention( + self.config.dim, + emb_kq, + emb_v, + self.config.nheads, + kvheads, + p_dropout=self.config.p_dropout, + use_bias=False, + position_encoder=rotary_emb, + ) + self.ff_sub_layer = MOEFeedForward( + self.config.num_experts, + self.config.top_k_experts, + self.config.dim, + self.config.hidden_dim, + ) + + if self.config.p_dropout != 0: + self.dropout = nn.Dropout(self.config.p_dropout) + + def forward( + self, + x, + *, + mask=None, + position_ids=None, + past_key_value_state=None, + use_cache=False, + is_causal_mask=False, + attn_algorithm=None, + ): + # if the cache is not empty, we need to get the kv cache for self and cross attention + self_attn_past_key_value = past_key_value_state + + # first we do MHA and Add&Norm + residual = x + x = self.ln(x) + x = self.attn( + q=x, + k=x, + v=x, + mask=mask, + position_ids=position_ids, + attn_algorithm=attn_algorithm, + past_key_value_state=self_attn_past_key_value, + use_cache=use_cache, + is_self=True, + is_causal_mask=is_causal_mask, + ) + cache = None + if use_cache: + x, cache = x + if self.config.p_dropout != 0: + x = self.dropout(x) + # residual connection + x = x + residual + + # then we do FF and Add&Norm + residual = x + x = self.ff_ln(x) + x = self.ff_sub_layer(x) + if self.config.p_dropout != 0: + x = self.dropout(x) + # another residual + x = x + residual + + if use_cache: + return (x, cache) + else: + return x + + +class MixtralHeadless(nn.Module): + def __init__( + self, + config: Optional[MixtralConfig] = None, + distributed_strategy: DistributedStrategy = NoOpStrategy, + **kwargs, + ): + super(MixtralHeadless, self).__init__() + if config is not None: + self.config = config + else: + self.config = MixtralConfig() + self.config = self.config.updated(**kwargs) + self.distributed_strategy = distributed_strategy + + self.width = self.config.dim + self.max_expected_seq_len = self.config.max_expected_seq_len + + embedding = nn.Embedding(self.config.src_vocab_size, self.config.dim) + self.embedding = self.distributed_strategy.distribute_module(embedding) + + self.rot_emb = RotaryEmbedding( + dim=self.config.dim // self.config.nheads, + ratio=self.config.rope_base, + ntk_scaling=self.config.ntk_scaling, + max_seq_len=self.config.max_expected_seq_len, + ) + + layers = [] + for i in range(self.config.nlayers): + block: nn.Module = MixtralBlock(self.config, self.rot_emb) + block = self.distributed_strategy.distribute_layer(block, i) + layers.append(block) + self.layers = nn.ModuleList(layers) + + dec_norm = LayerNormParameterized( + self.config.dim, + elementwise_scale=True, + elementwise_shift=False, + use_mean=False, + eps=self.config.norm_eps, + use_high_precision_pow=True, + ) + self.dec_norm = self.distributed_strategy.distribute_module( + dec_norm, final_layers=True + ) + + if self.config.p_dropout: + self.dropout = nn.Dropout(self.config.p_dropout) + + def reset_parameters(self): + nn.init.trunc_normal_( + self.embedding.weight, mean=0.0, std=self.config.dim**-0.5 + ) + + # RoPE init + if isinstance(self.distributed_strategy, UniformModelParallelStrategy): + for dev_idx in set(self.distributed_strategy.layer_to_device): + self.rot_emb.compute_freqs_cis( + torch.device("cuda", dev_idx), self.config.max_expected_seq_len + ) + else: + self.rot_emb.compute_freqs_cis( + self.embedding.weight.device, self.config.max_expected_seq_len + ) + + # Call reset_parameters for relevant sub-layers + for m in self.modules(): + if ( + isinstance(m, MultiHeadAttention) + or isinstance(m, MOEFeedForward) + or isinstance(m, LayerNormParameterized) + ): + m.reset_parameters() + + def forward( + self, + x: torch.Tensor, + mask: Optional[torch.Tensor] = None, + position_ids: Optional[torch.Tensor] = None, + past_key_value_states: Optional[List[Tuple[torch.Tensor, torch.Tensor]]] = None, + use_cache: bool = False, + attn_algorithm: Optional[str] = None, + ): + # Embed the given vocabulary indices using the given attention mask, with pre-/post-norm and dropout as specified + # x: batch_size x seq_len + # mask: batch_size x seq_len x seq_len + # bias: nheads x seq_len x seq_len + if past_key_value_states is None or len(past_key_value_states) == 0: + past_key_value_states = [ + (torch.empty(0), torch.empty(0)) for _ in range(len(self.layers)) + ] + + qlen = x.size(1) + klen = x.size(1) + + # if we are using the cache, the key length needs to be extended with the past keys length + if use_cache and past_key_value_states[0][0].numel() > 0: + klen += past_key_value_states[0][0].size(1) + + # if mask is none, we need to specify causal mask + if mask is None: + # we are caching and can assume all 1s in the mask + if use_cache and klen != 1 and qlen == 1: + # b x h x qlen x kvlen + is_causal_mask = False + else: + is_causal_mask = True + else: + is_causal_mask = False + + x = self.embedding(x) + + # this is the output cache for all the decoder layers + present_key_value_states = [] + + for i, layer in enumerate(self.layers): + output = layer( + x=x, + mask=mask, + position_ids=position_ids, + past_key_value_state=past_key_value_states[i], + use_cache=use_cache, + is_causal_mask=is_causal_mask, + attn_algorithm=attn_algorithm, + ) + + if use_cache: + x, present_key_value_state = output + present_key_value_states.append(present_key_value_state) + + else: + x = output + + dec_out = x + dec_out = self.dec_norm(dec_out) + if self.config.p_dropout: + dec_out = self.dropout(dec_out) + + return dec_out, present_key_value_states + + +class Mixtral(nn.Module): + def __init__( + self, + config: Optional[MixtralConfig] = None, + distributed_strategy: DistributedStrategy = NoOpStrategy, + **kwargs, + ): + super(Mixtral, self).__init__() + if config is not None: + self.config = config + else: + self.config = MixtralConfig() + self.config = self.config.updated(**kwargs) + self.distributed_strategy = distributed_strategy + + self.base_model = MixtralHeadless(self.config, self.distributed_strategy) + head = LinearClassificationHead( + self.config.dim, self.config.src_vocab_size, bias=False + ) + self.head = self.distributed_strategy.distribute_module(head) + + def get_config(self) -> MixtralConfig: + return self.config + + @classmethod + def from_config(cls, config: MixtralConfig) -> "Mixtral": + return cls(config) + + def reset_parameters(self): + # We're just going to down-scale the final prediction head to be + # mixed-fan (inputs and gradients scale to the same inverse factors) if it isn't tied + self.head.weight.data.normal_( + 0, 1 / math.sqrt(math.sqrt(self.config.dim * self.config.src_vocab_size)) + ) + + # Call reset_parameters for relevant sub-layers + self.base_model.reset_parameters() + + def forward( + self, + x: torch.Tensor, + mask: Optional[torch.Tensor] = None, + position_ids: Optional[torch.Tensor] = None, + past_key_value_states: Optional[List[Tuple[torch.Tensor, torch.Tensor]]] = None, + use_cache: bool = False, + only_last_token: bool = False, + attn_algorithm: Optional[str] = None, + ): + output, cache = self.base_model( + x, mask, position_ids, past_key_value_states, use_cache, attn_algorithm + ) + + if only_last_token: + output = output[:, -1, :] + preds = self.head(output) + + if use_cache: + return preds, cache + else: + return preds + + +# Register common Mixtral variants with the model registration API +_8x7b_config = MixtralConfig() + +_architecture_name = "mixtral" + + +def _mixtral_factory_factory(config): + def factory(**kwargs): + return Mixtral(config, **kwargs) + + return factory + + +models.register_model( + _architecture_name, "8x7b", _mixtral_factory_factory(_8x7b_config) +) + + +def _hf_sd_to_fms_sd(hf_sd: Mapping) -> Mapping: + replacements = [ + (r"output.weight", "head.weight"), + (r"tok_embeddings.weight", "base_model.embedding.weight"), + (r"^norm", "base_model.dec_norm"), + (r"^layers", "base_model.layers"), + (r"attention\.wk", "attn.key"), + (r"attention\.wv", "attn.value"), + (r"attention\.wq", "attn.query"), + (r"attention\.wo", "attn.dense"), + (r"block_sparse_moe\.w1", "ff_sub_layer.cond_ffn.w1"), + (r"block_sparse_moe\.w2", "ff_sub_layer.cond_ffn.w2"), + (r"block_sparse_moe\.w3", "ff_sub_layer.cond_ffn.w3"), + (r"block_sparse_moe\.gate", "ff_sub_layer.gate"), + (r"attention_norm", "ln"), + (r"ffn_norm", "ff_ln"), + ] + new_sd = {} + + for name, param in hf_sd.items(): + new_name = name + for pattern, repl in replacements: + new_name = re.sub(pattern, repl, new_name) + new_sd[new_name] = param + + if "gate" in new_name: + weight_name = name.replace("gate", "w1")[:-7] + if weight_name not in hf_sd: + missing_weights = [ + name.replace("gate", "w1")[:-7], + name.replace("gate", "w2")[:-7], + name.replace("gate", "w3")[:-7], + ] + raise ValueError(f"Missing {missing_weights}") + + if "w1" in new_name or "w2" in new_name or "w3" in new_name: + gate_name = re.sub(r"w\d", "gate", name) + ".weight" + if gate_name not in hf_sd: + missing_weights = [ + gate_name, + re.sub(r"w\d", "w1", name), + re.sub(r"w\d", "w2", name), + re.sub(r"w\d", "w3", name), + ] + missing_weights = [w for w in missing_weights if w != name] + raise ValueError(f"Missing {missing_weights}") + num_experts = hf_sd[gate_name].size(0) + temp = new_sd[new_name] + new_sd[new_name] = temp.reshape( + num_experts, temp.size(0) // num_experts, temp.size(1) + ).contiguous() + + for key in list(new_sd.keys()): + if key not in new_sd: + continue + if "gate" in key: + new_sd[key] = new_sd[key].contiguous() + if "w1" in key: + w3_weight = key.replace("w1", "w3") + fused_name = key.replace("w1", "w13") + new_sd[fused_name] = torch.cat([new_sd[key], new_sd[w3_weight]], dim=1) + del new_sd[key] + del new_sd[w3_weight] + if "w2" in key: + new_sd[key] = new_sd[key].transpose(1, 2).contiguous() + + return new_sd + + +serialization.register_adapter("mixtral", "hf", _hf_sd_to_fms_sd) diff --git a/fms/modules/feedforward.py b/fms/modules/feedforward.py index 3e5b372b..6745ff65 100644 --- a/fms/modules/feedforward.py +++ b/fms/modules/feedforward.py @@ -354,19 +354,30 @@ def __init__(self, num_experts: int, dim: int, intermediate_size: int): self.w13 = nn.Parameter(torch.empty(num_experts, 2 * intermediate_size, dim)) self.w2 = nn.Parameter(torch.empty(num_experts, dim, intermediate_size)) + def reset_parameters(self): + for param in ["w13", "w2"]: + nn.init.trunc_normal_( + getattr(self, param), + mean=0.0, + std=0.02, + ) + def to_tp(self, group: ProcessGroup) -> "TPConditionalFeedForward": return TPConditionalFeedForward.import_module(self, group) def forward(self, x: torch.Tensor, expert_indices: torch.Tensor) -> torch.Tensor: - ## Triton path # Check constraints. assert x.shape[1] == self.w13.shape[2], "Hidden size mismatch" assert x.is_contiguous(), "Hidden_states must be contiguous" assert self.w13.is_contiguous(), "Expert weights 1 must be contiguous" assert self.w2.is_contiguous(), "Expert weights 2 must be contiguous" - M, _ = x.shape + M, D = x.shape E, N, _ = self.w13.shape + _, A = expert_indices.shape + + # if x.device.type == "cuda": + ## Triton path if expert_indices.numel() <= E: padding_size = 16 @@ -512,6 +523,15 @@ def __init__( self.dim = dim self.num_activated_experts = num_activated_experts + def reset_parameters(self): + nn.init.trunc_normal_( + self.gate.weight, + mean=0.0, + std=0.02, + ) + + self.cond_ffn.reset_parameters() + def forward(self, x: torch.Tensor) -> torch.Tensor: B, S = x.shape[:2] x = x.view(-1, self.dim) diff --git a/fms/triton/moe_kernel.py b/fms/triton/moe_kernel.py index 5105ac5f..e636b671 100644 --- a/fms/triton/moe_kernel.py +++ b/fms/triton/moe_kernel.py @@ -1,4 +1,3 @@ -import math import pathlib from typing import Tuple @@ -235,6 +234,8 @@ def invoke_fused_moe_kernel( ) compute_type = tl.float16 if A.dtype == torch.float16 else tl.bfloat16 + if A.device.type == "cpu": + compute_type = tl.float32 fused_moe_kernel_v3[grid]( A, B, @@ -395,9 +396,6 @@ def moe_mm( if best_config is None: return torch.tensor([]) - grid = math.ceil( - padded_token_ids_per_block.shape[0] / best_config["block_m"] - ) * math.ceil(moe_matrix.shape[1] / best_config["block_n"]) invoke_fused_moe_kernel( input, moe_matrix, @@ -411,3 +409,31 @@ def moe_mm( ) return output + + [email protected](lib, "moe_mm", "CPU") +def moe_mm_cpu( + input: torch.Tensor, + moe_matrix: torch.Tensor, + token_expert_mapping: torch.Tensor, + padded_token_ids_per_block: torch.Tensor, + expert_block_mapping: torch.Tensor, + total_padded_tokens: torch.Tensor, + topk: int, + padding_size, +): + T, D = input.shape + M, A = token_expert_mapping.shape + + a = input.view(T, -1, D).repeat(1, topk, 1).reshape(-1, D) + out = torch.zeros(T * topk, moe_matrix.shape[1], dtype=a.dtype, device=a.device) + + token_expert_mapping = token_expert_mapping.view(-1) + for i in range(moe_matrix.shape[0]): + mask = token_expert_mapping == i + if mask.sum(): + out[mask] = a[mask] @ moe_matrix[i].transpose(0, 1) + return out.view(M, A, moe_matrix.shape[1]) + + +# TODO: Add a Backward kernel for Mixtral training in the future diff --git a/scripts/inference.py b/scripts/inference.py index 63c57dc8..729ccc59 100644 --- a/scripts/inference.py +++ b/scripts/inference.py @@ -91,7 +91,7 @@ else: device = torch.device(args.device_type) -torch.set_default_dtype(torch.half) +torch.set_default_dtype(torch.float16) # requires setting environment variable: `CUBLAS_WORKSPACE_CONFIG=:4096:8` if args.deterministic: @@ -131,8 +131,6 @@ if args.compile: print("compiling model") - # Bug with kv-cache in PT2.1 - torch._inductor.config.joint_graph_constant_folding = False # compiling can make first inference pass slow model = torch.compile(model, mode=args.compile_mode)
Mixtral FMS implementation Stack from [ghstack](https://github.com/ezyang/ghstack) (oldest at bottom): * #206 * #259 * #204 * __->__ #203
2024-03-05T22:16:16
0.0
[]
[]
astronomer/astro-provider-databricks
astronomer__astro-provider-databricks-68
0fce4681292bbaa4bee58c1181432a0b907dd6e5
diff --git a/src/astro_databricks/constants.py b/src/astro_databricks/constants.py deleted file mode 100644 index 13d81c9..0000000 --- a/src/astro_databricks/constants.py +++ /dev/null @@ -1,3 +0,0 @@ -import os - -JOBS_API_VERSION = os.getenv("JOBS_API_VERSION", "2.1") diff --git a/src/astro_databricks/operators/common.py b/src/astro_databricks/operators/common.py index ccc77aa..4a7f5a9 100644 --- a/src/astro_databricks/operators/common.py +++ b/src/astro_databricks/operators/common.py @@ -12,7 +12,6 @@ from databricks_cli.runs.api import RunsApi from databricks_cli.sdk.api_client import ApiClient -from astro_databricks.constants import JOBS_API_VERSION from astro_databricks.operators.workflow import ( DatabricksMetaData, DatabricksWorkflowTaskGroup, @@ -21,6 +20,7 @@ DatabricksJobRepairSingleFailedLink, DatabricksJobRunLink, ) +from astro_databricks.settings import DATABRICKS_JOBS_API_VERSION class DatabricksTaskOperator(BaseOperator): @@ -190,24 +190,24 @@ def monitor_databricks_job(self): api_client = self._get_api_client() runs_api = RunsApi(api_client) current_task = self._get_current_databricks_task(runs_api) - url = runs_api.get_run(self.databricks_run_id, version=JOBS_API_VERSION)[ - "run_page_url" - ] + url = runs_api.get_run( + self.databricks_run_id, version=DATABRICKS_JOBS_API_VERSION + )["run_page_url"] self.log.info(f"Check the job run in Databricks: {url}") self._wait_for_pending_task(current_task, runs_api) self._wait_for_running_task(current_task, runs_api) self._wait_for_terminating_task(current_task, runs_api) final_state = runs_api.get_run( - current_task["run_id"], version=JOBS_API_VERSION + current_task["run_id"], version=DATABRICKS_JOBS_API_VERSION )["state"] self._handle_final_state(final_state) def _get_current_databricks_task(self, runs_api): return { x["task_key"]: x - for x in runs_api.get_run(self.databricks_run_id, version=JOBS_API_VERSION)[ - "tasks" - ] + for x in runs_api.get_run( + self.databricks_run_id, version=DATABRICKS_JOBS_API_VERSION + )["tasks"] }[self._get_databricks_task_id(self.task_id)] def _handle_final_state(self, final_state): @@ -223,9 +223,9 @@ def _handle_final_state(self, final_state): ) def _get_lifestyle_state(self, current_task, runs_api): - return runs_api.get_run(current_task["run_id"], version=JOBS_API_VERSION)[ - "state" - ]["life_cycle_state"] + return runs_api.get_run( + current_task["run_id"], version=DATABRICKS_JOBS_API_VERSION + )["state"]["life_cycle_state"] def _wait_on_state(self, current_task, runs_api, state): while self._get_lifestyle_state(current_task, runs_api) == state: diff --git a/src/astro_databricks/operators/notebook.py b/src/astro_databricks/operators/notebook.py index 87767bf..efb7341 100644 --- a/src/astro_databricks/operators/notebook.py +++ b/src/astro_databricks/operators/notebook.py @@ -13,7 +13,7 @@ from databricks_cli.runs.api import RunsApi from databricks_cli.sdk.api_client import ApiClient -from astro_databricks.constants import JOBS_API_VERSION +from astro_databricks import settings from astro_databricks.operators.workflow import ( DatabricksMetaData, DatabricksWorkflowTaskGroup, @@ -221,24 +221,24 @@ def monitor_databricks_job(self): api_client = self._get_api_client() runs_api = RunsApi(api_client) current_task = self._get_current_databricks_task(runs_api) - url = runs_api.get_run(self.databricks_run_id, version=JOBS_API_VERSION)[ - "run_page_url" - ] + url = runs_api.get_run( + self.databricks_run_id, version=settings.DATABRICKS_JOBS_API_VERSION + )["run_page_url"] self.log.info(f"Check the job run in Databricks: {url}") self._wait_for_pending_task(current_task, runs_api) self._wait_for_running_task(current_task, runs_api) self._wait_for_terminating_task(current_task, runs_api) final_state = runs_api.get_run( - current_task["run_id"], version=JOBS_API_VERSION + current_task["run_id"], version=settings.DATABRICKS_JOBS_API_VERSION )["state"] self._handle_final_state(final_state) def _get_current_databricks_task(self, runs_api): return { x["task_key"]: x - for x in runs_api.get_run(self.databricks_run_id, version=JOBS_API_VERSION)[ - "tasks" - ] + for x in runs_api.get_run( + self.databricks_run_id, version=settings.DATABRICKS_JOBS_API_VERSION + )["tasks"] }[self._get_databricks_task_id(self.task_id)] def _handle_final_state(self, final_state): @@ -254,9 +254,9 @@ def _handle_final_state(self, final_state): ) def _get_lifestyle_state(self, current_task, runs_api): - return runs_api.get_run(current_task["run_id"], version=JOBS_API_VERSION)[ - "state" - ]["life_cycle_state"] + return runs_api.get_run( + current_task["run_id"], version=settings.DATABRICKS_JOBS_API_VERSION + )["state"]["life_cycle_state"] def _wait_on_state(self, current_task, runs_api, state): while self._get_lifestyle_state(current_task, runs_api) == state: @@ -300,7 +300,9 @@ def launch_notebook_job(self): else: raise ValueError("Must specify either existing_cluster_id or new_cluster") runs_api = RunsApi(api_client) - run = runs_api.submit_run(run_json, version=JOBS_API_VERSION) + run = runs_api.submit_run( + run_json, version=settings.DATABRICKS_JOBS_API_VERSION + ) self.databricks_run_id = run["run_id"] return run diff --git a/src/astro_databricks/operators/workflow.py b/src/astro_databricks/operators/workflow.py index ede9a14..c659783 100644 --- a/src/astro_databricks/operators/workflow.py +++ b/src/astro_databricks/operators/workflow.py @@ -26,11 +26,11 @@ from databricks_cli.sdk.api_client import ApiClient from mergedeep import merge -from astro_databricks.constants import JOBS_API_VERSION from astro_databricks.plugins.plugin import ( DatabricksJobRepairAllFailedLink, DatabricksJobRunLink, ) +from astro_databricks.settings import DATABRICKS_JOBS_API_VERSION @define @@ -41,7 +41,7 @@ class DatabricksMetaData: def _get_job_by_name(job_name: str, jobs_api: JobsApi) -> dict | None: - jobs = jobs_api.list_jobs(version=JOBS_API_VERSION).get("jobs", []) + jobs = jobs_api.list_jobs(version=DATABRICKS_JOBS_API_VERSION).get("jobs", []) for job in jobs: if job.get("settings", {}).get("name") == job_name: return job @@ -177,14 +177,14 @@ def execute(self, context: Context) -> Any: jobs_api.reset_job( json={"job_id": job_id, "new_settings": current_job_spec}, - version=JOBS_API_VERSION, + version=DATABRICKS_JOBS_API_VERSION, ) else: self.log.info( "Creating new job with spec %s", json.dumps(current_job_spec, indent=4) ) job_id = jobs_api.create_job( - json=current_job_spec, version=JOBS_API_VERSION + json=current_job_spec, version=DATABRICKS_JOBS_API_VERSION )["job_id"] run_id = jobs_api.run_now( @@ -193,14 +193,16 @@ def execute(self, context: Context) -> Any: notebook_params=self.notebook_params, python_params=self.task_group.python_params, spark_submit_params=self.task_group.spark_submit_params, - version=JOBS_API_VERSION, + version=DATABRICKS_JOBS_API_VERSION, )["run_id"] self.databricks_run_id = run_id runs_api = RunsApi(api_client) - url = runs_api.get_run(run_id, version=JOBS_API_VERSION).get("run_page_url") + url = runs_api.get_run(run_id, version=DATABRICKS_JOBS_API_VERSION).get( + "run_page_url" + ) self.log.info(f"Check the job run in Databricks: {url}") - state = runs_api.get_run(run_id, version=JOBS_API_VERSION)["state"][ + state = runs_api.get_run(run_id, version=DATABRICKS_JOBS_API_VERSION)["state"][ "life_cycle_state" ] self.log.info(f"Job state: {state}") @@ -213,9 +215,9 @@ def execute(self, context: Context) -> Any: while state in ("PENDING", "BLOCKED"): self.log.info(f"Job {state}") time.sleep(5) - state = runs_api.get_run(run_id, version=JOBS_API_VERSION)["state"][ - "life_cycle_state" - ] + state = runs_api.get_run(run_id, version=DATABRICKS_JOBS_API_VERSION)[ + "state" + ]["life_cycle_state"] return { "databricks_conn_id": self.databricks_conn_id, diff --git a/src/astro_databricks/settings.py b/src/astro_databricks/settings.py new file mode 100644 index 0000000..0e93c75 --- /dev/null +++ b/src/astro_databricks/settings.py @@ -0,0 +1,3 @@ +import os + +DATABRICKS_JOBS_API_VERSION = os.getenv("DATABRICKS_JOBS_API_VERSION", "2.1")
Pass api version to jobs API calls across operator implementations Based on a user feedback, they would like to use Databricks API version 2.1 for the various Databricks SDK calls from the operator implementations. Hence, use the existing configurable API version constant fetched from an environment variable and pass it in places where Databricks API calls are made from the Databricks SDK across the operators implementations. closes: https://github.com/astronomer/issues-airflow/issues/614
> `dev/logs/scheduler/latest` -- is this intentionally removed? yes, looks like the log file was pushed to git erroneously earlier. Hence, removed it from Git tracking.
2024-03-20T13:31:13
0.0
[]
[]
stanfordnlp/pyvene
stanfordnlp__pyvene-159
d29f9591ca61753d66ba25f6cc3a4c05bab48480
diff --git a/pyvene/models/gemma/modelings_intervenable_gemma.py b/pyvene/models/gemma/modelings_intervenable_gemma.py index 09135bb8..31f771a7 100644 --- a/pyvene/models/gemma/modelings_intervenable_gemma.py +++ b/pyvene/models/gemma/modelings_intervenable_gemma.py @@ -20,41 +20,43 @@ "mlp_output": ("layers[%s].mlp", CONST_OUTPUT_HOOK), "mlp_input": ("layers[%s].mlp", CONST_INPUT_HOOK), "attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK), - "head_attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK), + "head_attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK, (split_head_and_permute, "n_head")), "attention_output": ("layers[%s].self_attn", CONST_OUTPUT_HOOK), "attention_input": ("layers[%s].self_attn", CONST_INPUT_HOOK), "query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK), "key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK), "value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK), - "head_query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK), - "head_key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK), - "head_value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK), + "head_query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_head")), + "head_key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_kv_head")), + "head_value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_kv_head")), } gemma_type_to_dimension_mapping = { + "n_head": ("num_attention_heads",), + "n_kv_head": ("num_key_value_heads",), "block_input": ("hidden_size",), "block_output": ("hidden_size",), "mlp_activation": ("intermediate_size",), "mlp_output": ("hidden_size",), "mlp_input": ("hidden_size",), "attention_value_output": ("hidden_size",), - "head_attention_value_output": ("hidden_size/num_attention_heads",), + "head_attention_value_output": ("head_dim",), "attention_output": ("hidden_size",), "attention_input": ("hidden_size",), "query_output": ("hidden_size",), "key_output": ("hidden_size",), "value_output": ("hidden_size",), - "head_query_output": ("hidden_size/num_attention_heads",), - "head_key_output": ("hidden_size/num_attention_heads",), - "head_value_output": ("hidden_size/num_attention_heads",), + "head_query_output": ("head_dim",), + "head_key_output": ("head_dim",), + "head_value_output": ("hhead_dim",), } """gemma model with LM head""" gemma_lm_type_to_module_mapping = {} for k, v in gemma_type_to_module_mapping.items(): - gemma_lm_type_to_module_mapping[k] = (f"model.{v[0]}", v[1]) + gemma_lm_type_to_module_mapping[k] = (f"model.{v[0]}", ) + v[1:] gemma_lm_type_to_dimension_mapping = gemma_type_to_dimension_mapping @@ -63,7 +65,7 @@ """gemma model with classifier head""" gemma_classifier_type_to_module_mapping = {} for k, v in gemma_type_to_module_mapping.items(): - gemma_classifier_type_to_module_mapping[k] = (f"model.{v[0]}", v[1]) + gemma_classifier_type_to_module_mapping[k] = (f"model.{v[0]}", ) + v[1:] gemma_classifier_type_to_dimension_mapping = gemma_type_to_dimension_mapping diff --git a/pyvene/models/gpt_neo/modelings_intervenable_gpt_neo.py b/pyvene/models/gpt_neo/modelings_intervenable_gpt_neo.py index 09f94cad..a0f221b6 100644 --- a/pyvene/models/gpt_neo/modelings_intervenable_gpt_neo.py +++ b/pyvene/models/gpt_neo/modelings_intervenable_gpt_neo.py @@ -58,7 +58,7 @@ """gpt_neo model with LM head""" gpt_neo_lm_type_to_module_mapping = {} for k, v in gpt_neo_type_to_module_mapping.items(): - gpt_neo_lm_type_to_module_mapping[k] = (f"transformer.{v[0]}", v[1]) + gpt_neo_lm_type_to_module_mapping[k] = (f"transformer.{v[0]}", ) + v[1:] gpt_neo_lm_type_to_dimension_mapping = gpt_neo_type_to_dimension_mapping diff --git a/pyvene/models/gpt_neox/modelings_intervenable_gpt_neox.py b/pyvene/models/gpt_neox/modelings_intervenable_gpt_neox.py index c88eeaa3..666b1fd9 100644 --- a/pyvene/models/gpt_neox/modelings_intervenable_gpt_neox.py +++ b/pyvene/models/gpt_neox/modelings_intervenable_gpt_neox.py @@ -33,7 +33,7 @@ gpt_neox_type_to_dimension_mapping = { - "n_head": "num_attention_heads", + "n_head": ("num_attention_heads",), "block_input": ("hidden_size",), "block_output": ("hidden_size",), "mlp_activation": ( @@ -58,7 +58,7 @@ """gpt_neox model with LM head""" gpt_neox_lm_type_to_module_mapping = {} for k, v in gpt_neox_type_to_module_mapping.items(): - gpt_neox_lm_type_to_module_mapping[k] = (f"gpt_neox.{v[0]}", v[1]) + gpt_neox_lm_type_to_module_mapping[k] = (f"gpt_neox.{v[0]}", ) + v[1:] gpt_neox_lm_type_to_dimension_mapping = gpt_neox_type_to_dimension_mapping diff --git a/pyvene/models/llama/modelings_intervenable_llama.py b/pyvene/models/llama/modelings_intervenable_llama.py index 82817b9b..b99b56f8 100644 --- a/pyvene/models/llama/modelings_intervenable_llama.py +++ b/pyvene/models/llama/modelings_intervenable_llama.py @@ -20,19 +20,21 @@ "mlp_output": ("layers[%s].mlp", CONST_OUTPUT_HOOK), "mlp_input": ("layers[%s].mlp", CONST_INPUT_HOOK), "attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK), - "head_attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK), + "head_attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK, (split_head_and_permute, "n_head")), "attention_output": ("layers[%s].self_attn", CONST_OUTPUT_HOOK), "attention_input": ("layers[%s].self_attn", CONST_INPUT_HOOK), "query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK), "key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK), "value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK), - "head_query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK), - "head_key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK), - "head_value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK), + "head_query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_head")), + "head_key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_kv_head")), + "head_value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_kv_head")), } llama_type_to_dimension_mapping = { + "n_head": ("num_attention_heads",), + "n_kv_head": ("num_key_value_heads",), "block_input": ("hidden_size",), "block_output": ("hidden_size",), "mlp_activation": ("intermediate_size",), @@ -54,7 +56,7 @@ """llama model with LM head""" llama_lm_type_to_module_mapping = {} for k, v in llama_type_to_module_mapping.items(): - llama_lm_type_to_module_mapping[k] = (f"model.{v[0]}", v[1]) + llama_lm_type_to_module_mapping[k] = (f"model.{v[0]}", ) + v[1:] llama_lm_type_to_dimension_mapping = llama_type_to_dimension_mapping @@ -63,25 +65,28 @@ """llama model with classifier head""" llama_classifier_type_to_module_mapping = {} for k, v in llama_type_to_module_mapping.items(): - llama_classifier_type_to_module_mapping[k] = (f"model.{v[0]}", v[1]) + llama_classifier_type_to_module_mapping[k] = (f"model.{v[0]}", ) + v[1:] llama_classifier_type_to_dimension_mapping = llama_type_to_dimension_mapping def create_llama( - name="sharpbai/alpaca-7b-merged", cache_dir=None, dtype=torch.bfloat16 + name="sharpbai/alpaca-7b-merged", cache_dir=None, dtype=torch.bfloat16, config=None ): """Creates a LLaMA Causal LM model, config, and tokenizer from the given name and revision""" from transformers import LlamaForCausalLM, LlamaTokenizer, LlamaConfig - - config = LlamaConfig.from_pretrained(name, cache_dir=cache_dir) - tokenizer = LlamaTokenizer.from_pretrained(name, cache_dir=cache_dir) - llama = LlamaForCausalLM.from_pretrained( - name, - config=config, - cache_dir=cache_dir, - torch_dtype=dtype, # save memory - ) + if config is None: + config = LlamaConfig.from_pretrained(name, cache_dir=cache_dir) + llama = LlamaForCausalLM.from_pretrained( + name, + config=config, + cache_dir=cache_dir, + torch_dtype=dtype, # save memory + ) + tokenizer = LlamaTokenizer.from_pretrained(name, cache_dir=cache_dir) + else: + llama = LlamaForCausalLM(config) + tokenizer = LlamaTokenizer.from_pretrained(name, cache_dir=cache_dir) print("loaded model") - return config, tokenizer, llama + return config, tokenizer, llama \ No newline at end of file diff --git a/pyvene/models/llava/modelings_intervenable_llava.py b/pyvene/models/llava/modelings_intervenable_llava.py index c37d019b..41a7ed57 100644 --- a/pyvene/models/llava/modelings_intervenable_llava.py +++ b/pyvene/models/llava/modelings_intervenable_llava.py @@ -19,19 +19,21 @@ "mlp_output": ("language_model.model.layers[%s].mlp", CONST_OUTPUT_HOOK), "mlp_input": ("language_model.model.layers[%s].mlp", CONST_INPUT_HOOK), "attention_value_output": ("language_model.model.layers[%s].self_attn.o_proj", CONST_INPUT_HOOK), - "head_attention_value_output": ("language_model.model.layers[%s].self_attn.o_proj", CONST_INPUT_HOOK), + "head_attention_value_output": ("language_model.model.layers[%s].self_attn.o_proj", CONST_INPUT_HOOK, (split_head_and_permute, "n_head")), "attention_output": ("language_model.model.layers[%s].self_attn", CONST_OUTPUT_HOOK), "attention_input": ("language_model.model.layers[%s].self_attn", CONST_INPUT_HOOK), "query_output": ("language_model.model.layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK), "key_output": ("language_model.model.layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK), "value_output": ("language_model.model.layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK), - "head_query_output": ("language_model.model.layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK), - "head_key_output": ("language_model.model.layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK), - "head_value_output": ("language_model.model.layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK), + "head_query_output": ("language_model.model.layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_head")), + "head_key_output": ("language_model.model.layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_kv_head")), + "head_value_output": ("language_model.model.layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_kv_head")), } llava_type_to_dimension_mapping = { + "n_head": ("text_config.num_attention_heads",), + "n_kv_head": ("text_config.num_key_value_heads",), "block_input": ("text_config.hidden_size",), "block_output": ("text_config.hidden_size",), "mlp_activation": ("text_config.intermediate_size",), @@ -53,7 +55,7 @@ """llava model with LM head""" llava_lm_type_to_module_mapping = {} for k, v in llava_type_to_module_mapping.items(): - llava_lm_type_to_module_mapping[k] = (f"model.{v[0]}", v[1]) + llava_lm_type_to_module_mapping[k] = (f"model.{v[0]}", ) + v[1:] llava_lm_type_to_dimension_mapping = llava_type_to_dimension_mapping @@ -62,7 +64,7 @@ """llava model with classifier head""" llava_classifier_type_to_module_mapping = {} for k, v in llava_type_to_module_mapping.items(): - llava_classifier_type_to_module_mapping[k] = (f"model.{v[0]}", v[1]) + llava_classifier_type_to_module_mapping[k] = (f"model.{v[0]}", ) + v[1:] llava_classifier_type_to_dimension_mapping = llava_type_to_dimension_mapping diff --git a/pyvene/models/mistral/modellings_intervenable_mistral.py b/pyvene/models/mistral/modellings_intervenable_mistral.py index edbd6176..7975edd3 100644 --- a/pyvene/models/mistral/modellings_intervenable_mistral.py +++ b/pyvene/models/mistral/modellings_intervenable_mistral.py @@ -20,19 +20,21 @@ "mlp_output": ("layers[%s].mlp", CONST_OUTPUT_HOOK), "mlp_input": ("layers[%s].mlp", CONST_INPUT_HOOK), "attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK), - "head_attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK), + "head_attention_value_output": ("layers[%s].self_attn.o_proj", CONST_INPUT_HOOK, (split_head_and_permute, "n_head")), "attention_output": ("layers[%s].self_attn", CONST_OUTPUT_HOOK), "attention_input": ("layers[%s].self_attn", CONST_INPUT_HOOK), "query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK), "key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK), "value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK), - "head_query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK), - "head_key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK), - "head_value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK), + "head_query_output": ("layers[%s].self_attn.q_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_head")), + "head_key_output": ("layers[%s].self_attn.k_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_kv_head")), + "head_value_output": ("layers[%s].self_attn.v_proj", CONST_OUTPUT_HOOK, (split_head_and_permute, "n_kv_head")), } mistral_type_to_dimension_mapping = { + "n_head": ("num_attention_heads",), + "n_kv_head": ("num_key_value_heads",), "block_input": ("hidden_size",), "block_output": ("hidden_size",), "mlp_activation": ("intermediate_size",), @@ -54,7 +56,7 @@ """mistral model with LM head""" mistral_lm_type_to_module_mapping = {} for k, v in mistral_type_to_module_mapping.items(): - mistral_lm_type_to_module_mapping[k] = (f"model.{v[0]}", v[1]) + mistral_lm_type_to_module_mapping[k] = (f"model.{v[0]}", ) + v[1:] mistral_lm_type_to_dimension_mapping = mistral_type_to_dimension_mapping
[External]: Attention head intervention doesn't work for models other than GPT-2 ### Contact Details [email protected] ### What happened? When intervening attention heads (i.e. set the intervention component as `head_attention_value_output`, `head_query_output`, `head_key_output`, or `head_value_output`), pyvene will crash. Only GPT-2 works, all the other LMs have the bug. The stack log will be like: ``` Traceback (most recent call last): File "/data1/wxz/test_pyvene.py", line 21, in <module> _, counterfactual_outputs = intervenable( File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1518, in _wrapped_call_impl return self._call_impl(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1527, in _call_impl return forward_call(*args, **kwargs) File "/home/wxz/workspace/pyvene/pyvene/models/intervenable_base.py", line 1465, in forward raise e File "/home/wxz/workspace/pyvene/pyvene/models/intervenable_base.py", line 1425, in forward self._wait_for_forward_with_parallel_intervention( File "/home/wxz/workspace/pyvene/pyvene/models/intervenable_base.py", line 1072, in _wait_for_forward_with_parallel_intervention _ = self.model(**sources[group_id]) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1518, in _wrapped_call_impl return self._call_impl(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1527, in _call_impl return forward_call(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/transformers/models/llama/modeling_llama.py", line 1192, in forward outputs = self.model( File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1518, in _wrapped_call_impl return self._call_impl(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1527, in _call_impl return forward_call(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/transformers/models/llama/modeling_llama.py", line 1019, in forward layer_outputs = decoder_layer( File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1518, in _wrapped_call_impl return self._call_impl(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1527, in _call_impl return forward_call(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/transformers/models/llama/modeling_llama.py", line 740, in forward hidden_states, self_attn_weights, present_key_value = self.self_attn( File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1518, in _wrapped_call_impl return self._call_impl(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1527, in _call_impl return forward_call(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/transformers/models/llama/modeling_llama.py", line 682, in forward attn_output = self.o_proj(attn_output) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1518, in _wrapped_call_impl return self._call_impl(*args, **kwargs) File "/home/wxz/miniconda3/envs/llm/lib/python3.10/site-packages/torch/nn/modules/module.py", line 1547, in _call_impl args_kwargs_result = hook(self, args, kwargs) # type: ignore[misc] File "/home/wxz/workspace/pyvene/pyvene/models/intervenable_base.py", line 747, in hook_callback selected_output = self._gather_intervention_output( File "/home/wxz/workspace/pyvene/pyvene/models/intervenable_base.py", line 658, in _gather_intervention_output selected_output = gather_neurons( File "/home/wxz/workspace/pyvene/pyvene/models/modeling_utils.py", line 276, in gather_neurons pos_tensor_input = bhsd_to_bs_hd(head_tensor_output) File "/home/wxz/workspace/pyvene/pyvene/models/modeling_utils.py", line 204, in bhsd_to_bs_hd b, h, s, d = tensor.shape ValueError: not enough values to unpack (expected 4, got 3) ``` I've basically figured out how to fix this bug and will submit a PR later. ### Code to produce this issue. ```shell #simplified from the nested intervention tutorial import pyvene as pv _, tokenizer, gpt = pv.create_llama("/data3/MODELS/llama2-hf/llama-2-7b") # every LM except for GPT-2 has the bug pv_config = pv.IntervenableConfig( model_type=type(gpt), representations=[ pv.RepresentationConfig( 1, "head_attention_value_output", # can also be changed to head_query_output, head_key_output, head_value_output, all don't work "h.pos", 1, ), ], intervention_types=pv.VanillaIntervention, ) base = tokenizer("The capital of Spain is", return_tensors="pt") sources = [tokenizer("The capital of Italy is", return_tensors="pt")] intervenable = pv.IntervenableModel(pv_config, gpt) _, counterfactual_outputs = intervenable( base, sources, { "sources->base": ( [[[[0]], [[4]]]], [[[[0]], [[4]]]], ) }, ) ```
2024-05-25T02:34:27
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-1334
4ccd1867a07a334b90398d0a817185753eb985a8
diff --git a/guides/advanced_user_guide.md b/guides/advanced_user_guide.md index 826f09aab8..5da22ec4c7 100644 --- a/guides/advanced_user_guide.md +++ b/guides/advanced_user_guide.md @@ -197,6 +197,7 @@ Below are the usages and input types: - add_pipeline_workspace() - InputType: workspace_name `str`, volume `V1Volume` (optional), volume_claim_template_spec `V1PersistentVolumeClaimSpec` (optional), path_prefix `str` - set_generate_component_spec_annotations() - InputType: `Bool` - set_condition_image_name() - InputType: `str` +- set_bash_image_name() - InputType: `str` ```python from kfp_tekton.compiler.pipeline_utils import TektonPipelineConf diff --git a/sdk/python/kfp_tekton/compiler/_op_to_template.py b/sdk/python/kfp_tekton/compiler/_op_to_template.py index e9f7959be6..d3671c7ff0 100644 --- a/sdk/python/kfp_tekton/compiler/_op_to_template.py +++ b/sdk/python/kfp_tekton/compiler/_op_to_template.py @@ -39,7 +39,7 @@ GENERATE_COMPONENT_SPEC_ANNOTATIONS = env.get('GENERATE_COMPONENT_SPEC_ANNOTATIONS', True) -def _get_base_step(name: str): +def _get_base_step(name: str, tekton_bash_image_name: str = TEKTON_BASH_STEP_IMAGE): """Base image step for running bash commands. Return a busybox base step for running bash commands. @@ -51,7 +51,7 @@ def _get_base_step(name: str): Dict[Text, Any] """ return { - 'image': TEKTON_BASH_STEP_IMAGE, + 'image': tekton_bash_image_name, 'name': name, 'command': ['sh', '-ec'] } @@ -244,7 +244,8 @@ def _process_parameters(processed_op: BaseOp, volume_template: List[Dict[Text, Any]], replaced_param_list: List[Text], artifact_to_result_mapping: Dict[Text, Any], - mounted_param_paths: List[Text]): + mounted_param_paths: List[Text], + tekton_bash_image_name: str = TEKTON_BASH_STEP_IMAGE): """Process output parameters to replicate the same behavior as Argo. Since Tekton results need to be under /tekton/results. If file output paths cannot be @@ -275,7 +276,7 @@ def _process_parameters(processed_op: BaseOp, """ if outputs_dict.get('parameters'): template['spec']['results'] = [] - copy_results_step = _get_base_step('copy-results') + copy_results_step = _get_base_step('copy-results', tekton_bash_image_name) script = "set -exo pipefail\n" for name, path in processed_op.file_outputs.items(): template['spec']['results'].append({ @@ -397,7 +398,8 @@ def _process_base_ops(op: BaseOp): def _op_to_template(op: BaseOp, pipelinerun_output_artifacts={}, artifact_items={}, - generate_component_spec_annotations=True): + generate_component_spec_annotations=True, + tekton_bash_image_name=TEKTON_BASH_STEP_IMAGE): """Generate template given an operator inherited from BaseOp.""" # Display name @@ -517,7 +519,8 @@ def _op_to_template(op: BaseOp, volume_template, replaced_param_list, artifact_to_result_mapping, - mounted_param_paths) + mounted_param_paths, + tekton_bash_image_name) _process_output_artifacts(outputs_dict, volume_mount_step_template, volume_template, diff --git a/sdk/python/kfp_tekton/compiler/compiler.py b/sdk/python/kfp_tekton/compiler/compiler.py index cba6067f2b..3853f20399 100644 --- a/sdk/python/kfp_tekton/compiler/compiler.py +++ b/sdk/python/kfp_tekton/compiler/compiler.py @@ -42,7 +42,7 @@ from kfp_tekton.compiler import __tekton_api_version__ as tekton_api_version from kfp_tekton.compiler._data_passing_rewriter import fix_big_data_passing, fix_big_data_passing_using_volume, BIG_DATA_PATH_FORMAT from kfp_tekton.compiler._k8s_helper import convert_k8s_obj_to_json, sanitize_k8s_name, sanitize_k8s_object -from kfp_tekton.compiler._op_to_template import _op_to_template +from kfp_tekton.compiler._op_to_template import _op_to_template, TEKTON_BASH_STEP_IMAGE from kfp_tekton.compiler._tekton_handler import _handle_tekton_pipeline_variables, _handle_tekton_custom_task, _process_argo_vars from kfp_tekton.compiler.pipeline_utils import TektonPipelineConf from kfp_tekton.compiler.yaml_utils import dump_yaml @@ -152,6 +152,7 @@ def __init__(self, **kwargs): self.task_workspaces = {} self.generate_component_spec_annotations = True self.condition_image_name = "python:3.9.17-alpine3.18" + self.bash_image_name = TEKTON_BASH_STEP_IMAGE super().__init__(**kwargs) def _set_pipeline_conf(self, tekton_pipeline_conf: TektonPipelineConf): @@ -168,6 +169,7 @@ def _set_pipeline_conf(self, tekton_pipeline_conf: TektonPipelineConf): self.pipeline_workspaces = tekton_pipeline_conf.pipeline_workspaces self.generate_component_spec_annotations = tekton_pipeline_conf.generate_component_spec_annotations self.condition_image_name = tekton_pipeline_conf.condition_image_name + self.bash_image_name = tekton_pipeline_conf.bash_image_name def _resolve_value_or_reference(self, value_or_reference, potential_references): """_resolve_value_or_reference resolves values and PipelineParams, which could be task parameters or input parameters. @@ -624,7 +626,8 @@ def _create_dag_templates(self, pipeline, op_transformers=None, params=None, op_ op_to_steps_handler = op_to_templates_handler or (lambda op: [_op_to_template(op, self.output_artifacts, self.artifact_items, - self.generate_component_spec_annotations)]) + self.generate_component_spec_annotations, + self.bash_image_name)]) root_group = pipeline.groups[0] # Call the transformation functions before determining the inputs/outputs, otherwise diff --git a/sdk/python/kfp_tekton/compiler/pipeline_utils.py b/sdk/python/kfp_tekton/compiler/pipeline_utils.py index cf904c8ba3..5c31f39679 100644 --- a/sdk/python/kfp_tekton/compiler/pipeline_utils.py +++ b/sdk/python/kfp_tekton/compiler/pipeline_utils.py @@ -14,6 +14,7 @@ from kfp import dsl from kubernetes.client.models import V1SecurityContext, V1Volume, V1PersistentVolumeClaimSpec +from kfp_tekton.compiler._op_to_template import TEKTON_BASH_STEP_IMAGE from typing import Dict TEKTON_PIPELINE_ANNOTATIONS = ['sidecar.istio.io/inject', 'tekton.dev/artifact_bucket', @@ -35,6 +36,7 @@ def __init__(self, **kwargs): self.pipeline_workspaces = {} self.generate_component_spec_annotations = True self.condition_image_name = "python:3.9.17-alpine3.18" + self.bash_image_name = TEKTON_BASH_STEP_IMAGE super().__init__(**kwargs) def copy(self): @@ -99,3 +101,7 @@ def set_generate_component_spec_annotations(self, value: bool): def set_condition_image_name(self, condition_image_name: str): self.condition_image_name = condition_image_name return self + + def set_bash_image_name(self, bash_image_name: str): + self.bash_image_name = bash_image_name + return self
TEKTON_BASH_STEP_IMAGE must be customized by TektonPipelineConf::set_bash_image_name `TEKTON_BASH_STEP_IMAGE` must be customized by `TektonPipelineConf::set_bash_image_name` https://github.com/kubeflow/kfp-tekton/blob/6081024172f61fc9ea8ec8a095eecdc37486cfe5/sdk/python/kfp_tekton/compiler/_op_to_template.py#L37 ![image](https://github.com/kubeflow/kfp-tekton/assets/687311/14a98351-1754-4f5c-a2dc-935c62918c4c)
/assign Hello @Tomcli If you could give some love on this one :)
2023-08-25T21:27:07
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-1319
d20c7b9ff110a26d59dfdef05bc1a11631b402ca
diff --git a/guides/advanced_user_guide.md b/guides/advanced_user_guide.md index 8517faa25e..6825d28496 100644 --- a/guides/advanced_user_guide.md +++ b/guides/advanced_user_guide.md @@ -188,7 +188,7 @@ used as a root OpsGroup in a pipeline. It can't be under other OpsGroup. ## Tekton Pipeline Config for PodTemplate -Currently users can explicitly setup Security Context and Auto Mount Service Account Token at the pipeline level using Tekton Pipleine Config. +Currently users can explicitly setup pipeline level configurations such as Security Context and Auto Mount Service Account Token using Tekton Pipleine Config. Below are the usages and input types: - set_security_context() - InputType: `V1SecurityContext` - set_automount_service_account_token() - InputType: `Bool` @@ -196,6 +196,7 @@ Below are the usages and input types: - set_pipeline_env() - InputType: `Dict` - add_pipeline_workspace() - InputType: workspace_name `str`, volume `V1Volume` (optional), volume_claim_template_spec `V1PersistentVolumeClaimSpec` (optional), path_prefix `str` - set_generate_component_spec_annotations() - InputType: `Bool` +- set_condition_image_name() - InputType: `str` ```python from kfp_tekton.compiler.pipeline_utils import TektonPipelineConf diff --git a/sdk/python/kfp_tekton/compiler/compiler.py b/sdk/python/kfp_tekton/compiler/compiler.py index a7617cf50d..25757cf965 100644 --- a/sdk/python/kfp_tekton/compiler/compiler.py +++ b/sdk/python/kfp_tekton/compiler/compiler.py @@ -58,7 +58,7 @@ DEFAULT_FINALLY_SECONDS = 300 -def _get_super_condition_template(): +def _get_super_condition_template(image_name="python:3.9.17-alpine3.18"): python_script = textwrap.dedent('''\ import sys @@ -92,7 +92,7 @@ def _get_super_condition_template(): 'name': 'main', 'command': ['sh', '-ec', 'program_path=$(mktemp); printf "%s" "$0" > "$program_path"; python3 -u "$program_path" "$1" "$2"'], 'args': [python_script, '$(inputs.params.operand1)', '$(inputs.params.operand2)'], - 'image': 'python:alpine3.6', + 'image': image_name, }] } @@ -151,6 +151,7 @@ def __init__(self, **kwargs): self.pipeline_workspaces = {} self.task_workspaces = {} self.generate_component_spec_annotations = True + self.condition_image_name = "python:3.9.17-alpine3.18" super().__init__(**kwargs) def _set_pipeline_conf(self, tekton_pipeline_conf: TektonPipelineConf): @@ -166,6 +167,7 @@ def _set_pipeline_conf(self, tekton_pipeline_conf: TektonPipelineConf): self.pipeline_env = tekton_pipeline_conf.pipeline_env self.pipeline_workspaces = tekton_pipeline_conf.pipeline_workspaces self.generate_component_spec_annotations = tekton_pipeline_conf.generate_component_spec_annotations + self.condition_image_name = tekton_pipeline_conf.condition_image_name def _resolve_value_or_reference(self, value_or_reference, potential_references): """_resolve_value_or_reference resolves values and PipelineParams, which could be task parameters or input parameters. @@ -957,7 +959,7 @@ def _create_pipeline_workflow(self, args, pipeline, op_transformers=None, pipeli for template in raw_templates: if template['kind'] == 'Condition': if DISABLE_CEL_CONDITION: - condition_task_spec = _get_super_condition_template() + condition_task_spec = _get_super_condition_template(self.condition_image_name) else: condition_task_spec = _get_cel_condition_template() diff --git a/sdk/python/kfp_tekton/compiler/pipeline_utils.py b/sdk/python/kfp_tekton/compiler/pipeline_utils.py index 6a9673fe5d..cf904c8ba3 100644 --- a/sdk/python/kfp_tekton/compiler/pipeline_utils.py +++ b/sdk/python/kfp_tekton/compiler/pipeline_utils.py @@ -34,6 +34,7 @@ def __init__(self, **kwargs): self.pipeline_env = {} self.pipeline_workspaces = {} self.generate_component_spec_annotations = True + self.condition_image_name = "python:3.9.17-alpine3.18" super().__init__(**kwargs) def copy(self): @@ -94,3 +95,7 @@ def add_pipeline_workspace(self, def set_generate_component_spec_annotations(self, value: bool): self.generate_component_spec_annotations = value return self + + def set_condition_image_name(self, condition_image_name: str): + self.condition_image_name = condition_image_name + return self diff --git a/sdk/python/setup.py b/sdk/python/setup.py index 85c2a08bdd..237ddb048f 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -54,7 +54,7 @@ # NOTICE, after any updates to the following, ./requirements.in should be updated # accordingly. REQUIRES = [ - "kfp>=1.8.10,<1.8.22", + "kfp>=1.8.10,<1.8.23", ] TESTS_REQUIRE = [
Custom image for compiler template https://github.com/kubeflow/kfp-tekton/blob/d20c7b9ff110a26d59dfdef05bc1a11631b402ca/sdk/python/kfp_tekton/compiler/compiler.py#L95 ``` The step "main" in TaskRun "conditional-execution-pipeline-9eb05-condition-1" failed to pull the image "". The pod errored with the message: "Back-off pulling image "python:alpine3.6"." ```
2023-08-07T16:06:34
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-1268
1519d2d15618d6bb5d9f867407bddfc92a05dade
diff --git a/backend/src/v2/compiler/tektoncompiler/container.go b/backend/src/v2/compiler/tektoncompiler/container.go index 0f01451782..8937b0fa2b 100644 --- a/backend/src/v2/compiler/tektoncompiler/container.go +++ b/backend/src/v2/compiler/tektoncompiler/container.go @@ -251,6 +251,16 @@ func (c *pipelinerunCompiler) containerDriverTask(name string, inputs *container Name: paramKubernetesConfig, Value: pipelineapi.ParamValue{Type: "string", StringVal: inputs.kubernetesConfig}, }, + // "--mlmd_server_address" + { + Name: paramNameMLMDServerHost, + Value: pipelineapi.ParamValue{Type: "string", StringVal: GetMLMDHost()}, + }, + // "--mlmd_server_port" + { + Name: paramNameMLMDServerPort, + Value: pipelineapi.ParamValue{Type: "string", StringVal: GetMLMDPort()}, + }, // produce the following outputs: // - execution-id // - executor-input diff --git a/backend/src/v2/compiler/tektoncompiler/dag.go b/backend/src/v2/compiler/tektoncompiler/dag.go index a13c6c3238..ea5ba82f55 100644 --- a/backend/src/v2/compiler/tektoncompiler/dag.go +++ b/backend/src/v2/compiler/tektoncompiler/dag.go @@ -277,6 +277,16 @@ func (c *pipelinerunCompiler) dagDriverTask( Name: paramNameIterationIndex, Value: pipelineapi.ParamValue{Type: "string", StringVal: inputs.getIterationIndex()}, }, + // "--mlmd_server_address" + { + Name: paramNameMLMDServerHost, + Value: pipelineapi.ParamValue{Type: "string", StringVal: GetMLMDHost()}, + }, + // "--mlmd_server_port" + { + Name: paramNameMLMDServerPort, + Value: pipelineapi.ParamValue{Type: "string", StringVal: GetMLMDPort()}, + }, // produce the following outputs: // - execution-id // - iteration-count @@ -323,6 +333,16 @@ func (c *pipelinerunCompiler) dagPubDriverTask( Name: paramNameDagExecutionId, Value: pipelineapi.ParamValue{Type: "string", StringVal: inputs.getParentDagID(c.ExitHandlerScope() || rootDagPub)}, }, + // "--mlmd_server_address" + { + Name: paramNameMLMDServerHost, + Value: pipelineapi.ParamValue{Type: "string", StringVal: GetMLMDHost()}, + }, + // "--mlmd_server_port" + { + Name: paramNameMLMDServerPort, + Value: pipelineapi.ParamValue{Type: "string", StringVal: GetMLMDPort()}, + }, }, } if len(inputs.deps) > 0 { diff --git a/backend/src/v2/compiler/tektoncompiler/tekton.go b/backend/src/v2/compiler/tektoncompiler/tekton.go index f818c4cce1..69e1ac7a9a 100644 --- a/backend/src/v2/compiler/tektoncompiler/tekton.go +++ b/backend/src/v2/compiler/tektoncompiler/tekton.go @@ -658,6 +658,8 @@ const ( paramNameCachedDecision = "cached_decision" paramNamePodSpecPatchPath = "pod_spec_patch_path" paramNameExecutorInput = "executor_input" + paramNameMLMDServerHost = "mlmd_server_address" + paramNameMLMDServerPort = "mlmd_server_port" paramKubernetesConfig = "kubernetes_config" // stores Kubernetes config kindPipelineLoop = "PipelineLoop" diff --git a/manifests/kustomize/env/platform-agnostic-tekton/kustomization.yaml b/manifests/kustomize/env/platform-agnostic-tekton/kustomization.yaml index 77acb167fd..d866b05781 100644 --- a/manifests/kustomize/env/platform-agnostic-tekton/kustomization.yaml +++ b/manifests/kustomize/env/platform-agnostic-tekton/kustomization.yaml @@ -16,7 +16,7 @@ resources: images: - name: gcr.io/ml-pipeline/api-server newName: docker.io/aipipeline/apiserver-dev - newTag: 89d657d2a + newTag: 35628146f - name: gcr.io/ml-pipeline/persistenceagent newName: docker.io/aipipeline/persistenceagent-dev newTag: 4a9a4eaf1 diff --git a/manifests/kustomize/env/platform-openshift-pipelines/kustomization.yaml b/manifests/kustomize/env/platform-openshift-pipelines/kustomization.yaml index 6ff1439942..6ec04a3145 100644 --- a/manifests/kustomize/env/platform-openshift-pipelines/kustomization.yaml +++ b/manifests/kustomize/env/platform-openshift-pipelines/kustomization.yaml @@ -67,7 +67,7 @@ patches: images: - name: gcr.io/ml-pipeline/api-server newName: docker.io/aipipeline/apiserver-dev - newTag: 89d657d2a + newTag: 35628146f - name: gcr.io/ml-pipeline/persistenceagent newName: docker.io/aipipeline/persistenceagent-dev newTag: 4a9a4eaf1
[v2] MLMD host/port hardcoded, preventing deployment into non-kubeflow namespace /kind bug **What steps did you take and what happened:** When deploying the `v2-integration branch` into a non-kubeflow namespace, connectivity to mlmd fails [here](https://github.com/kubeflow/kfp-tekton/blob/cdb7932cdb129fa038ef4ff95a9dd46d1ab252cc/backend/src/v2/metadata/client.go#L1014). This seems to be because [these fields are never set](https://github.com/kubeflow/kfp-tekton/blob/89b719b7b013ab29eb8c3b4110e0388a057f086e/backend/src/v2/controller/run.go#L280-L283). And instead the [hardcoded mlmd hostport ](https://github.com/kubeflow/kfp-tekton/blob/89b719b7b013ab29eb8c3b4110e0388a057f086e/backend/src/v2/controller/run.go#L213) is used. Brief skim suggests it's expecting these from the `CustomRun`, coming from [here](https://github.com/kubeflow/kfp-tekton/blob/89d657d2a32eaf709133c8e96992913226155b02/backend/src/v2/compiler/tektoncompiler/dag.go#L239) or [here](https://github.com/kubeflow/kfp-tekton/blob/89d657d2a32eaf709133c8e96992913226155b02/backend/src/v2/compiler/tektoncompiler/container.go#L208), or both. I'm guessing solution here would involve passing in the mlmd host passed into the api server? **What did you expect to happen:** Expect to be able to execute runs with successful connectivity to mlmd.
2023-06-27T21:47:04
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-1108
05baded0ef05870f751b72ef12dbc8f218581cba
diff --git a/sdk/python/kfp_tekton/compiler/compiler.py b/sdk/python/kfp_tekton/compiler/compiler.py index 9604178b80..f4370776a1 100644 --- a/sdk/python/kfp_tekton/compiler/compiler.py +++ b/sdk/python/kfp_tekton/compiler/compiler.py @@ -1610,6 +1610,11 @@ def _create_workflow(self, if pipeline_conf and pipeline_conf.data_passing_method is not None: workflow = fix_big_data_passing_using_volume(workflow, pipeline_conf) + if pipeline_conf and pipeline_conf.timeout > 0: + workflow['spec'].setdefault('timeouts', {'pipeline': '0s', 'tasks': '0s'}) + workflow['spec']['timeouts']['tasks'] = '%ds' % pipeline_conf.timeout + workflow['spec']['timeouts']['pipeline'] = '%ds' % (pipeline_conf.timeout + DEFAULT_FINALLY_SECONDS) + workflow.setdefault('metadata', {}).setdefault('annotations', {})['pipelines.kubeflow.org/pipeline_spec'] = \ json.dumps(pipeline_meta.to_dict(), sort_keys=True)
PipelineConf provided with timeouts does not generate timeouts block in PipelineRun /kind bug **What steps did you take and what happened:** Create a PipelineConf object with set_timeout(NNN) applied Supply `pipeline_conf` via `kfp_tekton.compiler.TektonCompiler().compile(... ,pipeline_conf=XXX)` and note in YAML it does not apply timeouts set from passed configuration **What did you expect to happen:** Timeouts to be honored and a `timeouts:` section generated in the YAML **Environment:** * Python Version (use `python --version`): 3.9.7 * SDK Version: 1.4.0 * Tekton Version (use `tkn version`): n/a * Kubernetes Version (use `kubectl version`): n/a * OS (e.g. from `/etc/os-release`): Debian GNU/Linux 11 (bullseye)
in kfp-tekton we are using the `dsl.get_pipeline_conf().set_timeout(1)` syntax, but since kfp supports the pipeline_conf object as well, I can add a PR to also add that support
2022-12-13T20:51:26
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-790
61e4f3657803a6318ebd717a6b5ca53af68c9499
diff --git a/tekton-catalog/pipeline-loops/go.mod b/tekton-catalog/pipeline-loops/go.mod index 060840aa8b..8c51caee1a 100644 --- a/tekton-catalog/pipeline-loops/go.mod +++ b/tekton-catalog/pipeline-loops/go.mod @@ -3,16 +3,11 @@ module github.com/kubeflow/kfp-tekton/tekton-catalog/pipeline-loops go 1.13 require ( - contrib.go.opencensus.io/exporter/stackdriver v0.13.5 // indirect - github.com/go-kit/kit v0.10.0 // indirect - github.com/go-openapi/validate v0.19.5 // indirect github.com/google/go-cmp v0.5.6 github.com/hashicorp/go-multierror v1.1.1 github.com/tektoncd/pipeline v0.30.0 go.uber.org/zap v1.19.1 gomodules.xyz/jsonpatch/v2 v2.2.0 - gopkg.in/evanphx/json-patch.v4 v4.9.0 // indirect - honnef.co/go/tools v0.0.1-2020.1.5 // indirect k8s.io/api v0.21.4 k8s.io/apimachinery v0.21.4 k8s.io/client-go v0.21.4 diff --git a/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_types.go b/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_types.go index c8a3bd57f1..db47d29dbe 100644 --- a/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_types.go +++ b/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_types.go @@ -51,6 +51,10 @@ type PipelineLoopSpec struct { // IterateParam is the name of the task parameter that is iterated upon. IterateParam string `json:"iterateParam"` + // The separator for IterateParam if the IterateParam is a strings with separator char, this field is optional. + // +optional + IterateParamSeparator string `json:"iterateParamStringSeparator,omitempty"` + IterateNumeric string `json:"iterateNumeric"` // Time after which the TaskRun times out. diff --git a/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go b/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go index abd7bf1150..0d8a9925cf 100644 --- a/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go +++ b/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go @@ -20,13 +20,15 @@ import ( "context" "encoding/json" "fmt" - "k8s.io/apimachinery/pkg/runtime" - duckv1 "knative.dev/pkg/apis/duck/v1" "log" "reflect" "strconv" + "strings" "time" + "k8s.io/apimachinery/pkg/runtime" + duckv1 "knative.dev/pkg/apis/duck/v1" + "github.com/hashicorp/go-multierror" "github.com/kubeflow/kfp-tekton/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop" @@ -586,6 +588,8 @@ func computeIterations(run *v1alpha1.Run, tls *pipelineloopv1alpha1.PipelineLoop step := -1 to := -1 iterationElements := []interface{}{} + iterationParamStr := "" + iterationParamStrSeparator := "" for _, p := range run.Spec.Params { if tls.IterateNumeric != "" { if p.Name == "from" { @@ -597,53 +601,64 @@ func computeIterations(run *v1alpha1.Run, tls *pipelineloopv1alpha1.PipelineLoop if p.Name == "to" { to, _ = strconv.Atoi(p.Value.StringVal) } - } else if p.Name == tls.IterateParam { - if p.Value.Type == v1beta1.ParamTypeString { - // Transfer p.Value to Array. - var strings []string - var ints []int - var dictsString []map[string]string - var dictsInt []map[string]int - errString := json.Unmarshal([]byte(p.Value.StringVal), &strings) - errInt := json.Unmarshal([]byte(p.Value.StringVal), &ints) - errDictString := json.Unmarshal([]byte(p.Value.StringVal), &dictsString) - errDictInt := json.Unmarshal([]byte(p.Value.StringVal), &dictsInt) - if errString != nil && errInt != nil && errDictString != nil && errDictInt != nil { - return 0, iterationElements, fmt.Errorf("The value of the iterate parameter %q can not transfer to array", tls.IterateParam) + } else { + if p.Name == tls.IterateParam { + if p.Value.Type == v1beta1.ParamTypeString { + iterationParamStr = strings.Trim(p.Value.StringVal, " ") } - - if errString == nil { - numberOfIterations = len(strings) - for _, v := range strings { - iterationElements = append(iterationElements, v) - } - break - } else if errInt == nil { - numberOfIterations = len(ints) - for _, v := range ints { - iterationElements = append(iterationElements, v) - } - break - } else if errDictString == nil { - numberOfIterations = len(dictsString) - for _, v := range dictsString { - iterationElements = append(iterationElements, v) - } - break - } else if errDictInt == nil { - numberOfIterations = len(dictsInt) - for _, v := range dictsInt { + if p.Value.Type == v1beta1.ParamTypeArray { + numberOfIterations = len(p.Value.ArrayVal) + for _, v := range p.Value.ArrayVal { iterationElements = append(iterationElements, v) } break } } - if p.Value.Type == v1beta1.ParamTypeArray { - numberOfIterations = len(p.Value.ArrayVal) - for _, v := range p.Value.ArrayVal { + if p.Name == tls.IterateParamSeparator { + iterationParamStrSeparator = p.Value.StringVal + } + } + } + if iterationParamStr != "" { + // Transfer p.Value to Array. + if iterationParamStrSeparator != "" { + stringArr := strings.Split(iterationParamStr, iterationParamStrSeparator) + numberOfIterations = len(stringArr) + for _, v := range stringArr { + iterationElements = append(iterationElements, v) + } + } else { + var strings []string + var ints []int + var dictsString []map[string]string + var dictsInt []map[string]int + errString := json.Unmarshal([]byte(iterationParamStr), &strings) + errInt := json.Unmarshal([]byte(iterationParamStr), &ints) + errDictString := json.Unmarshal([]byte(iterationParamStr), &dictsString) + errDictInt := json.Unmarshal([]byte(iterationParamStr), &dictsInt) + if errString != nil && errInt != nil && errDictString != nil && errDictInt != nil { + return 0, iterationElements, fmt.Errorf("The value of the iterate parameter %q can not transfer to array", tls.IterateParam) + } + if errString == nil { + numberOfIterations = len(strings) + for _, v := range strings { + iterationElements = append(iterationElements, v) + } + } else if errInt == nil { + numberOfIterations = len(ints) + for _, v := range ints { + iterationElements = append(iterationElements, v) + } + } else if errDictString == nil { + numberOfIterations = len(dictsString) + for _, v := range dictsString { + iterationElements = append(iterationElements, v) + } + } else if errDictInt == nil { + numberOfIterations = len(dictsInt) + for _, v := range dictsInt { iterationElements = append(iterationElements, v) } - break } } } @@ -669,6 +684,8 @@ func getParameters(run *v1alpha1.Run, tls *pipelineloopv1alpha1.PipelineLoopSpec var out []v1beta1.Param if tls.IterateParam != "" { // IterateParam defined + var iterationParam, iterationParamStrSeparator *v1beta1.Param + var item, separator v1beta1.Param for i, p := range run.Spec.Params { if p.Name == tls.IterateParam { if p.Value.Type == v1beta1.ParamTypeArray { @@ -678,42 +695,59 @@ func getParameters(run *v1alpha1.Run, tls *pipelineloopv1alpha1.PipelineLoopSpec }) } if p.Value.Type == v1beta1.ParamTypeString { - var strings []string - var ints []int - var dictsString []map[string]string - var dictsInt []map[string]int - errString := json.Unmarshal([]byte(p.Value.StringVal), &strings) - errInt := json.Unmarshal([]byte(p.Value.StringVal), &ints) - errDictString := json.Unmarshal([]byte(p.Value.StringVal), &dictsString) - errDictInt := json.Unmarshal([]byte(p.Value.StringVal), &dictsInt) - if errString == nil { + item = p + iterationParam = &item + } + } else if p.Name == tls.IterateParamSeparator { + separator = p + iterationParamStrSeparator = &separator + } else { + out = append(out, run.Spec.Params[i]) + } + } + if iterationParam != nil { + if iterationParamStrSeparator != nil { + iterationParamStr := strings.Trim(iterationParam.Value.StringVal, " ") + stringArr := strings.Split(iterationParamStr, iterationParamStrSeparator.Value.StringVal) + out = append(out, v1beta1.Param{ + Name: iterationParam.Name, + Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: stringArr[iteration-1]}, + }) + + } else { + var strings []string + var ints []int + var dictsString []map[string]string + var dictsInt []map[string]int + errString := json.Unmarshal([]byte(iterationParam.Value.StringVal), &strings) + errInt := json.Unmarshal([]byte(iterationParam.Value.StringVal), &ints) + errDictString := json.Unmarshal([]byte(iterationParam.Value.StringVal), &dictsString) + errDictInt := json.Unmarshal([]byte(iterationParam.Value.StringVal), &dictsInt) + if errString == nil { + out = append(out, v1beta1.Param{ + Name: iterationParam.Name, + Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: strings[iteration-1]}, + }) + } else if errInt == nil { + out = append(out, v1beta1.Param{ + Name: iterationParam.Name, + Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: strconv.Itoa(ints[iteration-1])}, + }) + } else if errDictString == nil { + for dictParam := range dictsString[iteration-1] { out = append(out, v1beta1.Param{ - Name: p.Name, - Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: strings[iteration-1]}, + Name: iterationParam.Name + "-subvar-" + dictParam, + Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: dictsString[iteration-1][dictParam]}, }) - } else if errInt == nil { + } + } else if errDictInt == nil { + for dictParam := range dictsInt[iteration-1] { out = append(out, v1beta1.Param{ - Name: p.Name, - Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: strconv.Itoa(ints[iteration-1])}, + Name: iterationParam.Name + "-subvar-" + dictParam, + Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: strconv.Itoa(dictsInt[iteration-1][dictParam])}, }) - } else if errDictString == nil { - for dictParam := range dictsString[iteration-1] { - out = append(out, v1beta1.Param{ - Name: p.Name + "-subvar-" + dictParam, - Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: dictsString[iteration-1][dictParam]}, - }) - } - } else if errDictInt == nil { - for dictParam := range dictsInt[iteration-1] { - out = append(out, v1beta1.Param{ - Name: p.Name + "-subvar-" + dictParam, - Value: v1beta1.ArrayOrString{Type: v1beta1.ParamTypeString, StringVal: strconv.Itoa(dictsInt[iteration-1][dictParam])}, - }) - } } } - } else { - out = append(out, run.Spec.Params[i]) } } } else {
Pipelineloop should support to iterate with an string with separator char /kind feature **Description:** Current pipeline loop only supports to iterate from `iterateParam` with string value like: ``` value: '["I am the first one", "I am the second one", "I am the third one"]' ``` I would like to introduce a new field `iterateParamSeparator` to allow user to pass the separator char and allow us to split the iterateParam as a string array for the loop. This field is optional, it only works with string type param. eg: ``` iterateParam= "aaa|bbb|ccc|ddd" iterateParamSeparator="|" ```
@pugangxa @Tomcli if you agree this this enhancement, I'm going to create the PR Thanks. @wzhanw is the `'["I am the first one", "I am the second one", "I am the third one"]'` format still supported? We want to ensure it won't break any backward compatibility. I'm okay with the new proposed iterateParam. FYI @Udiknedormin are you aware of this change? @wzhanw As discussed, there's multiple format for loop parameters, like `from/to`, list and string with separators. It's OK to have this feature for the format of `string with separators`, thanks. > @wzhanw is the `'["I am the first one", "I am the second one", "I am the third one"]'` format still supported? We want to ensure it won't break any backward compatibility. @Tomcli sure, we will not break the old feature.
2021-11-25T11:33:05
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-750
e9749dc2dec19f47ef8a6cee7553e09ffca12f9e
diff --git a/sdk/python/kfp_tekton/compiler/_data_passing_rewriter.py b/sdk/python/kfp_tekton/compiler/_data_passing_rewriter.py index 0bdd3d8b76..ac79d7b39f 100644 --- a/sdk/python/kfp_tekton/compiler/_data_passing_rewriter.py +++ b/sdk/python/kfp_tekton/compiler/_data_passing_rewriter.py @@ -92,7 +92,7 @@ def fix_big_data_passing(workflow: dict) -> dict: pipeline_template = workflow["spec"]["pipelineSpec"] - pipelinerun_template = workflow + pipelinerun_template = load_annotations(workflow) # 1. Index the pipelines to understand how data is being passed and which # inputs/outputs are connected to each other. @@ -367,10 +367,10 @@ def mark_upstream_ios_of_output(template_output, marked_inputs, argument_placeholder_parts[2], sanitize_k8s_name(argument_placeholder_parts[3])) + workflow = jsonify_annotations(workflow) # Need to confirm: # I didn't find the use cases to support workflow parameter consumed as artifacts downstream in tekton. # Whether this case need to be supporting? - clean_up_empty_workflow_structures(workflow) return workflow @@ -490,19 +490,17 @@ def big_data_passing_tasks(prname: str, task: dict, pipelinerun_template: dict, task_name, task_name, task_output.get('name')) task['taskSpec'] = replace_big_data_placeholder( task.get("taskSpec", {}), placeholder, workspaces_parameter) - pipelinerun_template['metadata']['annotations'] = replace_big_data_placeholder( - pipelinerun_template['metadata']['annotations'], placeholder, workspaces_parameter) - - # Remove artifacts outputs from results - task.get("taskSpec", {})['results'] = [ - result for result in task_outputs - if (task_name, result.get('name')) not in outputs_tasks - ] + artifact_items = pipelinerun_template['metadata']['annotations']['tekton.dev/artifact_items'] + artifact_items[task['name']] = replace_big_data_placeholder( + artifact_items[task['name']], placeholder, workspaces_parameter) + pipelinerun_template['metadata']['annotations']['tekton.dev/artifact_items'] = \ + artifact_items - # Data passing for task inputs task_spec = task.get('taskSpec', {}) task_params = task_spec.get('params', []) task_artifacts = task_spec.get('artifacts', []) + + # Data passing for task inputs for task_param in task_params: if (task_name, task_param.get('name')) in inputs_tasks: if not task_spec.setdefault('workspaces', []): @@ -535,6 +533,34 @@ def big_data_passing_tasks(prname: str, task: dict, pipelinerun_template: dict, task_artifact['raw']['data'] = param_value task = input_artifacts_tasks_pr_params(task, task_artifact) + # If a task produces a result and artifact, add a step to copy artifact to results. + artifact_items = pipelinerun_template['metadata']['annotations']['tekton.dev/artifact_items'] + add_copy_results_artifacts_step = False + if task.get("taskSpec", {}): + if task_spec.get('results', []): + copy_results_artifact_step = _get_base_step('copy-results-artifacts') + copy_results_artifact_step['onError'] = 'continue' # supported by v0.27+ of tekton. + copy_results_artifact_step['script'] += 'TOTAL_SIZE=0\n' + for result in task_spec['results']: + if task['name'] in artifact_items: + artifact_i = artifact_items[task['name']] + for index, artifact_tuple in enumerate(artifact_i): + artifact_name, artifact = artifact_tuple + src = artifact + dst = '$(results.%s.path)' % sanitize_k8s_name(result['name']) + if artifact_name == result['name'] and src != dst: + add_copy_results_artifacts_step = True + copy_results_artifact_step['script'] += ( + 'ARTIFACT_SIZE=`wc -c %s | awk \'{print $1}\'`\n' % src + + 'TOTAL_SIZE=$( expr $TOTAL_SIZE + $ARTIFACT_SIZE)\n' + + 'touch ' + dst + '\n' + # create an empty file by default. + 'if [[ $TOTAL_SIZE -lt 3072 ]]; then\n' + + ' cp ' + src + ' ' + dst + '\n' + + 'fi\n' + ) + if add_copy_results_artifacts_step: + task['taskSpec']['steps'].append(copy_results_artifact_step) + # Remove artifacts parameter from params task.get("taskSpec", {})['params'] = [ param for param in task_spec.get('params', []) @@ -610,3 +636,17 @@ def clean_up_empty_workflow_structures(workflow: list): del task['artifacts'] if not workflow['spec']['pipelineSpec'].setdefault('finally', []): del workflow['spec']['pipelineSpec']['finally'] + + +def load_annotations(template: dict): + artifact_items = json.loads( + str(template['metadata']['annotations']['tekton.dev/artifact_items'])) + template['metadata']['annotations']['tekton.dev/artifact_items'] = \ + artifact_items + return template + + +def jsonify_annotations(template: dict): + template['metadata']['annotations']['tekton.dev/artifact_items'] = \ + json.dumps(template['metadata']['annotations']['tekton.dev/artifact_items']) + return template diff --git a/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go b/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go index cb16ed9f6e..b5573d23a8 100644 --- a/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go +++ b/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go @@ -191,6 +191,7 @@ func EnableCustomTaskFeatureFlag(ctx context.Context) context.Context { defaults, _ := config.NewDefaultsFromMap(map[string]string{}) featureFlags, _ := config.NewFeatureFlagsFromMap(map[string]string{ "enable-custom-tasks": "true", + "enable-api-fields" : "alpha", }) artifactBucket, _ := config.NewArtifactBucketFromMap(map[string]string{}) artifactPVC, _ := config.NewArtifactPVCFromMap(map[string]string{})
Ensure full support for KFP's data passing /kind feature **Description:** KFP has simple and flexible data passing support. * Any input argument can be consumed a) as value or b) as file. * User can pass to any input: a) Constant string value, b) Task output, c) Pipeline/DAG input There is a sample test pipeline that tests all these data passing interactions (as well as type compatibility): https://github.com/kubeflow/pipelines/blob/9ad37cc2a838fd50a1c2099815402f735ba602cb/samples/test/data_passing.py Let's ensure that KPF-Tekton passes this conformance test. Thank you. /cc @Tomcli @RedbackThomson
@Tomcli As discussed let me know if it's still needed and see whether we can take some pieces. Related issue https://github.com/kubeflow/kfp-tekton/issues/682 There was some assumption when @fenglixa implemented the original big data passing function that are breaking some cases in this test. I will break it down into smaller pieces on what is needed to be fixed/added to support the remaining data passing use cases. /assign @ScrapCodes I think Hui Liu from our team is also looking at this. Please append your scope and progress to avoid overlap. @pugangxa Thanks. @ScrapCodes I just begin to check below 2 parts, will check whether could pass the task output that gets consumed as value or file successfully in kfp-tekton. Will append more results or progresses after my testing. Thanks. ``` # Pass task output; consume as value consume_anything_as_value(produced_anything) consume_anything_as_value(produced_something) consume_anything_as_value(produced_string) consume_something_as_value(produced_anything) consume_something_as_value(produced_something) consume_string_as_value(produced_anything) consume_string_as_value(produced_string) # Pass task output; consume as file consume_anything_as_file(produced_anything) consume_anything_as_file(produced_something) consume_anything_as_file(produced_string) consume_something_as_file(produced_anything) consume_something_as_file(produced_something) consume_string_as_file(produced_anything) consume_string_as_file(produced_string) ``` Thanks @huixa The pipeline should able to compile, but the Tekton spec is not correct due to the issue I linked above. Maybe after some testing, if you think it will be a lot of work. @huixa can work one the `# Pass task output; consume as value` part and @ScrapCodes can work one the `# Pass task output; consume as file` part @Tomcli For the Alexey mentioned data passing file(https://github.com/kubeflow/pipelines/blob/master/samples/test/legacy_data_passing.py), there has 6 groups end-to-end cases. I had tested the group 5 and 6, run each group independently, it will be successful. When run group 5 and 6 together, it will occur your mentioned #682(I will append the test case and error message etc on it.) | Number | Group | Status| | ---- | ---- | ---- | | 1 | # Pass constant value; consume as value | Not start testing | | 2 | # Pass constant value; consume as file | Not start testing | | 3 | # Pass pipeline parameter; consume as value | Not start testing | | 4 | # Pass pipeline parameter; consume as file | Not start testing | | 5 | # Pass task output; consume as value | Pass | | 6 | # Pass task output; consume as file | Pass | I want to continue to test the group4, 3 ..., is it OK? Thanks. > @Tomcli For the Alexey mentioned data passing file(https://github.com/kubeflow/pipelines/blob/master/samples/test/legacy_data_passing.py), there has 6 groups end-to-end cases. I had tested the group 5 and 6, run each group independently, it will be successful. When run group 5 and 6 together, it will occur your mentioned #682(I will append the test case and error message etc on it.) > > Number Group Status > 1 # Pass constant value; consume as value Not start testing > 2 # Pass constant value; consume as file Not start testing > 3 # Pass pipeline parameter; consume as value Not start testing > 4 # Pass pipeline parameter; consume as file Not start testing > 5 # Pass task output; consume as value Pass > 6 # Pass task output; consume as file Pass > I want to continue to test the group4, 3 ..., is it OK? Thanks. Sure no problem, I forgot can 3 and 4 work together or not. The implementation for passing a constant value or pipeline parameter is to prepend a step that convert the value/parameter into a file stored in an empty dir, then the main step can read that file to get the value/parameter. @Tomcli and @pugangxa Finish the KFP's data passing testing, the result is below: 1)Run each group independently, all will pass except the group 4. Had logged #733 to trace. 2)Run group1,2,3,4 together, only the group 4 failed, it's same issue in #733. 3)Run group 5,6 together, it's failed due to #682. | Number | Group | Status| | ---- | ---- | ---- | | 1 | # Pass constant value; consume as value | Pass | | 2 | # Pass constant value; consume as file | Pass | | 3 | # Pass pipeline parameter; consume as value | Pass | | 4 | # Pass pipeline parameter; consume as file | Failed, logged #733 | | 5 | # Pass task output; consume as value | Pass | | 6 | # Pass task output; consume as file | Pass | > @Tomcli and @pugangxa Finish the KFP's data passing testing, the result is below: > 1)Run each group independently, all will pass except the group 4. Had logged #733 to trace. > 2)Run group1,2,3,4 together, only the group 4 failed, it's same issue in #733. > 3)Run group 5,6 together, it's failed due to #682. > > Number Group Status > 1 # Pass constant value; consume as value Pass > 2 # Pass constant value; consume as file Pass > 3 # Pass pipeline parameter; consume as value Pass > 4 # Pass pipeline parameter; consume as file Failed, logged #733 > 5 # Pass task output; consume as value Pass > 6 # Pass task output; consume as file Pass thanks @huixa, you want to fix 1 and 2, then let @ScrapCodes look into 3? @Tomcli I think it's ok for me and try to fix the #733. As a new hand, maybe I need some time on it. Thanks very much. > @Tomcli I think it's ok for me and try to fix the #733. As a new hand, maybe I need some time on it. Thanks very much. Never mind, if anything unclear or need help please feel free to find me.
2021-10-12T11:22:25
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-650
2cfc78da659f6de45dda9dad805c11398bed7912
diff --git a/sdk/python/kfp_tekton/compiler/compiler.py b/sdk/python/kfp_tekton/compiler/compiler.py index dfd0ad6adb..101dc64ea8 100644 --- a/sdk/python/kfp_tekton/compiler/compiler.py +++ b/sdk/python/kfp_tekton/compiler/compiler.py @@ -279,9 +279,7 @@ def _group_to_dag_template(self, group, inputs, outputs, dependencies, pipeline_ self.loops_pipeline[group_name]['task_list'].append(sanitize_k8s_name(condition_op.name)) if op.groups: for condition_op in op.groups: - # graph task should be a nested cr and need be appended to task list. - if condition_op.type == 'graph': - self.loops_pipeline[group_name]['task_list'].append(sanitize_k8s_name(condition_op.name)) + self.loops_pipeline[group_name]['task_list'].append(sanitize_k8s_name(condition_op.name)) self.loops_pipeline[group_name]['spec']['name'] = group_name self.loops_pipeline[group_name]['spec']['taskRef'] = { "apiVersion": "custom.tekton.dev/v1alpha1",
Parallel loops inside recursion graph are not generated properly Based on @pugangxa 's request, I created this example. So it looks like @pugangxa is right where loops inside recursion graph is embedded in the main pipelinerun yaml instead of the recursion yaml. Example: ```python # Copyright 2020 kubeflow.org # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. from kfp import dsl from kfp_tekton.compiler import TektonCompiler class Coder: def empty(self): return "" TektonCompiler._get_unique_id_code = Coder.empty def flip_coin_op(): """Flip a coin and output heads or tails randomly.""" return dsl.ContainerOp( name='Flip coin', image='python:alpine3.6', command=['sh', '-c'], arguments=['python -c "import random; result = \'heads\' if random.randint(0,1) == 0 ' 'else \'tails\'; print(result)" | tee /tmp/output'], file_outputs={'output': '/tmp/output'} ) def print_op(msg): """Print a message.""" return dsl.ContainerOp( name='Print', image='alpine:3.6', command=['echo', msg], ) @dsl._component.graph_component def flip_component(flip_result, maxVal, my_pipe_param): with dsl.Condition(flip_result == 'heads'): print_flip = print_op(flip_result) flipA = flip_coin_op().after(print_flip) loop_args = [{'a': 1, 'b': 2}, {'a': 10, 'b': 20}] with dsl.ParallelFor(loop_args) as item: op1 = dsl.ContainerOp( name="my-in-coop1", image="library/bash:4.4.23", command=["sh", "-c"], arguments=["echo op1 %s %s" % (item.a, my_pipe_param)], ) with dsl.ParallelFor([100, 200, 300]) as inner_item: op11 = dsl.ContainerOp( name="my-inner-inner-coop", image="library/bash:4.4.23", command=["sh", "-c"], arguments=["echo op1 %s %s %s" % (item.a, inner_item, my_pipe_param)], ) op2 = dsl.ContainerOp( name="my-in-coop2", image="library/bash:4.4.23", command=["sh", "-c"], arguments=["echo op2 %s" % item.b], ) flip_component(flipA.output, maxVal, my_pipe_param) @dsl.pipeline( name='recursion pipeline', description='shows how to use graph_component and recursion.' ) def flipcoin(maxVal=12, my_pipe_param: int = 10): flip_out = flip_coin_op() flip_loop = flip_component(flip_out.output, maxVal, my_pipe_param) print_op('cool, it is over. %s' % flip_out.output).after(flip_loop) if __name__ == '__main__': TektonCompiler().compile(flipcoin, __file__.replace('.py', '.yaml')) ``` _Originally posted by @Tomcli in https://github.com/kubeflow/kfp-tekton/issues/633#issuecomment-870790711_
Right now, all the parallel loops TaskSpec are injected to the main pipelinerun yaml. However, for parallel loops that are inside a recursion graph, we need to inject the loop taskSpec inside the recursion yaml instead of the main pipelinerun yaml. @pugangxa @ScrapCodes One of you can pick it up when you get time. /assign Sure, I can have a look.
2021-07-01T08:32:53
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-625
87dd3a728dffe8488847575c900edcf23b632628
diff --git a/sdk/python/kfp_tekton/compiler/_tekton_handler.py b/sdk/python/kfp_tekton/compiler/_tekton_handler.py index 78c3757304..72d157dac6 100644 --- a/sdk/python/kfp_tekton/compiler/_tekton_handler.py +++ b/sdk/python/kfp_tekton/compiler/_tekton_handler.py @@ -98,6 +98,16 @@ def _handle_tekton_custom_task(custom_task: dict, workflow: dict, recursive_task if dep_task not in custom_task[dependency['runAfter']]['task_list']: task_dependencies.append(dep_task) task['runAfter'] = task_dependencies + + # process recursive tasks to match parameters + for task in recursive_tasks: + recursive_graph = custom_task.get(task['taskRef']['name'], {}) + if recursive_graph: + for param in recursive_graph['spec']['params']: + recursive_params = [param['name'] for param in task['params']] + if param['name'] not in recursive_params: + task['params'].append({'name': param['name'], 'value': "$(params.%s)" % param['name']}) + # get custom tasks for custom_task_key in custom_task.keys(): denpendency_list = custom_task[custom_task_key]['spec'].get('runAfter', []) @@ -247,11 +257,23 @@ def _handle_tekton_custom_task(custom_task: dict, workflow: dict, recursive_task if nested_param['name'] == special_param['name']: nested_param['value'] = '$(params.%s)' % nested_param['name'] # need process parameters to replace results + custom_task_cr_task_names = [cr_task['name'] for cr_task in custom_task_cr['spec']['pipelineSpec']['tasks']] for nested_custom_task_param in nested_custom_task_spec['params']: if '$(tasks.' in nested_custom_task_param['value']: - nested_custom_task_spec = json.loads( - json.dumps(nested_custom_task_spec).replace(nested_custom_task_param['value'], - '$(params.%s)' % nested_custom_task_param['name'])) + param_results = re.findall('\$\(tasks.([^ \t\n.:,;\{\}]+).results.([^ \t\n.:,;\{\}]+)\)', + nested_custom_task_param['value']) + for param_result in param_results: + if param_result[0] not in custom_task_cr_task_names: + custom_task_cr_param_names = [p['name'] for p in custom_task_cr['spec']['pipelineSpec']['params']] + if nested_custom_task_param['name'] not in custom_task_cr_param_names: + for index, param in enumerate(nested_custom_task_spec['params']): + if nested_custom_task_param['name'] == param['name']: + nested_custom_task_spec['params'].pop(index) + break + else: + nested_custom_task_spec = json.loads( + json.dumps(nested_custom_task_spec).replace(nested_custom_task_param['value'], + '$(params.%s)' % nested_custom_task_param['name'])) # add nested custom task spec to main custom task custom_task_cr['spec']['pipelineSpec']['tasks'].append(nested_custom_task_spec) diff --git a/sdk/python/kfp_tekton/compiler/compiler.py b/sdk/python/kfp_tekton/compiler/compiler.py index 12e1b1dfbc..3b1b7a657e 100644 --- a/sdk/python/kfp_tekton/compiler/compiler.py +++ b/sdk/python/kfp_tekton/compiler/compiler.py @@ -873,10 +873,17 @@ def is_custom_task_output(operand) -> bool: if parent_group: if condition_refs.get(parent_group[-2], []): self.loops_pipeline[loop_task_key]['spec']['when'] = condition_refs.get(parent_group[-2], []) - for i, param in enumerate(self.loops_pipeline[loop_task_key]['spec']["params"]): - if param["value"] == condition_refs.get(parent_group[-2], [])[0]["input"]: - self.loops_pipeline[loop_task_key]['spec']["params"].pop(i) - break + # In nested recursive loop, the children of the loop pipeline can be both another loop + # and the self recursive loop. Thus, we cannot simply pop unnecessary params in one + # loop pipeline without verifying all the dependent parameters. Because nested recursion + # can have cycles, the DSL DAG may not represent the full view of all the dependent parameters. + # TODO: 1. Break any cycle in the nested recursion so it can represent as an acyclic graph. + # 2. Once the graph is acyclic, check all the children parameters in the loop_task + # and pop the unnecessary parameters using the below logic. + # for i, param in enumerate(self.loops_pipeline[loop_task_key]['spec']["params"]): + # if param["value"] == condition_refs.get(parent_group[-2], [])[0]["input"]: + # self.loops_pipeline[loop_task_key]['spec']["params"].pop(i) + # break # process input parameters from upstream tasks pipeline_param_names = [p['name'] for p in params]
Recursion-in-recursion passes task results as params in nested call /kind bug **What steps did you take and what happened:** double_recursion_dep.py: ```python from typing import List from kfp import dsl from kfp.components import load_component_from_text from kfp_tekton.tekton import CEL_ConditionOp PrintOp = load_component_from_text(""" name: print inputs: - name: msg outputs: - name: stdout implementation: container: image: alpine:3.6 command: - concat: - "echo " - { inputValue: msg } """) class CEL_Condition(dsl.Condition): def __init__(self, pred: str, name: str = None): super().__init__(CEL_ConditionOp(pred).output == 'true', name) def CEL_ExprOp(expr: str): return CEL_ConditionOp(expr) @dsl.pipeline("double-recursion test") def double_recursion_test(array: List[int] = [3,1,4,9,2]): @dsl.graph_component def recur_a(i: int, li: List[int]): @dsl.graph_component def recur_b(j: int, until_b: int): print_op = PrintOp(f"Iter A: {i}, B: {j}") incr_j = CEL_ExprOp(f"{j} + 1").after(print_op).output with CEL_Condition(f"{incr_j} < {until_b}"): recur_b(incr_j, until_b) start_b = CEL_ExprOp("0").output end_b = CEL_ExprOp(f"{array}[{i}]").output with CEL_Condition(f"{start_b} < {end_b}"): b = recur_b(start_b, end_b) incr_i = CEL_ExprOp(f"{i} + 1").after(b).output with CEL_Condition(f"{incr_i} < size( {array} )"): recur_a(incr_i, array) start_a = CEL_ExprOp("0").output with CEL_Condition(f"{start_a} < size( {array} )"): recur_a(start_a, array) if __name__ == '__main__': from kfp_tekton.compiler import TektonCompiler as Compiler Compiler().compile(double_recursion_test, __file__.replace('.py', '.yaml')) ``` double_recursion_dep.yaml: ``` (...) spec: params: - name: array value: '[3, 1, 4, 9, 2]' pipelineSpec: params: - name: array default: '[3, 1, 4, 9, 2]' tasks: - name: condition-cel params: - name: outcome value: '0' taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL - name: condition-cel-2 params: - name: outcome value: $(tasks.condition-cel.results.outcome) < size( $(params.array) ) taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL - name: double-recursion-test-fe322-graph-recur-a-2 taskRef: apiVersion: custom.tekton.dev/v1alpha1 kind: PipelineLoop name: double-recursion-test-fe322-graph-recur-a-2 params: - name: array value: $(params.array) - name: condition-cel-outcome value: $(tasks.condition-cel.results.outcome) - name: just_one_iteration value: - '1' when: - input: $(tasks.condition-cel-2.results.outcome) operator: in values: - "true" timeout: 0s ``` double_recursion_dep_pipelineloop_cr1.yaml: ``` apiVersion: custom.tekton.dev/v1alpha1 kind: PipelineLoop metadata: name: double-recursion-test-fe322-graph-recur-a-2 spec: pipelineSpec: params: - name: array type: string - name: condition-cel-outcome type: string - name: just_one_iteration type: string tasks: - name: condition-cel-3 params: - name: outcome value: '0' taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL - name: condition-cel-4 params: - name: outcome value: $(params.array)[$(params.condition-cel-outcome)] taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL - name: condition-cel-5 params: - name: outcome value: $(tasks.condition-cel-3.results.outcome) < $(tasks.condition-cel-4.results.outcome) taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL - name: condition-cel-8 params: - name: outcome value: $(params.condition-cel-outcome) + 1 taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL runAfter: - double-recursion-test-fe322-graph-recur-b-4 - name: condition-cel-9 params: - name: outcome value: $(tasks.condition-cel-8.results.outcome) < size( $(params.array) ) taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL - name: recur-a taskRef: apiVersion: custom.tekton.dev/v1alpha1 kind: PipelineLoop name: double-recursion-test-fe322-graph-recur-a-2 params: - name: just_one_iteration value: - '1' - name: condition-cel-outcome value: $(tasks.condition-cel-8.results.outcome) - name: array value: $(params.array) when: - input: $(tasks.condition-cel-9.results.outcome) operator: in values: - "true" - name: double-recursion-test-fe322-graph-recur-b-4 taskRef: apiVersion: custom.tekton.dev/v1alpha1 kind: PipelineLoop name: double-recursion-test-fe322-graph-recur-b-4 params: - name: condition-cel-2-outcome value: $(params.condition-cel-2-outcome) - name: condition-cel-3-outcome value: $(params.condition-cel-3-outcome) - name: condition-cel-4-outcome value: $(params.condition-cel-4-outcome) - name: condition-cel-outcome value: $(params.condition-cel-outcome) - name: just_one_iteration value: - '1' when: - input: $(tasks.condition-cel-5.results.outcome) operator: in values: - "true" iterateParam: just_one_iteration ``` double_recursion_dep_pipelineloop_cr2.yaml: ``` apiVersion: custom.tekton.dev/v1alpha1 kind: PipelineLoop metadata: name: double-recursion-test-fe322-graph-recur-b-4 spec: pipelineSpec: params: - name: just_one_iteration type: string - name: condition-cel-3-outcome type: string - name: condition-cel-outcome type: string - name: condition-cel-2-outcome type: string - name: condition-cel-4-outcome type: string tasks: - name: print params: - name: condition-cel-3-outcome value: $(params.condition-cel-3-outcome) - name: condition-cel-outcome value: $(params.condition-cel-outcome) taskSpec: steps: - name: main command: - 'echo Iter A: $(inputs.params.condition-cel-outcome), B: $(inputs.params.condition-cel-3-outcome)' image: alpine:3.6 params: - name: condition-cel-3-outcome type: string - name: condition-cel-outcome type: string metadata: labels: pipelines.kubeflow.org/pipelinename: '' pipelines.kubeflow.org/generation: '' pipelines.kubeflow.org/cache_enabled: "true" annotations: pipelines.kubeflow.org/component_spec: '{"implementation": {"container": {"command": [{"concat": ["echo ", {"inputValue": "msg"}]}], "image": "alpine:3.6"}}, "inputs": [{"name": "msg"}], "name": "print", "outputs": [{"name": "stdout"}]}' tekton.dev/template: '' timeout: 0s - name: condition-cel-6 params: - name: outcome value: $(params.condition-cel-3-outcome) + 1 taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL runAfter: - print - name: condition-cel-7 params: - name: outcome value: $(tasks.condition-cel-6.results.outcome) < $(params.condition-cel-4-outcome) taskRef: name: cel_condition apiVersion: cel.tekton.dev/v1alpha1 kind: CEL - name: recur-b taskRef: apiVersion: custom.tekton.dev/v1alpha1 kind: PipelineLoop name: double-recursion-test-fe322-graph-recur-b-4 params: - name: just_one_iteration value: - '1' - name: condition-cel-3-outcome value: $(tasks.condition-cel-6.results.outcome) - name: condition-cel-4-outcome value: $(params.condition-cel-4-outcome) when: - input: $(tasks.condition-cel-7.results.outcome) operator: in values: - "true" iterateParam: just_one_iteration ``` **What did you expect to happen:** Note how in outer loop, the output of condition-cel-4 (array indexer) is referred to as: * `$(tasks.condition-cel-4.results.outcome)` (correctly) in condition-cel-5 * `$(params.condition-cel-4-outcome)` (incorrectly) in inner loop call **Environment:** * Python Version (use `python --version`): 3.9.0 * SDK Version: sha 22354b364a9c3ec6ea01888679c4d8d174b0a80a
/assign
2021-06-16T18:27:35
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-592
7a6423edbcdcd3ed26ec694a92e11c5afeb37bdc
diff --git a/sdk/python/kfp_tekton/compiler/_tekton_handler.py b/sdk/python/kfp_tekton/compiler/_tekton_handler.py index bbced1089b..b77b976d5c 100644 --- a/sdk/python/kfp_tekton/compiler/_tekton_handler.py +++ b/sdk/python/kfp_tekton/compiler/_tekton_handler.py @@ -153,6 +153,10 @@ def _handle_tekton_custom_task(custom_task: dict, workflow: dict, recursive_task # add loop special filed custom_task_cr['kind'] = 'PipelineLoop' + if custom_task[custom_task_key]['spec'].get('parallelism') is not None: + custom_task_cr['spec']['parallelism'] = custom_task[custom_task_key]['spec']['parallelism'] + # remove from pipeline run spec + del custom_task[custom_task_key]['spec']['parallelism'] custom_task_cr['spec']['iterateParam'] = custom_task[custom_task_key]['loop_args'] for custom_task_param in custom_task[custom_task_key]['spec']['params']: if custom_task_param['name'] != custom_task[custom_task_key]['loop_args'] and '$(tasks.' in custom_task_param['value']: diff --git a/sdk/python/kfp_tekton/compiler/compiler.py b/sdk/python/kfp_tekton/compiler/compiler.py index dcc36e160a..8c28ae9667 100644 --- a/sdk/python/kfp_tekton/compiler/compiler.py +++ b/sdk/python/kfp_tekton/compiler/compiler.py @@ -393,6 +393,8 @@ def _group_to_dag_template(self, group, inputs, outputs, dependencies, pipeline_ self.loops_pipeline[group_name]['spec']['params'].append({ 'name': param[0], 'value': '$(params.%s)' % param[0] }) + if sub_group.parallelism is not None: + self.loops_pipeline[group_name]['spec']['parallelism'] = sub_group.parallelism return template diff --git a/tekton-catalog/pipeline-loops/.gitignore b/tekton-catalog/pipeline-loops/.gitignore new file mode 100644 index 0000000000..16e08bc2f3 --- /dev/null +++ b/tekton-catalog/pipeline-loops/.gitignore @@ -0,0 +1,2 @@ +.ko.yaml +
Support parallelism for pipeline loop /kind feature Introduce the parallism parameter to control the concurrency **Description:** [A clear and concise description of what your proposal. What problem does it solve?] Before we have already implemented loop, but all the pipeline can only run in sequential. We need support parallism parameter so that multiple pipelines can be started at once with one loop arg for each one.
/assign I will do it after the any-sequencer enhancement. Spent some time on the any-sequencer and loop issues, will start working on this.
2021-05-19T05:46:14
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-589
1bf5aa5d138cdef42cacdc7f2474ae2d107b81dc
diff --git a/tekton-catalog/pipeline-loops/README.md b/tekton-catalog/pipeline-loops/README.md index 5162cd9013..2832fb2958 100644 --- a/tekton-catalog/pipeline-loops/README.md +++ b/tekton-catalog/pipeline-loops/README.md @@ -31,6 +31,8 @@ - Install pipelineloop controller `kubectl apply -f config/` +# Parallelism +`Parallelism` is to define the number of pipelineruns can be created at the same time. It must be eqaul to or bigger than 1. If it's not set then the default value will be 1. If it's bigger than the total iterations in the loop then the number will be total iterations. # Verification - check controller and the webhook. `kubectl get po -n tekton-pipelines` diff --git a/tekton-catalog/pipeline-loops/examples/loop-example-with-parallelism.yaml b/tekton-catalog/pipeline-loops/examples/loop-example-with-parallelism.yaml new file mode 100644 index 0000000000..8351fd597b --- /dev/null +++ b/tekton-catalog/pipeline-loops/examples/loop-example-with-parallelism.yaml @@ -0,0 +1,72 @@ +apiVersion: custom.tekton.dev/v1alpha1 +kind: PipelineLoop +metadata: + name: pipelineloop +spec: + pipelineSpec: + params: + - name: message + type: string + tasks: + - name: echo-loop-task + params: + - name: message + value: $(params.message) + taskSpec: + params: + - name: message + type: string + steps: + - name: echo + image: ubuntu + imagePullPolicy: IfNotPresent + script: | + #!/usr/bin/env bash + echo "$(params.message)" + iterateParam: message + parallelism: 2 +--- +apiVersion: tekton.dev/v1beta1 +kind: PipelineRun +metadata: + annotations: + tekton.dev/example-loop-pipeline: '{"spec":{"pipelineSpec":{"params":[{"name":"message","type":"string"}],"tasks":[{"name":"echo-loop-task","params":[{"name":"message","value":"$(params.message)"}],"taskSpec":{"params":[{"name":"message","type":"string"}],"steps":[{"name":"echo","image":"ubuntu","imagePullPolicy":"IfNotPresent","script":"#!/usr/bin/env bash\necho \"$(params.message)\"\n"}]}}]},"iterateParam":"message"}}' + name: para-loop-example + labels: + mylooplabels: mylooplabels +spec: + pipelineSpec: + tasks: + - name: first-task + taskSpec: + steps: + - name: echo + image: ubuntu + imagePullPolicy: IfNotPresent + script: | + #!/usr/bin/env bash + echo "I am the first task before the loop task" + - name: loop-task + runAfter: + - first-task + params: + - name: message + value: + - I am the first one + - I am the second one + - I am the third one + taskRef: + apiVersion: custom.tekton.dev/v1alpha1 + kind: PipelineLoop + name: pipelineloop + - name: last-task + runAfter: + - loop-task + taskSpec: + steps: + - name: echo + image: ubuntu + imagePullPolicy: IfNotPresent + script: | + #!/usr/bin/env bash + echo "I am the last task after the loop task" diff --git a/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_defaults.go b/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_defaults.go index b730ff2dd1..9cbe32e539 100644 --- a/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_defaults.go +++ b/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_defaults.go @@ -18,6 +18,8 @@ package v1alpha1 import ( "context" + "os" + "strconv" "knative.dev/pkg/apis" ) @@ -31,4 +33,19 @@ func (tl *PipelineLoop) SetDefaults(ctx context.Context) { // SetDefaults set any defaults for the PipelineLoop spec func (tls *PipelineLoopSpec) SetDefaults(ctx context.Context) { + if tls.Parallelism == 0 { + parallelism := os.Getenv("LOOP_PARALLELISM") + if parallelism == "" { + tls.Parallelism = 1 + return + } + i, err := strconv.Atoi(parallelism) + if err != nil { + // fall back to default 1 + tls.Parallelism = 1 + return + } else { + tls.Parallelism = i + } + } } diff --git a/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_types.go b/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_types.go index 4d81e2692e..fd955a1ea1 100644 --- a/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_types.go +++ b/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_types.go @@ -57,6 +57,10 @@ type PipelineLoopSpec struct { // +optional Timeout *metav1.Duration `json:"timeout,omitempty"` + // Parallelism represents how many pipelines can be triggered simutaniously by the loop. + // +optional + Parallelism int `json:"parallelism,omitempty"` + // Retries represents how many times a task should be retried in case of task failure. // +optional Retries int `json:"retries,omitempty"` @@ -113,12 +117,16 @@ func (t PipelineLoopRunReason) String() string { type PipelineLoopRunStatus struct { // PipelineLoopSpec contains the exact spec used to instantiate the Run PipelineLoopSpec *PipelineLoopSpec `json:"pipelineLoopSpec,omitempty"` + // current running pipelinerun number + // +optional + CurrentRunning int `json:"currentRunning,omitempty"` // map of PipelineLoopPipelineRunStatus with the PipelineRun name as the key // +optional PipelineRuns map[string]*PipelineLoopPipelineRunStatus `json:"pipelineRuns,omitempty"` } -// PipelineLoopPipelineRunStatus contains the iteration number for a PipelineRun and the PipelineRun's Status +// PipelineLoopPipelineRunStatus contains the iteration number for a PipelineRun, +// current running pipeline number, and the PipelineRun's Status type PipelineLoopPipelineRunStatus struct { // iteration number Iteration int `json:"iteration,omitempty"` diff --git a/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_validation.go b/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_validation.go index ccdc0b6746..4db3132a37 100644 --- a/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_validation.go +++ b/tekton-catalog/pipeline-loops/pkg/apis/pipelineloop/v1alpha1/pipelineloop_validation.go @@ -37,6 +37,9 @@ func (tl *PipelineLoop) Validate(ctx context.Context) *apis.FieldError { // Validate PipelineLoopSpec func (tls *PipelineLoopSpec) Validate(ctx context.Context) *apis.FieldError { + if tls.Parallelism < 1 { + return apis.ErrInvalidValue(tls.Parallelism, "spec.Parallelism") + } // Validate Task reference or inline task spec. if err := validateTask(ctx, tls); err != nil { return err diff --git a/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go b/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go index 9b2daca720..2c363a75ef 100644 --- a/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go +++ b/tekton-catalog/pipeline-loops/pkg/reconciler/pipelinelooprun/pipelinelooprun.go @@ -184,83 +184,64 @@ func (c *Reconciler) reconcile(ctx context.Context, run *v1alpha1.Run, status *p } // Update status of PipelineRuns. Return the PipelineRun representing the highest loop iteration. - highestIteration, highestIterationPr, err := c.updatePipelineRunStatus(logger, run, status) + highestIteration, currentRunningPrs, failedPrs, err := c.updatePipelineRunStatus(logger, run, status) if err != nil { return fmt.Errorf("error updating PipelineRun status for Run %s/%s: %w", run.Namespace, run.Name, err) } - // Check the status of the PipelineRun for the highest iteration. - if highestIterationPr != nil { - // If it's not done, wait for it to finish or cancel it if the run is cancelled. - if !highestIterationPr.IsDone() { - if run.IsCancelled() { - logger.Infof("Run %s/%s is cancelled. Cancelling PipelineRun %s.", run.Namespace, run.Name, highestIterationPr.Name) - b, err := getCancelPatch() - if err != nil { - return fmt.Errorf("Failed to make patch to cancel PipelineRun %s: %v", highestIterationPr.Name, err) - } - if _, err := c.pipelineClientSet.TektonV1beta1().PipelineRuns(run.Namespace).Patch(ctx, highestIterationPr.Name, types.JSONPatchType, b, metav1.PatchOptions{}); err != nil { - run.Status.MarkRunRunning(pipelineloopv1alpha1.PipelineLoopRunReasonCouldntCancel.String(), - "Failed to patch PipelineRun `%s` with cancellation: %v", highestIterationPr.Name, err) - return nil - } - // Update status. It is still running until the PipelineRun is actually cancelled. - run.Status.MarkRunRunning(pipelineloopv1alpha1.PipelineLoopRunReasonRunning.String(), - "Cancelling PipelineRun %s", highestIterationPr.Name) + // Run is cancelled, just cancel all the running instance and return + if run.IsCancelled() { + if len(failedPrs) > 0 { + run.Status.MarkRunFailed(pipelineloopv1alpha1.PipelineLoopRunReasonCancelled.String(), + "Run %s/%s was cancelled", + run.Namespace, run.Name) + } + for _, currentRunningPr := range currentRunningPrs { + logger.Infof("Run %s/%s is cancelled. Cancelling PipelineRun %s.", run.Namespace, run.Name, currentRunningPr.Name) + b, err := getCancelPatch() + if err != nil { + return fmt.Errorf("Failed to make patch to cancel PipelineRun %s: %v", currentRunningPr.Name, err) + } + if _, err := c.pipelineClientSet.TektonV1beta1().PipelineRuns(run.Namespace).Patch(ctx, currentRunningPr.Name, types.JSONPatchType, b, metav1.PatchOptions{}); err != nil { + run.Status.MarkRunRunning(pipelineloopv1alpha1.PipelineLoopRunReasonCouldntCancel.String(), + "Failed to patch PipelineRun `%s` with cancellation: %v", currentRunningPr.Name, err) return nil } - run.Status.MarkRunRunning(pipelineloopv1alpha1.PipelineLoopRunReasonRunning.String(), - "Iterations completed: %d", highestIteration-1) - return nil } + return nil + } - if !highestIterationPr.Status.GetCondition(apis.ConditionSucceeded).IsTrue() { - if run.IsCancelled() { - run.Status.MarkRunFailed(pipelineloopv1alpha1.PipelineLoopRunReasonCancelled.String(), - "Run %s/%s was cancelled", - run.Namespace, run.Name) - } else { - run.Status.MarkRunFailed(pipelineloopv1alpha1.PipelineLoopRunReasonFailed.String(), - "PipelineRun %s has failed", highestIterationPr.Name) - } - return nil - } + // Run may be marked succeeded already by updatePipelineRunStatus + if run.IsSuccessful() { + return nil + } - // Mark run successful if the condition are met. - // if the last loop task is skipped, but the highestIterationPr successed. Mark run success. - // lastLoopTask := highestIterationPr.ObjectMeta.Annotations["last-loop-task"] - lastLoopTask := "" - for key, val := range run.ObjectMeta.Labels { - if key == "last-loop-task" { - lastLoopTask = val - } - } - if lastLoopTask != "" { - skippedTaskList := highestIterationPr.Status.SkippedTasks - for _, task := range skippedTaskList { - if task.Name == lastLoopTask { - // Mark run successful and stop the loop pipelinerun - run.Status.MarkRunSucceeded(pipelineloopv1alpha1.PipelineLoopRunReasonSucceeded.String(), - "PipelineRuns completed successfully with the conditions are met") - run.Status.Results = []runv1alpha1.RunResult{{ - Name: "condition", - Value: "pass", - }} - return nil - } - } - } + // Check the status of the PipelineRun for the highest iteration. + for _, failedPr := range failedPrs { + run.Status.MarkRunFailed(pipelineloopv1alpha1.PipelineLoopRunReasonFailed.String(), + "PipelineRun %s has failed", failedPr.Name) + return nil } + // Mark run status Running + run.Status.MarkRunRunning(pipelineloopv1alpha1.PipelineLoopRunReasonRunning.String(), + "Iterations completed: %d", highestIteration-len(currentRunningPrs)) + // Move on to the next iteration (or the first iteration if there was no PipelineRun). // Check if the Run is done. nextIteration := highestIteration + 1 if nextIteration > totalIterations { + // Still running which we already marked, just waiting + if len(currentRunningPrs) > 0 { + logger.Infof("Already started all pipelineruns for the loop, totally %d pipelineruns, waiting for complete.", totalIterations) + return nil + } + // All task finished run.Status.MarkRunSucceeded(pipelineloopv1alpha1.PipelineLoopRunReasonSucceeded.String(), "All PipelineRuns completed successfully") run.Status.Results = []runv1alpha1.RunResult{{ Name: "condition", - Value: "fail", + Value: "succeeded", }} return nil } @@ -271,20 +252,35 @@ func (c *Reconciler) reconcile(ctx context.Context, run *v1alpha1.Run, status *p run.Namespace, run.Name) return nil } - - // Create a PipelineRun to run this iteration. - pr, err := c.createPipelineRun(ctx, logger, pipelineLoopSpec, run, nextIteration) - if err != nil { - return fmt.Errorf("error creating PipelineRun from Run %s: %w", run.Name, err) + actualParallelism := 1 + // if Parallelism is bigger then totalIterations means there's no limit + if status.PipelineLoopSpec.Parallelism > totalIterations { + actualParallelism = totalIterations + } else if status.PipelineLoopSpec.Parallelism > 0 { + actualParallelism = status.PipelineLoopSpec.Parallelism } - - status.PipelineRuns[pr.Name] = &pipelineloopv1alpha1.PipelineLoopPipelineRunStatus{ - Iteration: nextIteration, - Status: &pr.Status, + if len(currentRunningPrs) >= actualParallelism { + logger.Infof("Currently %d pipelinerun started, meet parallelism %d, waiting...", len(currentRunningPrs), actualParallelism) + return nil } - run.Status.MarkRunRunning(pipelineloopv1alpha1.PipelineLoopRunReasonRunning.String(), - "Iterations completed: %d", highestIteration) + // Create PipelineRun to run this iteration based on parallelism + for i := 0; i < actualParallelism-len(currentRunningPrs); i++ { + pr, err := c.createPipelineRun(ctx, logger, pipelineLoopSpec, run, nextIteration) + if err != nil { + return fmt.Errorf("error creating PipelineRun from Run %s: %w", run.Name, err) + } + + status.PipelineRuns[pr.Name] = &pipelineloopv1alpha1.PipelineLoopPipelineRunStatus{ + Iteration: nextIteration, + Status: &pr.Status, + } + nextIteration++ + if nextIteration > totalIterations { + logger.Infof("Started all pipelineruns for the loop, totally %d pipelineruns.", totalIterations) + return nil + } + } return nil } @@ -387,20 +383,22 @@ func (c *Reconciler) updateLabelsAndAnnotations(ctx context.Context, run *v1alph return nil } -func (c *Reconciler) updatePipelineRunStatus(logger *zap.SugaredLogger, run *v1alpha1.Run, status *pipelineloopv1alpha1.PipelineLoopRunStatus) (int, *v1beta1.PipelineRun, error) { +func (c *Reconciler) updatePipelineRunStatus(logger *zap.SugaredLogger, run *v1alpha1.Run, status *pipelineloopv1alpha1.PipelineLoopRunStatus) (int, []*v1beta1.PipelineRun, []*v1beta1.PipelineRun, error) { highestIteration := 0 - var highestIterationPr *v1beta1.PipelineRun = nil + var currentRunningPrs []*v1beta1.PipelineRun + var failedPrs []*v1beta1.PipelineRun if status.PipelineRuns == nil { status.PipelineRuns = make(map[string]*pipelineloopv1alpha1.PipelineLoopPipelineRunStatus) } pipelineRunLabels := getPipelineRunLabels(run, "") pipelineRuns, err := c.pipelineRunLister.PipelineRuns(run.Namespace).List(labels.SelectorFromSet(pipelineRunLabels)) if err != nil { - return 0, nil, fmt.Errorf("could not list PipelineRuns %#v", err) + return 0, nil, nil, fmt.Errorf("could not list PipelineRuns %#v", err) } if pipelineRuns == nil || len(pipelineRuns) == 0 { - return 0, nil, nil + return 0, nil, nil, nil } + status.CurrentRunning = 0 for _, pr := range pipelineRuns { lbls := pr.GetLabels() iterationStr := lbls[pipelineloop.GroupName+pipelineLoopIterationLabelKey] @@ -409,18 +407,50 @@ func (c *Reconciler) updatePipelineRunStatus(logger *zap.SugaredLogger, run *v1a run.Status.MarkRunFailed(pipelineloopv1alpha1.PipelineLoopRunReasonFailedValidation.String(), "Error converting iteration number in PipelineRun %s: %#v", pr.Name, err) logger.Errorf("Error converting iteration number in PipelineRun %s: %#v", pr.Name, err) - return 0, nil, nil + return 0, nil, nil, nil + } + // when we just create pr in a forloop, the started time may be empty + if !pr.IsDone() { + status.CurrentRunning++ + currentRunningPrs = append(currentRunningPrs, pr) } + if pr.IsDone() && !pr.Status.GetCondition(apis.ConditionSucceeded).IsTrue() { + failedPrs = append(failedPrs, pr) + } + + // Mark run successful if the condition are met. + // if the last loop task is skipped, but the highestIterationPr successed. Mark run success. + // lastLoopTask := highestIterationPr.ObjectMeta.Annotations["last-loop-task"] + lastLoopTask := "" + for key, val := range run.ObjectMeta.Labels { + if key == "last-loop-task" { + lastLoopTask = val + } + } + if lastLoopTask != "" { + skippedTaskList := pr.Status.SkippedTasks + for _, task := range skippedTaskList { + if task.Name == lastLoopTask { + // Mark run successful and stop the loop pipelinerun + run.Status.MarkRunSucceeded(pipelineloopv1alpha1.PipelineLoopRunReasonSucceeded.String(), + "PipelineRuns completed successfully with the conditions are met") + run.Status.Results = []runv1alpha1.RunResult{{ + Name: "condition", + Value: "pass", + }} + } + } + } + status.PipelineRuns[pr.Name] = &pipelineloopv1alpha1.PipelineLoopPipelineRunStatus{ Iteration: iteration, Status: &pr.Status, } if iteration > highestIteration { highestIteration = iteration - highestIterationPr = pr } } - return highestIteration, highestIterationPr, nil + return highestIteration, currentRunningPrs, failedPrs, nil } func getCancelPatch() ([]byte, error) {
Support parallelism for pipeline loop /kind feature Introduce the parallism parameter to control the concurrency **Description:** [A clear and concise description of what your proposal. What problem does it solve?] Before we have already implemented loop, but all the pipeline can only run in sequential. We need support parallism parameter so that multiple pipelines can be started at once with one loop arg for each one.
/assign I will do it after the any-sequencer enhancement. Spent some time on the any-sequencer and loop issues, will start working on this.
2021-05-17T02:45:06
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-572
649152cddddff0137c0c9d1e48012e7d7123dc8d
diff --git a/manifests/kustomize/base/pipeline/kfp-pipeline-config.yaml b/manifests/kustomize/base/pipeline/kfp-pipeline-config.yaml index 2cc5013151..50e4da4f1f 100644 --- a/manifests/kustomize/base/pipeline/kfp-pipeline-config.yaml +++ b/manifests/kustomize/base/pipeline/kfp-pipeline-config.yaml @@ -14,8 +14,12 @@ data: artifact_script: |- #!/usr/bin/env sh push_artifact() { - tar -cvzf $1.tgz $2 - mc cp $1.tgz storage/$ARTIFACT_BUCKET/artifacts/$PIPELINERUN/$PIPELINETASK/$1.tgz + if [ -f "$2" ]; then + tar -cvzf $1.tgz $2 + mc cp $1.tgz storage/$ARTIFACT_BUCKET/artifacts/$PIPELINERUN/$PIPELINETASK/$1.tgz + else + echo "$2 file does not exist. Skip artifact tracking for $1" + fi } push_log() { cat /var/log/containers/$PODNAME*$NAMESPACE*step-main*.log > step-main.log diff --git a/sdk/python/kfp_tekton/compiler/_op_to_template.py b/sdk/python/kfp_tekton/compiler/_op_to_template.py index 7896a04003..293df5de78 100644 --- a/sdk/python/kfp_tekton/compiler/_op_to_template.py +++ b/sdk/python/kfp_tekton/compiler/_op_to_template.py @@ -25,6 +25,10 @@ from kfp.dsl._container_op import BaseOp from kfp_tekton.compiler import __tekton_api_version__ as tekton_api_version +from .. import __version__ + + +RESOURCE_OP_IMAGE = ":".join(["aipipeline/kubectl-wrapper", __version__]) def _get_base_step(name: str): @@ -102,7 +106,7 @@ def _get_resourceOp_template(op: BaseOp, { # This image is hosted by the kfp-tekton maintainers # Source code: https://github.com/kubeflow/kfp-tekton/tree/master/tekton-catalog/kubectl-wrapper - "default": "index.docker.io/aipipeline/kubeclient:v0.0.2", + "default": RESOURCE_OP_IMAGE, "description": "Kubectl wrapper image", "name": "image", "type": "string" diff --git a/tekton-catalog/kubectl-wrapper/cmd/client/main.go b/tekton-catalog/kubectl-wrapper/cmd/client/main.go index a046a341bc..f89c73b131 100644 --- a/tekton-catalog/kubectl-wrapper/cmd/client/main.go +++ b/tekton-catalog/kubectl-wrapper/cmd/client/main.go @@ -69,12 +69,6 @@ func main() { } } - // cmd := exec.Command("/bin/sh", "/builder/kubectl.bash") - // _, err = cmd.Output() - // if err != nil { - // log.Errorf("Initialize script failed: %+v:", err) - // } - isDelete := action == "delete" resourceNamespace, resourceName, err := execResource(action, mergeStrategy) if err != nil { diff --git a/tekton-catalog/kubectl-wrapper/deploy/kubectl-deploy.yaml b/tekton-catalog/kubectl-wrapper/deploy/kubectl-deploy.yaml index 6020739e5e..7cf5fbe607 100644 --- a/tekton-catalog/kubectl-wrapper/deploy/kubectl-deploy.yaml +++ b/tekton-catalog/kubectl-wrapper/deploy/kubectl-deploy.yaml @@ -25,7 +25,7 @@ spec: default: "false" description: Enable set owner reference for created resource. - name: image - default: index.docker.io/aipipeline/kubeclient:v0.0.2 # it is huge + default: aipipeline/kubeclient:0.8.0 # it is huge description: Kubectl wrapper image steps: - name: kubeconfig
Regenerate E2E test logs for release 0.8.0 **Description of your changes:** Regenerate end-to-end test logs for release v0.8.0 **Environment tested:** * Python Version (use `python --version`): 3.9 * Tekton Version (use `tkn version`): 0.21.0 * Kubernetes Version (use `kubectl version`): 1.18 * OS (e.g. from `/etc/os-release`): MacOS Cataline /cc @Tomcli
```Bash $ git show --pretty="" --name-only -1 | grep ".log" | sort | while read f; do echo -e "\n=== [${f}](https://github.com/kubeflow/kfp-tekton/blob/b34358f/${f}) ===\n"; cat $f | grep -iE "error|fail"; done ``` === [sdk/python/tests/compiler/testdata/any_sequencer.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/any_sequencer.log) === [flipcoin : main] 2021/04/23 20:01:14 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/artifact_passing_using_volume.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/artifact_passing_using_volume.log) === [processor : copy-artifacts] tar: error exit delayed from previous errors === [sdk/python/tests/compiler/testdata/basic_no_decorator.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/basic_no_decorator.log) === [get-frequent : main] 2021/04/23 20:08:59 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/big_data_passing.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/big_data_passing.log) === [gen-params : copy-artifacts] tar: error exit delayed from previous errors === [sdk/python/tests/compiler/testdata/cache.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/cache.log) === [cache-enabled : main] 2021/04/23 20:12:04 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/compose.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/compose.log) === === [sdk/python/tests/compiler/testdata/condition.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/condition.log) === [flip : main] 2021/04/23 20:15:02 Error executing command: fork/exec /bin/bash: no such file or directory [flip3 : main] 2021/04/23 20:15:03 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/condition_custom_task.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/condition_custom_task.log) === [flip-coin : main] 2021/04/23 20:15:25 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/condition_dependency.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/condition_dependency.log) === [flip : main] 2021/04/23 20:15:47 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/conditions_and_loops.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/conditions_and_loops.log) === [produce-numbers : main] 2021/04/23 20:16:04 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/conditions_with_global_params.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/conditions_with_global_params.log) === [add-numbers : main] 2021/04/23 20:16:21 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/create_component_from_func.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/create_component_from_func.log) === === [sdk/python/tests/compiler/testdata/exit_handler.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/exit_handler.log) === [gcs-download : main] 2021/04/23 20:19:12 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/hidden_output_file.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/hidden_output_file.log) === [download-file : main] 2021/04/23 20:19:39 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/imagepullsecrets.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/imagepullsecrets.log) === [get-frequent : main] 2021/04/23 20:19:56 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/load_from_yaml.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/load_from_yaml.log) === [busybox : copy-artifacts] tar: error exit delayed from previous errors === [sdk/python/tests/compiler/testdata/long_param_name.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/long_param_name.log) === [gcs-downloadgcs-downloadgcs-downloadgcs-download : main] 2021/04/23 20:21:34 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/long_pipeline_name.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/long_pipeline_name.log) === === [sdk/python/tests/compiler/testdata/loop_over_lightweight_output.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/loop_over_lightweight_output.log) === [produce-list : main] 2021/04/23 20:22:14 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/loop_static.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/loop_static.log) === === [sdk/python/tests/compiler/testdata/opsgroups.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/opsgroups.log) === === [sdk/python/tests/compiler/testdata/parallel_join.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/parallel_join.log) === [gcs-download : main] 2021/04/23 20:23:44 Error executing command: fork/exec /bin/bash: no such file or directory [gcs-download-2 : main] 2021/04/23 20:23:44 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/parallel_join_with_argo_vars.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/parallel_join_with_argo_vars.log) === [gcs-download : main] 2021/04/23 20:24:06 Error executing command: fork/exec /bin/bash: no such file or directory [gcs-download-2 : main] 2021/04/23 20:24:06 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/parallelfor_item_argument_resolving.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/parallelfor_item_argument_resolving.log) === [produce-str : main] 2021/04/23 20:24:28 Error executing command: fork/exec /bin/bash: no such file or directory [produce-list-of-strings : main] 2021/04/23 20:24:29 Error executing command: fork/exec /bin/bash: no such file or directory [produce-list-of-ints : main] 2021/04/23 20:24:29 Error executing command: fork/exec /bin/bash: no such file or directory [produce-list-of-dicts : main] 2021/04/23 20:24:29 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/pipelineparams.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/pipelineparams.log) === [download : main] 2021/04/23 20:25:16 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/recur_cond.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/recur_cond.log) === === [sdk/python/tests/compiler/testdata/recursion_while.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/recursion_while.log) === [flip-coin : main] 2021/04/23 20:25:55 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/resourceop_basic.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/resourceop_basic.log) === [test-step : main] 2021/04/23 20:26:18 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/sidecar.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/sidecar.log) === [download : main] 2021/04/23 20:27:33 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/tekton_custom_task.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/tekton_custom_task.log) === [flip-coin : main] 2021/04/23 20:27:50 Error executing command: fork/exec /bin/bash: no such file or directory [flip-coin-2 : main] 2021/04/23 20:27:51 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/tekton_pipeline_conf.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/tekton_pipeline_conf.log) === === [sdk/python/tests/compiler/testdata/tekton_pipeline_variables.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/tekton_pipeline_variables.log) === === [sdk/python/tests/compiler/testdata/volume_op.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/volume_op.log) === [create-pvc : main] time="2021-04-23T20:28:56Z" level=error msg="Initialize script failed: exit status 2:" === [sdk/python/tests/compiler/testdata/withitem_multi_nested.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/withitem_multi_nested.log) === === [sdk/python/tests/compiler/testdata/withitem_nested.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/withitem_nested.log) === === [sdk/python/tests/compiler/testdata/withparam_global.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/withparam_global.log) === [my-out-cop0 : main] 2021/04/23 20:31:54 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/withparam_global_dict.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/withparam_global_dict.log) === [my-out-cop0 : main] 2021/04/23 20:32:18 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/withparam_output.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/withparam_output.log) === [my-out-cop0 : main] 2021/04/23 20:32:40 Error executing command: fork/exec /bin/bash: no such file or directory === [sdk/python/tests/compiler/testdata/withparam_output_dict.log](https://github.com/kubeflow/kfp-tekton/blob/b34358f/sdk/python/tests/compiler/testdata/withparam_output_dict.log) === [my-out-cop0 : main] 2021/04/23 20:32:58 Error executing command: fork/exec /bin/bash: no such file or directory @ckadner these pipelines we don't have to test e2e long_param_name.py - unit test, not using real container image. recur_cond.py - unit test, not using real container image. Also there are few examples using the experimental CEL custom task. You have to install them separately using golang ko ``` git clone https://github.com/tektoncd/experimental/ cd experimental/cel ko apply -f config/ ``` Thanks @Tomcli -- #567 appears to address the `Error executing command: fork/exec /bin/bash: no such file or directory` ### E2E tests succeeding with errors being logged - `artifact_passing_using_volume.log`: ``` 18: [processor : copy-artifacts] /tekton/scripts/script-1-ttdqk: line 15: workspaces.producer.path: not found 19: [processor : copy-artifacts] tar: /producer-Output-2: No such file or directory 20: [processor : copy-artifacts] tar: error exit delayed from previous errors ``` - `load_from_yaml.log`: ``` 4: [busybox : copy-artifacts] tar: /tekton/results/dummy-output-path: No such file or directory 5: [busybox : copy-artifacts] tar: error exit delayed from previous errors ``` - `volume_op.log`: ``` 1: [create-pvc : main] time="2021-04-23T20:28:56Z" level=error msg="Initialize script failed: exit status 2:" ``` - `katib.log` (just FYI, test ignored): ``` 3: [mnist-hpo : main] ERROR:root:Exception when create kubeflow.org/experiments: 404 page not found 17: [mnist-hpo : main] raise ValueError(errmsg("Extra data", s, end, len(s))) 18: [mnist-hpo : main] ValueError: Extra data: line 1 column 5 - line 2 column 1 (char 4 - 19) ``` ### Repeatedly failing end-to-end tests - `cond_recur.yaml` (I need to rebuild and deploy `CEL` controller) ``` Failed to create a workflow for (condition-and-recur-7371d): admission webhook\\"validation.webhook.pipeline.tekton.dev\\" denied the request: validation failed: non-existent variable in\\"$(params.condition-cel-status)\\": spec.pipelinespec.tasks[1].params[condition-cel-status]" ``` - `condition_custom_task.yaml` (I need to rebuild and deploy `CEL` controller) ``` Timeout after 8 minutes: Status: 'Running', expected: ['Succeeded', 'Completed'] ``` - `loop_static.yaml` ``` Status: Failed ``` - `recursion_while.yaml` ``` Timeout after 8 minutes: Status: 'Running', expected: ['Succeeded', 'Completed'] ``` - `tekton_custom_task.yaml` ``` Timeout after 8 minutes: Status: 'Running', expected: ['Succeeded', 'Completed'] ``` - `withitem_multi_nested.yaml` ``` Status: Failed ``` - `withitem_nested.yaml` ``` Timeout after 8 minutes: Status: 'Running', expected: ['Succeeded', 'Completed'] ``` - `withparam_output.yaml` ``` Timeout after 8 minutes: Status: 'Running', expected: ['Succeeded', 'Completed'] ``` ### K8s pod logs/errors - the tekton-pipelines-webhook pod is logging a lot of errors related to failed conversion of PipelineRun objects from `v1beta1` to `v1alpha1` - Tekton CEL controller ImagePullBackOff -- I probably need to rebuild and push image ``` tekton-cel-run cel-controller-8457cdc8f-jgjk9 0/1 ImagePullBackOff 0 44h ``` ``` $ kubectl describe pod -n tekton-cel-run cel-controller-8457cdc8f-jgjk9 Name: cel-controller-8457cdc8f-jgjk9 Namespace: tekton-cel-run Priority: 0 Node: 10.87.76.85/10.87.76.85 Start Time: Sat, 24 Apr 2021 14:03:59 -0700 Labels: app=cel-controller app.kubernetes.io/component=cel-controller app.kubernetes.io/instance=default app.kubernetes.io/name=cel-controller app.kubernetes.io/part-of=cel app.kubernetes.io/version=devel pod-template-hash=8457cdc8f Annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: false kubernetes.io/psp: ibm-privileged-psp Status: Pending IP: 172.30.122.42 IPs: IP: 172.30.122.42 Controlled By: ReplicaSet/cel-controller-8457cdc8f Containers: cel-controller: Container ID: Image: ko.local/controller-222c351d04b80e40378b28ffa1eb473f:f0d26ed15ddd168744bc98e768affc231a97323c59c263fb969419576e1899d0 Image ID: Port: <none> Host Port: <none> State: Waiting Reason: ImagePullBackOff Ready: False Restart Count: 0 Environment: SYSTEM_NAMESPACE: tekton-cel-run (v1:metadata.namespace) CONFIG_LOGGING_NAME: config-logging Mounts: /etc/config-logging from config-logging (rw) /var/run/secrets/kubernetes.io/serviceaccount from cel-controller-token-2cpdr (ro) Conditions: Type Status Initialized True Ready False ContainersReady False PodScheduled True Volumes: config-logging: Type: ConfigMap (a volume populated by a ConfigMap) Name: config-logging Optional: false cel-controller-token-2cpdr: Type: Secret (a volume populated by a Secret) SecretName: cel-controller-token-2cpdr Optional: false QoS Class: BestEffort Node-Selectors: <none> Tolerations: node.kubernetes.io/not-ready:NoExecute op=Exists for 600s node.kubernetes.io/unreachable:NoExecute op=Exists for 600s Events: Type Reason Age From Message ---- ------ ---- ---- ------- Warning Failed 14m (x12121 over 45h) kubelet Error: ImagePullBackOff Normal BackOff 4m44s (x12164 over 45h) kubelet Back-off pulling image "ko.local/controller-222c351d04b80e40378b28ffa1eb473f:f0d26ed15ddd168744bc98e768affc231a97323c59c263fb969419576e1899d0" ``` @ckadner pipeline not for runtime katib.log - (compiler test for katib variable, we don't maintain it to be running) cond_recur.yaml - (unit test for recursion under condition group, not a valid running example) @ckadner everything under `Repeatedly failing end-to-end tests` is for custom task. The loop custom task needs to be pre-defined before running the pipeline. Is it possible to do something like this? https://github.com/kubeflow/kfp-tekton/tree/master/samples/nested-loops#instructions For artifact_passing, load_from_yaml, and volume_op, I can run them on my cluster, but it takes too long because these pipelines need to provision volume dynamically. Katib and cond_recur is just unit test, we don't need to run them in e2e. @Tomcli -- I applied the loop CRDs and the CEL controller. I am down to two failing E2E test cases: ```Bash $ tkn pipelinerun -n kubeflow list | grep Failed tekton-custom-task-on-kubeflow-pipeline-c4b79 7 minutes ago 6 seconds Failed conditional-execution-pipeline-e54e0 9 minutes ago 5 seconds Failed $ tkn pipelinerun -n kubeflow logs tekton-custom-task-on-kubeflow-pipeline-c4b79 [flip-coin : main] heads [flip-coin-2 : main] heads Tasks Completed: 3 (Failed: 1, Cancelled 0), Skipped: 1 $ tkn pipelinerun -n kubeflow logs conditional-execution-pipeline-e54e0 [flip-coin : main] heads Tasks Completed: 2 (Failed: 1, Cancelled 0), Skipped: 8 ``` On the Kubeflow Pipelines dashboard, when I click on these Runs, I get these respective errors: `Error: failed to retrieve run: c4b79883-1ca6-4181-bda4-24f80616a6de. Click Details for more information.` `Error: failed to retrieve run: e54e027c-ce3f-4574-b783-1a943c225efe. Click Details for more information.` --- **I also still have these tests succeeding but with errors being logged:** - `artifact_passing_using_volume.log`: ``` 18: [processor : copy-artifacts] /tekton/scripts/script-1-ttdqk: line 15: workspaces.producer.path: not found 19: [processor : copy-artifacts] tar: /producer-Output-2: No such file or directory 20: [processor : copy-artifacts] tar: error exit delayed from previous errors ``` - `load_from_yaml.log`: ``` 4: [busybox : copy-artifacts] tar: /tekton/results/dummy-output-path: No such file or directory 5: [busybox : copy-artifacts] tar: error exit delayed from previous errors ``` - `volume_op.log`: ``` 1: [create-pvc : main] time="2021-04-23T20:28:56Z" level=error msg="Initialize script failed: exit status 2:" ``` [Enabling auto-strip of EOF newlines](https://github.com/kubeflow/kfp-tekton/blob/master/guides/kfp-admin-guide.md#enable-auto-strip-for-end-of-file-newlines) fixed the two failing test cases `condition_custom_task` and `tekton_custom_task`: ``` kubectl patch cm kfp-tekton-config -n kubeflow -p '{"data":{"strip_eof":"true"}}' kubectl rollout restart deploy/ml-pipeline -n kubeflow ``` However, this introduces new errors in other test cases like - `artifact-passing-pipeline`: ``` [processor : copy-artifacts] awkNF: /producer-Output-2: No such file or directory ``` - `load_from_yaml`: ``` [busybox : copy-artifacts] awkNF: /tekton/results/dummy-output-path: No such file or directory ``` The only thing that concerns me is the size for `big_data_passing.log`. This example is intended to test big log file which it could be too big for regular users to clone this repo. > The only thing that concerns me is the size for `big_data_passing.log`. This example is intended to test big log file which it could be too big for regular users to clone this repo. Good point, 2.9 Mb is a large log file. However considering the kfp-tekton repo is already at 35 Mb. I don't think another 3 Mb would make the repo much less cloneable. ```Bash $ du -hs * | sort -rh | head -10 8 M frontend 5 M backend 4 M third_party 4 M components 3 M manifests 1 M samples 1 M sdk 1 M guides 1 M v2 ``` Unless you strongly object, I would want to include the big data passing in the end-to-end tests. To summarize, of the non-excluded pipelines, none are failing any longer. There are some error message the log files: ```Bash $ find sdk/python/tests/compiler/testdata -name "*.log" -exec grep -rHniE --color "error|fail" {} \; artifact_passing_using_volume.log:18: [processor : copy-artifacts] /tekton/scripts/script-1-b4jcg: line 17: workspaces.producer.path: not found artifact_passing_using_volume.log:19: [processor : copy-artifacts] tar: /producer-Output-2: No such file or directory artifact_passing_using_volume.log:20: [processor : copy-artifacts] tar: error exit delayed from previous errors katib.log:3: [mnist-hpo : main] ERROR:root:Exception when create kubeflow.org/experiments: 404 page not found katib.log:17:[mnist-hpo : main] raise ValueError(errmsg("Extra data", s, end, len(s))) katib.log:18:[mnist-hpo : main] ValueError: Extra data: line 1 column 5 - line 2 column 1 (char 4 - 19) load_from_yaml.log:4: [busybox : copy-artifacts] tar: /tekton/results/dummy-output-path: No such file or directory load_from_yaml.log:5: [busybox : copy-artifacts] tar: error exit delayed from previous errors volume_op.log:1: [create-pvc : main] time="2021-04-23T20:28:56Z" level=error msg="Initialize script failed: exit status 2:" ```
2021-04-29T01:15:21
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-539
0f1147e55e1a68b84d299ef90d0053ce71e84484
diff --git a/sdk/python/kfp_tekton/tekton.py b/sdk/python/kfp_tekton/tekton.py index bd0e10abd4..2111dc31a5 100644 --- a/sdk/python/kfp_tekton/tekton.py +++ b/sdk/python/kfp_tekton/tekton.py @@ -12,13 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import List +from typing import List, Iterable, Union from kfp import dsl from kfp.dsl._container_op import ContainerOp +from kfp.dsl._pipeline_param import ConditionOperator from kfp_tekton.compiler._k8s_helper import sanitize_k8s_name CEL_EVAL_IMAGE = "aipipeline/cel-eval:latest" +ANY_SEQUENCER_IMAGE = "dspipelines/any-sequencer:latest" TEKTON_CUSTOM_TASK_IMAGES = [CEL_EVAL_IMAGE] @@ -31,34 +33,72 @@ class AnySequencer(ContainerOp): because the pipeline will generate a unique new name in case of conflicts. any: List of `Conditional` containerOps that deploy together with the `main` - containerOp. + containerOp, or the condtion that must meet to continue. """ def __init__(self, - any: List[dsl.ContainerOp], + any: Iterable[Union[dsl.ContainerOp, ConditionOperator]], name: str = None,): tasks_list = [] + condition_list = [] for cop in any: - cop_name = sanitize_k8s_name(cop.name) - tasks_list.append(cop_name) + if isinstance(cop, dsl.ContainerOp): + cop_name = sanitize_k8s_name(cop.name) + tasks_list.append(cop_name) + elif isinstance(cop, ConditionOperator): + condition_list.append(cop) + task_list_str = ",".join(tasks_list) + arguments = [ + "--namespace", + "$(context.pipelineRun.namespace)", + "--prName", + "$(context.pipelineRun.name)", + "--taskList", + task_list_str + ] + conditonArgs = processConditionArgs(condition_list) + arguments.extend(conditonArgs) super().__init__( name=name, - image="dspipelines/any-sequencer:latest", + image=ANY_SEQUENCER_IMAGE, command="any-taskrun", - arguments=[ - "-namespace", - "$(context.pipelineRun.namespace)", - "-prName", - "$(context.pipelineRun.name)", - "-taskList", - task_list_str - ], + arguments=arguments, ) -def after_any(any: List[dsl.ContainerOp], name: str = None): +def processOperand(operand) -> (str, str): + if isinstance(operand, dsl.PipelineParam): + return "results_" + sanitize_k8s_name(operand.op_name) + "_" + sanitize_k8s_name(operand.name), operand.op_name + else: + # Do the same as in _get_super_condition_template to check whehter it's int + try: + operand = int(operand) + except: + operand = '\'' + str(operand) + '\'' + return operand, None + + +def processCondition(condition: ConditionOperator) -> str: + op1, taskName1 = processOperand(condition.operand1) + op2, taskName2 = processOperand(condition.operand2) + if taskName1 != None and taskName2 != None: + assert taskName1 == taskName2, "The result for condition must come from the same task." + assert taskName1 != None or taskName2 != None, "Must at least contain one result in one condition for a task." + conditionStr = f"{op1} {condition.operator} {op2}" + return conditionStr + + +def processConditionArgs(conditions: List[ConditionOperator]) -> List[str]: + conditionArgs = [] + for condition in conditions: + conditionStr = processCondition(condition) + conditionArgs.extend(["-c", conditionStr]) + return conditionArgs + + +def after_any(any: Iterable[Union[dsl.ContainerOp, ConditionOperator]], name: str = None): ''' The function adds a new AnySequencer and connects the given op to it ''' diff --git a/tekton-catalog/any-sequencer/Makefile b/tekton-catalog/any-sequencer/Makefile index f08a9865f3..2c4b43ebd1 100644 --- a/tekton-catalog/any-sequencer/Makefile +++ b/tekton-catalog/any-sequencer/Makefile @@ -24,10 +24,10 @@ init: mkdir -p ${BIN_DIR} local: init - go build -o=${BIN_DIR}/any-taskrun ./cmd + go build -o=${BIN_DIR}/any-taskrun build-linux: init - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o=${BIN_DIR}/any-taskrun ./cmd + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o=${BIN_DIR}/any-taskrun image: build-linux docker build . -t docker.io/dspipelines/any-sequencer:$(TAG) diff --git a/tekton-catalog/any-sequencer/cmd/main.go b/tekton-catalog/any-sequencer/cmd/main.go deleted file mode 100644 index cebf9fd303..0000000000 --- a/tekton-catalog/any-sequencer/cmd/main.go +++ /dev/null @@ -1,108 +0,0 @@ -/* -Copyright 2020 kubeflow.org. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package main - -import ( - "context" - "flag" - "os" - "strings" - - log "github.com/sirupsen/logrus" - v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" - tektoncdclientset "github.com/tektoncd/pipeline/pkg/client/clientset/versioned" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/rest" - "knative.dev/pkg/apis" -) - -func contains(s []string, str string) bool { - for _, v := range s { - if v == strings.TrimSpace(str) { - return true - } - } - return false -} - -func main() { - var namespace string - var prName string - var taskList string - var failedTasks []string - - flag.StringVar(&namespace, "namespace", "", "The namespace of the pipelinerun.") - flag.StringVar(&prName, "prName", "", "The name of the pipelinerun.") - flag.StringVar(&taskList, "taskList", "", "The comma separated list of the tasks.") - flag.Parse() - - for _, arg := range []string{namespace, prName, taskList} { - if arg == "" { - log.Errorf("The arguments namespace, prName and taskList are required.") - os.Exit(1) - } - } - - log.Printf("Starting to watch taskrun for '%s' in %s/%s.", taskList, namespace, prName) - - tasks := strings.Split(taskList, ",") - - config, err := rest.InClusterConfig() - if err != nil { - log.Errorf("Get config of the cluster failed: %+v", err) - os.Exit(1) - } - - tektonClient, err := tektoncdclientset.NewForConfig(config) - if err != nil { - log.Errorf("Get client of tekton failed: %+v", err) - os.Exit(1) - } - - labelSelector := "tekton.dev/pipelineRun=" + strings.TrimSpace(prName) - - for { - watcher, err := tektonClient.TektonV1beta1().TaskRuns(namespace).Watch(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector}) - - if err != nil { - log.Printf("TaskRun Watcher error:" + err.Error()) - log.Printf("Please ensure the service account has permission to get taskRun.") - os.Exit(1) - } - - for event := range watcher.ResultChan() { - taskrun := event.Object.(*v1beta1.TaskRun) - taskLabel := taskrun.Labels["tekton.dev/pipelineTask"] - if contains(tasks, taskLabel) { - if taskrun.Status.GetCondition(apis.ConditionSucceeded).IsTrue() { - log.Printf("The TaskRun of %s succeeded.", taskLabel) - watcher.Stop() - os.Exit(0) - } else if taskrun.Status.GetCondition(apis.ConditionSucceeded).IsFalse() { - if !contains(failedTasks, taskLabel) { - failedTasks = append(failedTasks, taskLabel) - } - if len(failedTasks) >= len(tasks) { - log.Printf("All specified TaskRun(s) failed.") - watcher.Stop() - os.Exit(1) - } - } - } - } - } -} diff --git a/tekton-catalog/any-sequencer/cmd/root.go b/tekton-catalog/any-sequencer/cmd/root.go new file mode 100644 index 0000000000..0baee46c93 --- /dev/null +++ b/tekton-catalog/any-sequencer/cmd/root.go @@ -0,0 +1,267 @@ +/* +Copyright 2020 kubeflow.org. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package cmd + +import ( + "context" + "fmt" + "os" + "regexp" + "strconv" + "strings" + + "github.com/Knetic/govaluate" + + log "github.com/sirupsen/logrus" + "github.com/spf13/cobra" + v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" + tektoncdclientset "github.com/tektoncd/pipeline/pkg/client/clientset/versioned" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/rest" + "knative.dev/pkg/apis" +) + +var ( + namespace string + prName string + taskList string + conditions []string + conditionMap map[string][]conditionResult +) + +type conditionResult struct { + condition string + results []string +} + +func contains(s []string, str string) bool { + for _, v := range s { + if v == strings.TrimSpace(str) { + return true + } + } + return false +} + +func parse_conditions(condtions []string, tasks *[]string) { + conditionMap = make(map[string][]conditionResult) + if len(condtions) == 0 { + return + } + // Expect result to have the format of results_taskName_resultName + for _, condition := range condtions { + operands := regexp.MustCompile(" +").Split(condition, -1) + if len(operands) != 3 { + log.Printf("The conditon must be as format 'operand1 operator operand2'.") + os.Exit(1) + } + var taskName string + var resultName []string + resultMatcher := regexp.MustCompile(`results_([^_]*)_([^_]+)`) + operand1Results := resultMatcher.FindAllStringSubmatch(operands[0], -1) + operand2Results := resultMatcher.FindAllStringSubmatch(operands[2], -1) + if len(operand1Results) == 0 && len(operand2Results) == 0 { + log.Printf("Must at least contain one result and at most two in one condition for a task.") + os.Exit(1) + } + if len(operand1Results) > 0 && len(operand2Results) > 0 { + if operand1Results[0][1] != operand2Results[0][1] { + log.Printf("The conditon can only contain results in one task, here's two.") + os.Exit(1) + } + taskName = operand1Results[0][1] + resultName = []string{ + operand1Results[0][2], + operand2Results[0][2], + } + } + if len(operand1Results) > 0 { + taskName = operand1Results[0][1] + resultName = []string{ + operand1Results[0][2], + } + } + if len(operand2Results) > 0 { + taskName = operand2Results[0][1] + resultName = []string{ + operand2Results[0][2], + } + } + if !contains(*tasks, taskName) { + *tasks = append(*tasks, taskName) + } + cr := conditionResult{ + condition: condition, + results: resultName, + } + if len(conditionMap[taskName]) == 0 { + conditionMap[taskName] = []conditionResult{} + } + conditionMap[taskName] = append(conditionMap[taskName], cr) + } +} + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func Execute() { + // rootCmd represents the base command when called without any subcommands + var rootCmd = &cobra.Command{ + Use: "any-taskrun", + Short: "Watch taskrun and exit when any taskrun complete", + Long: `Watch taskrun and exit when any of below is true: + 1: taskrun complete + 2: condition met`, + Run: watch, + } + + rootCmd.Flags().StringVar(&namespace, "namespace", "", "The namespace of the pipelinerun.") + rootCmd.MarkFlagRequired("namespace") + rootCmd.Flags().StringVar(&prName, "prName", "", "The name of the pipelinerun.") + rootCmd.MarkFlagRequired("prName") + rootCmd.Flags().StringVar(&taskList, "taskList", "", "The comma separated list of the tasks.") + rootCmd.MarkFlagRequired("taskList") + rootCmd.Flags().StringSliceVarP(&conditions, "condition", "c", []string{}, "The conditions to watch") + + if err := rootCmd.Execute(); err != nil { + fmt.Println(err) + os.Exit(1) + } +} + +func sanitize_parameter_name(param string) string { + return strings.ReplaceAll(param, "-", `\-`) +} + +func sanitize_task_result(result string) interface{} { + result = strings.TrimSpace(result) + i, err := strconv.Atoi(result) + if err != nil { + return result + } + return i +} + +func checkConditions(crs []conditionResult, tr *v1beta1.TaskRun) (string, bool) { + for _, cr := range crs { + parameters := make(map[string]interface{}) + for _, result := range cr.results { + trLabel := tr.Labels["tekton.dev/pipelineTask"] + var found bool + for _, taskRunResults := range tr.Status.TaskRunResults { + if result == taskRunResults.Name { + // Do not need sanitize parameter name but only for expression for go valuate + parameters[`results_`+trLabel+`_`+result] = sanitize_task_result(taskRunResults.Value) + found = true + break + } + } + if !found { + log.Printf("The result %s does not exist in taskrun %s.", result, trLabel) + return cr.condition, false + } + } + expr, err := govaluate.NewEvaluableExpression(sanitize_parameter_name(cr.condition)) + if err != nil { + log.Fatal("syntax error:", err) + } + + evaluateresult, err := expr.Evaluate(parameters) + if err != nil { + log.Fatal("evaluate error:", err) + } + + if result, ok := evaluateresult.(bool); ok { + if result { + continue + } + } + return cr.condition, false + } + return "", true +} + +func watch(cmd *cobra.Command, args []string) { + log.Printf("Starting to watch taskrun for '%s' and condition in %s/%s.", taskList, namespace, prName) + + tasks := strings.Split(taskList, ",") + + parse_conditions(conditions, &tasks) + + config, err := rest.InClusterConfig() + if err != nil { + log.Errorf("Get config of the cluster failed: %+v", err) + os.Exit(1) + } + + tektonClient, err := tektoncdclientset.NewForConfig(config) + if err != nil { + log.Errorf("Get client of tekton failed: %+v", err) + os.Exit(1) + } + + labelSelector := "tekton.dev/pipelineRun=" + strings.TrimSpace(prName) + + var failedTasks []string + for { + watcher, err := tektonClient.TektonV1beta1().TaskRuns(namespace).Watch(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector}) + + if err != nil { + log.Printf("TaskRun Watcher error:" + err.Error()) + log.Printf("Please ensure the service account has permission to get taskRun.") + os.Exit(1) + } + + for event := range watcher.ResultChan() { + taskrun := event.Object.(*v1beta1.TaskRun) + taskLabel := taskrun.Labels["tekton.dev/pipelineTask"] + if contains(tasks, taskLabel) { + taskrunStatus := taskrun.Status.GetCondition(apis.ConditionSucceeded) + var taskFailed bool + if taskrunStatus.IsTrue() { + log.Printf("The TaskRun of %s succeeded.", taskLabel) + conditions, ok := conditionMap[taskLabel] + if !ok { // no conditions to be passed --> any-sequencer success + watcher.Stop() + os.Exit(0) + } + + condition, ok := checkConditions(conditions, taskrun) + if ok { // condition passed --> any-sequencer success + watcher.Stop() + os.Exit(0) + } + taskFailed = true + log.Printf("The condition %s for the task %s does not meet.", condition, taskLabel) + } + + if taskrunStatus.IsFalse() { + taskFailed = true + } + + if taskFailed && !contains(failedTasks, taskLabel) { + failedTasks = append(failedTasks, taskLabel) + } + + if len(failedTasks) >= len(tasks) { + log.Printf("All specified TaskRun(s) failed.") + watcher.Stop() + os.Exit(1) + } + } + } + } +} diff --git a/tekton-catalog/any-sequencer/go.mod b/tekton-catalog/any-sequencer/go.mod index 0321775a1b..834ed61f42 100644 --- a/tekton-catalog/any-sequencer/go.mod +++ b/tekton-catalog/any-sequencer/go.mod @@ -1,131 +1,27 @@ -module taskrun-watcher +module github.com/kubeflow/kfp-tekton/tekton-catalog/any-sequencer go 1.12 require ( - cloud.google.com/go/pubsub v1.6.1 // indirect - cloud.google.com/go/storage v1.11.0 // indirect - contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect - contrib.go.opencensus.io/exporter/prometheus v0.2.1-0.20200609204449-6bcf6f8577f0 // indirect contrib.go.opencensus.io/exporter/stackdriver v0.13.4 // indirect - contrib.go.opencensus.io/exporter/zipkin v0.1.2 // indirect - github.com/Azure/azure-pipeline-go v0.2.2 // indirect - github.com/Azure/azure-sdk-for-go v42.3.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.10.2 // indirect - github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect - github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 // indirect - github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect - github.com/Djarvur/go-err113 v0.1.0 // indirect - github.com/GoogleCloudPlatform/testgrid v0.0.13 // indirect - github.com/andygrunwald/go-gerrit v0.0.0-20190120104749-174420ebee6c // indirect - github.com/apex/log v1.3.0 // indirect - github.com/aws/aws-sdk-go v1.31.12 // indirect - github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89 // indirect - github.com/blang/semver v3.5.1+incompatible // indirect - github.com/blang/semver/v4 v4.0.0 // indirect - github.com/blendle/zapdriver v1.3.1 // indirect - github.com/bombsimon/wsl/v2 v2.2.0 // indirect - github.com/bombsimon/wsl/v3 v3.1.0 // indirect - github.com/bwmarrin/snowflake v0.0.0 // indirect - github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect - github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect - github.com/clarketm/json v1.13.4 // indirect - github.com/cloudevents/sdk-go/v2 v2.1.0 // indirect - github.com/containerd/containerd v1.3.3 // indirect - github.com/containerd/stargz-snapshotter/estargz v0.0.0-20201217071531-2b97b583765b // indirect - github.com/coreos/bbolt v1.3.3 // indirect - github.com/coreos/etcd v3.3.17+incompatible // indirect - github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 // indirect - github.com/djherbis/atime v1.0.0 // indirect - github.com/docker/cli v0.0.0-20200210162036-a4bedce16568 // indirect - github.com/docker/docker v1.13.1 // indirect + github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible github.com/emicklei/go-restful v2.15.0+incompatible // indirect github.com/evanphx/json-patch v4.9.0+incompatible // indirect - github.com/frankban/quicktest v1.8.1 // indirect - github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/fsouza/fake-gcs-server v1.19.4 // indirect - github.com/go-bindata/go-bindata/v3 v3.1.3 // indirect - github.com/go-critic/go-critic v0.4.3 // indirect - github.com/go-ini/ini v1.55.0 // indirect github.com/go-logr/logr v0.3.0 // indirect - github.com/go-logr/zapr v0.1.1 // indirect github.com/go-openapi/spec v0.20.0 // indirect - github.com/go-test/deep v1.0.4 // indirect - github.com/go-toolsmith/typep v1.0.2 // indirect - github.com/go-yaml/yaml v2.1.0+incompatible // indirect - github.com/gobuffalo/envy v1.7.1 // indirect - github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect - github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d // indirect - github.com/golangci/misspell v0.3.5 // indirect - github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect - github.com/gomodule/redigo v1.7.0 // indirect - github.com/google/go-github v17.0.0+incompatible // indirect - github.com/google/go-github/v27 v27.0.6 // indirect - github.com/google/go-github/v29 v29.0.3 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/licenseclassifier v0.0.0-20200708223521-3d09a0ea2f39 // indirect - github.com/google/mako v0.0.0-20190821191249-122f8dcef9e3 // indirect - github.com/google/wire v0.4.0 // indirect - github.com/goreleaser/goreleaser v0.136.0 // indirect - github.com/goreleaser/nfpm v1.3.0 // indirect - github.com/gorilla/csrf v1.6.2 // indirect - github.com/gorilla/sessions v1.2.0 // indirect - github.com/gostaticanalysis/analysisutil v0.0.3 // indirect - github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect - github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect - github.com/grpc-ecosystem/grpc-gateway v1.14.8 // indirect - github.com/hashicorp/go-multierror v1.1.0 // indirect - github.com/hashicorp/go-retryablehttp v0.6.6 // indirect - github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/influxdata/influxdb v0.0.0-20161215172503-049f9b42e9a5 // indirect - github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9 // indirect - github.com/jenkins-x/go-scm v1.5.117 // indirect - github.com/jinzhu/gorm v1.9.12 // indirect - github.com/jinzhu/now v1.1.1 // indirect - github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect - github.com/klauspost/compress v1.10.2 // indirect - github.com/klauspost/cpuid v1.2.2 // indirect - github.com/knative/build v0.1.2 // indirect - github.com/mattn/go-colorable v0.1.6 // indirect - github.com/mattn/go-ieproxy v0.0.1 // indirect - github.com/mattn/go-runewidth v0.0.8 // indirect - github.com/mattn/go-zglob v0.0.2 // indirect - github.com/mholt/archiver/v3 v3.3.0 // indirect - github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e // indirect - github.com/mitchellh/mapstructure v1.3.1 // indirect - github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect - github.com/natefinch/lumberjack v2.0.0+incompatible // indirect - github.com/nats-io/gnatsd v1.4.1 // indirect - github.com/nats-io/go-nats v1.7.0 // indirect - github.com/octago/sflags v0.2.0 // indirect - github.com/onsi/gomega v1.10.1 // indirect github.com/openzipkin/zipkin-go v0.2.5 // indirect - github.com/pelletier/go-toml v1.8.0 // indirect github.com/prometheus/client_golang v1.8.0 // indirect github.com/prometheus/common v0.15.0 // indirect - github.com/ryancurrah/gomodguard v1.1.0 // indirect - github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989 // indirect - github.com/sergi/go-diff v1.1.0 // indirect github.com/sirupsen/logrus v1.7.0 - github.com/sourcegraph/go-diff v0.5.3 // indirect - github.com/spf13/cast v1.3.1 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/viper v1.7.0 // indirect - github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect + github.com/spf13/cobra v1.0.0 github.com/tektoncd/pipeline v0.19.0 - github.com/tektoncd/plumbing v0.0.0-20201021153918-6b7e894737b5 // indirect - github.com/tetafro/godot v0.4.2 // indirect - github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect - github.com/tsenart/vegeta v12.7.1-0.20190725001342-b5f4fca92137+incompatible // indirect - github.com/tsenart/vegeta/v12 v12.8.4 // indirect - github.com/xanzy/go-gitlab v0.32.0 // indirect go.uber.org/atomic v1.7.0 // indirect - go.uber.org/automaxprocs v1.3.0 // indirect go.uber.org/zap v1.16.0 // indirect golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 // indirect + golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect golang.org/x/sys v0.0.0-20201223074533-0d417f636930 // indirect golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect @@ -133,32 +29,12 @@ require ( google.golang.org/api v0.36.0 // indirect google.golang.org/genproto v0.0.0-20201211151036-40ec1c210f7a // indirect google.golang.org/grpc v1.34.0 // indirect - gopkg.in/evanphx/json-patch.v4 v4.9.0 // indirect - gopkg.in/ini.v1 v1.56.0 // indirect - gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect - gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect - helm.sh/helm/v3 v3.1.1 // indirect - honnef.co/go/tools v0.0.1-2020.1.5 // indirect k8s.io/api v0.19.0-alpha.1 // indirect k8s.io/apimachinery v0.19.0 k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible - k8s.io/code-generator v0.18.12 // indirect - k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac // indirect k8s.io/klog/v2 v2.4.0 // indirect - k8s.io/kubernetes v1.14.7 // indirect k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect - knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 // indirect knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab - mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7 // indirect - mvdan.cc/xurls/v2 v2.0.0 // indirect - rsc.io/letsencrypt v0.0.3 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7 // indirect - sigs.k8s.io/structured-merge-diff v1.0.1 // indirect - sigs.k8s.io/structured-merge-diff/v2 v2.0.1 // indirect - sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect - sigs.k8s.io/testing_frameworks v0.1.1 // indirect - sourcegraph.com/sqs/pbtypes v1.0.0 // indirect ) // Pin k8s deps to v0.18.8 diff --git a/tekton-catalog/any-sequencer/go.sum b/tekton-catalog/any-sequencer/go.sum index 2c91465a8d..cba1af55c8 100644 --- a/tekton-catalog/any-sequencer/go.sum +++ b/tekton-catalog/any-sequencer/go.sum @@ -26,6 +26,7 @@ cloud.google.com/go v0.61.0/go.mod h1:XukKJg4Y7QsUu0Hxg3qQKUWR4VuWivmyMK2+rUyxAq cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.64.0/go.mod h1:xfORb36jGvE+6EexW71nMEtL025s3x6xvuYUKM4JLv4= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0 h1:eWRCuwubtDrCJG0oSUMgnsbD4CmPFQF2ei4OFbXvwww= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= @@ -55,17 +56,19 @@ contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs= +contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h1:LblfooH1lKOpp1hIhukktmSAxFkqMPFk9KR6iZ0MJNI= contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= +contrib.go.opencensus.io/exporter/prometheus v0.2.1-0.20200609204449-6bcf6f8577f0 h1:2O3c1g5CzMc1+Uah4Waot9Obm0yw70VXJzWaP6Fz3nw= contrib.go.opencensus.io/exporter/prometheus v0.2.1-0.20200609204449-6bcf6f8577f0/go.mod h1:MjHoxkI7Ny27toPeFkRbXbzVjzIGkwOAptrAy8Mxtm8= contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= contrib.go.opencensus.io/exporter/stackdriver v0.12.8/go.mod h1:XyyafDnFOsqoxHJgTFycKZMrRUrPThLh2iYTJF6uoO0= contrib.go.opencensus.io/exporter/stackdriver v0.12.9-0.20191108183826-59d068f8d8ff/go.mod h1:XyyafDnFOsqoxHJgTFycKZMrRUrPThLh2iYTJF6uoO0= contrib.go.opencensus.io/exporter/stackdriver v0.13.1/go.mod h1:z2tyTZtPmQ2HvWH4cOmVDgtY+1lomfKdbLnkJvZdc8c= contrib.go.opencensus.io/exporter/stackdriver v0.13.2/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= +contrib.go.opencensus.io/exporter/stackdriver v0.13.4 h1:ksUxwH3OD5sxkjzEqGxNTl+Xjsmu3BnC/300MhSVTSc= contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= contrib.go.opencensus.io/exporter/zipkin v0.1.1/go.mod h1:GMvdSl3eJ2gapOaLKzTKE3qDgUkJ86k9k3yY2eqwkzc= -contrib.go.opencensus.io/exporter/zipkin v0.1.2/go.mod h1:mP5xM3rrgOjpn79MM8fZbj3gsxcuytSqtH0dxSWW1RE= contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -92,10 +95,8 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v10.15.5+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v11.3.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v14.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg= github.com/Azure/go-autorest/autorest v0.2.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= @@ -108,16 +109,13 @@ github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/to v0.1.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= @@ -126,8 +124,7 @@ github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRY github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= @@ -140,6 +137,7 @@ github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced3 github.com/GoogleCloudPlatform/testgrid v0.0.1-alpha.3/go.mod h1:f96W2HYy3tiBNV5zbbRc+NczwYHgG1PHXMQfoEWv680= github.com/GoogleCloudPlatform/testgrid v0.0.7/go.mod h1:lmtHGBL0M/MLbu1tR9BWV7FGZ1FEFIdPqmJiHNCL7y8= github.com/GoogleCloudPlatform/testgrid v0.0.13/go.mod h1:UlC/MvnkKjiVGijIKOHxnVyhDiTDCydw9H1XzmclQGU= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -170,12 +168,13 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/ github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= -github.com/alecthomas/jsonschema v0.0.0-20180308105923-f2c93856175a/go.mod h1:qpebaTNSsyUn5rPSJMsfqEtDw71TTggXM6stUDI16HA= github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/brotli v0.0.0-20190621154722-5f990b63d2d6/go.mod h1:+lx6/Aqd1kLJ1GQfkvOnaZ1WGmLpMpbprPuIOOZX30U= @@ -200,59 +199,7 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/aws/aws-k8s-tester v0.0.0-20190114231546-b411acf57dfe/go.mod h1:1ADF5tAtU1/mVtfMcHAYSm2fPw71DA7fFk0yed64/0I= -github.com/aws/aws-k8s-tester v0.4.0/go.mod h1:03m+vtIGe7+aNsJLFnxhGCQ1u+Vz1JGF2ECLOHv8z4I= -github.com/aws/aws-k8s-tester v0.4.1/go.mod h1:03m+vtIGe7+aNsJLFnxhGCQ1u+Vz1JGF2ECLOHv8z4I= -github.com/aws/aws-k8s-tester v0.4.2/go.mod h1:fJ0Hd4zPJckGt+dfU6Ze4LXCWuW6GHPRx/6igzWXxYk= -github.com/aws/aws-k8s-tester v0.4.3/go.mod h1:HhJpLSccQdkkwrKUVlIj97D1sxDpEOhvZunPeaCQzaM= -github.com/aws/aws-k8s-tester v0.4.4/go.mod h1:IQZy44RnfxQmELZ2MPMvuolS2Bnnxl+cIdd3QAcQjIQ= -github.com/aws/aws-k8s-tester v0.5.0/go.mod h1:S3uZCvB1z+3fct2wvu1dudfqLpHSmW3l46CwI59/Ppg= -github.com/aws/aws-k8s-tester v0.5.1/go.mod h1:S3uZCvB1z+3fct2wvu1dudfqLpHSmW3l46CwI59/Ppg= -github.com/aws/aws-k8s-tester v0.5.2/go.mod h1:XIZBiJNCTlSzJMzMEfkKha7dChh9odlzzhwdYownZME= -github.com/aws/aws-k8s-tester v0.5.3/go.mod h1:swy/X7b2X5zu7DJ+2WXFk1lPoB8FuOWbERrOc1qTDFc= -github.com/aws/aws-k8s-tester v0.5.4/go.mod h1:swy/X7b2X5zu7DJ+2WXFk1lPoB8FuOWbERrOc1qTDFc= -github.com/aws/aws-k8s-tester v0.5.5/go.mod h1:i02MDy2oOAMyp/JDkATeudSwuflwQw9XBVP/8++7BaY= -github.com/aws/aws-k8s-tester v0.5.6/go.mod h1:i02MDy2oOAMyp/JDkATeudSwuflwQw9XBVP/8++7BaY= -github.com/aws/aws-k8s-tester v0.5.7/go.mod h1:Uod2Ev5WDnuuwqOg1ZtS4P7LVp+wRbOQvg5m3YGZNVo= -github.com/aws/aws-k8s-tester v0.5.8/go.mod h1:2gf+ubpmiJffsXBOkaXznu7HJ/dIg/FdUO2UQPeWeec= -github.com/aws/aws-k8s-tester v0.5.9/go.mod h1:9kvJEpcUUaN6X4EYorVGq8ne8Exu0u/xGHeJuadYu40= -github.com/aws/aws-k8s-tester v0.6.0/go.mod h1:taEb+LfkVc7jQv+B4i5yvSPW589broDj2htM8/oMWGg= -github.com/aws/aws-k8s-tester v0.6.1/go.mod h1:taEb+LfkVc7jQv+B4i5yvSPW589broDj2htM8/oMWGg= -github.com/aws/aws-k8s-tester v0.6.2-internal.cmk.2/go.mod h1:LBGSI0V2r6d2uMaSGArWN87wQZMkEQRPnHoQoKHTRZk= -github.com/aws/aws-k8s-tester v0.6.2/go.mod h1:3PlioTzJMYV9vO0UcF0F0qXWhkMZ8a/ARZMLrAdZH0Y= -github.com/aws/aws-k8s-tester v0.6.3/go.mod h1:qTxG1XzgmEz0WFwzi7llaJheYmbGggolznvY054Hqlw= -github.com/aws/aws-k8s-tester v0.6.4/go.mod h1:qTxG1XzgmEz0WFwzi7llaJheYmbGggolznvY054Hqlw= -github.com/aws/aws-k8s-tester v0.6.5/go.mod h1:qTxG1XzgmEz0WFwzi7llaJheYmbGggolznvY054Hqlw= -github.com/aws/aws-k8s-tester v0.6.6/go.mod h1:qTxG1XzgmEz0WFwzi7llaJheYmbGggolznvY054Hqlw= -github.com/aws/aws-k8s-tester v0.6.7/go.mod h1:eXxuv/ztp0qct5Echh1iTd3NegtC8FHb3seJzhZu9bc= -github.com/aws/aws-k8s-tester v0.6.8/go.mod h1:eXxuv/ztp0qct5Echh1iTd3NegtC8FHb3seJzhZu9bc= -github.com/aws/aws-k8s-tester v0.6.9/go.mod h1:iG6tbsijxAoDSk5LJ/FYzBhFviUeOJlt9E35+k2NIiA= -github.com/aws/aws-k8s-tester v0.7.0/go.mod h1:iG6tbsijxAoDSk5LJ/FYzBhFviUeOJlt9E35+k2NIiA= -github.com/aws/aws-k8s-tester v0.7.1/go.mod h1:CM4Me8ShN6/nGhaoVS+XczrN5cGd8s1B36NNZppOXVA= -github.com/aws/aws-k8s-tester v0.7.2/go.mod h1:zQvYZ9T0txCfArwafwHQVWTkoXRcAqTLHhcdzlb7HDs= -github.com/aws/aws-k8s-tester v0.7.3/go.mod h1:zQvYZ9T0txCfArwafwHQVWTkoXRcAqTLHhcdzlb7HDs= -github.com/aws/aws-k8s-tester v0.7.4/go.mod h1:zQvYZ9T0txCfArwafwHQVWTkoXRcAqTLHhcdzlb7HDs= -github.com/aws/aws-k8s-tester v0.7.5/go.mod h1:5pEezFNUaehfavN6LjfBqwIAL3tE2Mn74daZm2KjHA0= -github.com/aws/aws-k8s-tester v0.7.6/go.mod h1:5pEezFNUaehfavN6LjfBqwIAL3tE2Mn74daZm2KjHA0= -github.com/aws/aws-k8s-tester v0.7.7/go.mod h1:TjMCJ87gN7K/hLTPgDzigdYgSr1B0xmzvasVhRTSaVo= -github.com/aws/aws-k8s-tester v0.7.8/go.mod h1:TjMCJ87gN7K/hLTPgDzigdYgSr1B0xmzvasVhRTSaVo= -github.com/aws/aws-k8s-tester v0.8.0/go.mod h1:pzC5XGJB6ojeT3yIEG7fV1xq0BS3SQDOsJjsKYN/MLI= -github.com/aws/aws-k8s-tester v0.8.1/go.mod h1:pzC5XGJB6ojeT3yIEG7fV1xq0BS3SQDOsJjsKYN/MLI= -github.com/aws/aws-k8s-tester v0.8.2/go.mod h1:pzC5XGJB6ojeT3yIEG7fV1xq0BS3SQDOsJjsKYN/MLI= -github.com/aws/aws-k8s-tester v0.8.3/go.mod h1:pzC5XGJB6ojeT3yIEG7fV1xq0BS3SQDOsJjsKYN/MLI= -github.com/aws/aws-k8s-tester v0.8.4/go.mod h1:pzC5XGJB6ojeT3yIEG7fV1xq0BS3SQDOsJjsKYN/MLI= -github.com/aws/aws-k8s-tester v0.8.5/go.mod h1:pzC5XGJB6ojeT3yIEG7fV1xq0BS3SQDOsJjsKYN/MLI= -github.com/aws/aws-k8s-tester v0.8.6/go.mod h1:IccU3uKjGqL5T3pjRqnOvWMSdwCQzH4rqBArvxPzWRg= -github.com/aws/aws-k8s-tester v0.8.7/go.mod h1:IccU3uKjGqL5T3pjRqnOvWMSdwCQzH4rqBArvxPzWRg= -github.com/aws/aws-k8s-tester v0.8.8/go.mod h1:IccU3uKjGqL5T3pjRqnOvWMSdwCQzH4rqBArvxPzWRg= -github.com/aws/aws-k8s-tester v0.9.0/go.mod h1:IccU3uKjGqL5T3pjRqnOvWMSdwCQzH4rqBArvxPzWRg= -github.com/aws/aws-k8s-tester v0.9.1/go.mod h1:IccU3uKjGqL5T3pjRqnOvWMSdwCQzH4rqBArvxPzWRg= -github.com/aws/aws-k8s-tester v0.9.2/go.mod h1:7VBSiNhku05D9oOVMGShZvol5IQYhjMApuzX5hteRo0= github.com/aws/aws-k8s-tester v0.9.3/go.mod h1:nsh1f7joi8ZI1lvR+Ron6kJM2QdCYPU/vFePghSSuTc= -github.com/aws/aws-k8s-tester v0.9.4/go.mod h1:JMShoxZiBnbuhC0Q0+p2XJnulrmpsny5fSRTYgR76d8= -github.com/aws/aws-k8s-tester v0.9.5/go.mod h1:5Vms1nRdnFq3yFpHOWsaiZtZidQoLTHsK/qM+HoK/5Y= -github.com/aws/aws-k8s-tester v0.9.6/go.mod h1:xAqm7mu3bmYc9WCfyEiqn8dQS0DTPDIg1ZoHD0Pyrgo= -github.com/aws/aws-k8s-tester v0.9.7/go.mod h1:D/5wKZusfJbl3052WIx9F3d7+Yn97UoXF6W6GiGSyN8= -github.com/aws/aws-k8s-tester v0.9.8/go.mod h1:/CG7q4DzG9e2UCY1wZe+PQ84pSmMeOr91C4kZhztU+E= github.com/aws/aws-k8s-tester v1.0.0/go.mod h1:NUNd9k43+h9O5tvwL+4N1Ctb//SapmeeFX1G0/2/0Qc= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= @@ -265,41 +212,16 @@ github.com/aws/aws-sdk-go v1.19.45/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.22/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.24.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.24.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.25/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.26.8/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.28.10/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.28.12/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.29.0/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.1/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.3/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.4/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.7/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.12/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.18/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.19/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.20/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.26/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.27/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.28/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.29/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.29.30/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= github.com/aws/aws-sdk-go v1.29.32/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= github.com/aws/aws-sdk-go v1.29.34/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.30.0/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.30.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.30.3/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.30.4/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.30.5/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.30.16/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.31.12 h1:SxRRGyhlCagI0DYkhOg+FgdXGXzRTE3vEX/gsgFaiKQ= github.com/aws/aws-sdk-go v1.31.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= @@ -307,6 +229,7 @@ github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89/go.mod h1:5J github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= @@ -315,8 +238,6 @@ github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAw github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= @@ -328,7 +249,6 @@ github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8n github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/bwmarrin/snowflake v0.0.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE= -github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= @@ -336,9 +256,12 @@ github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oD github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -349,9 +272,10 @@ github.com/clarketm/json v1.13.4/go.mod h1:ynr2LRfb0fQU34l07csRNBTcivjySLLiY1YzQ github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudevents/sdk-go v0.0.0-20190509003705-56931988abe3/go.mod h1:j1nZWMLGg3om8SswStBoY6/SHvcLM19MuZqwDtMtmzs= +github.com/cloudevents/sdk-go v1.0.0 h1:gS5I0s2qPmdc4GBPlUmzZU7RH30BaiOdcRJ1RkXnPrc= github.com/cloudevents/sdk-go v1.0.0/go.mod h1:3TkmM0cFqkhCHOq5JzzRU/RxRkwzoS8TZ+G448qVTog= -github.com/cloudevents/sdk-go/v2 v2.0.0-preview8/go.mod h1:akZr/joO3DfDft2KZnI91LEs15NSKIBNPYcAMBQ1xbk= github.com/cloudevents/sdk-go/v2 v2.0.0/go.mod h1:3CTrpB4+u7Iaj6fd7E2Xvm5IxMdRoaAhqaRVnOr2rCU= +github.com/cloudevents/sdk-go/v2 v2.1.0 h1:bmgrU8k+K2ppZ+G/q5xEQx/Xk9HRtJmkrEO3qtDO2k0= github.com/cloudevents/sdk-go/v2 v2.1.0/go.mod h1:3CTrpB4+u7Iaj6fd7E2Xvm5IxMdRoaAhqaRVnOr2rCU= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -367,19 +291,13 @@ github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/stargz-snapshotter/estargz v0.0.0-20201217071531-2b97b583765b/go.mod h1:E9uVkkBKf0EaC39j2JVW9EzdNhYvpz6eQIjILHebruk= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-oidc v0.0.0-20180117170138-065b426bd416/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/coreos/go-semver v0.0.0-20180108230905-e214231b295a/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -393,7 +311,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -403,12 +320,9 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190111225525-2fea367d496d/go.mod h1:xN github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= -github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-gk v0.0.0-20140819190930-201884a44051/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E= github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E= -github.com/dgryski/go-lttb v0.0.0-20180810165845-318fcdf10a77/go.mod h1:Va5MyIzkU0rAM92tn3hb3Anb7oz7KcnixF49+2wOMe4= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/djherbis/atime v1.0.0/go.mod h1:5W+KBIuTwVGcqjIfaTwt+KSYX1o6uep8dtevevQP/f8= @@ -442,10 +356,8 @@ github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v1.1.3 h1:KOKLkEASmIa2roa2xEV6WkADqyWrok5dt3TOMMHF1fE= github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.15.0+incompatible h1:8KpYO/Xl/ZudZs5RNOEhWMBY4hmzlZhhRd9cu+jrZP4= @@ -458,8 +370,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8/go.mod h1:pmLOTb3x90VhIKxsA9yeQG5yfOkkKnkk1h+Ql8NDYDw= github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -470,19 +380,18 @@ github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwo github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.8.1/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsouza/fake-gcs-server v0.0.0-20180612165233-e85be23bdaa8/go.mod h1:1/HufuJ+eaDf4KTnYdS6HJMGvMRU8d4cYTuu/1QaBbI= github.com/fsouza/fake-gcs-server v1.19.4/go.mod h1:I0/88nHCASqJJ5M7zVF0zKODkYTcuXFW5J5yajsNJnE= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= @@ -514,18 +423,15 @@ github.com/go-logr/zapr v0.1.1/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aA github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.17.2/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.17.2/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.19.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -534,25 +440,21 @@ github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.17.2/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -github.com/go-openapi/runtime v0.17.2/go.mod h1:QO936ZXeisByFmZEO1IS1Dqhtf4QV1sYYFtIq6Ld86Q= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.17.2/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= @@ -567,7 +469,6 @@ github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+Z github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.17.2/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -575,7 +476,6 @@ github.com/go-openapi/swag v0.19.7 h1:VRuXN2EnMSsZdauzdss6JBC29YotDqG59BZ+tdlIL1 github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= github.com/go-openapi/swag v0.19.12 h1:Bc0bnY2c3AoF7Gc+IMIAQQsD8fLHjHpc19wXvYuayQI= github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M= -github.com/go-openapi/validate v0.17.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= @@ -609,7 +509,6 @@ github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6 github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -627,6 +526,7 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -677,16 +577,6 @@ github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAO github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/gomodule/redigo v1.7.0/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= -github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac/go.mod h1:P32wAyui1PQ58Oce/KYkOqQv8cVw1zAapXOl+dRFGbc= -github.com/gonum/diff v0.0.0-20181124234638-500114f11e71/go.mod h1:22dM4PLscQl+Nzf64qNBurVJvfyvZELT0iRW2l/NN70= -github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82/go.mod h1:PxC8OnwL11+aosOB5+iEPoV3picfs8tUpkVd0pDo+Kg= -github.com/gonum/integrate v0.0.0-20181209220457-a422b5c0fdf2/go.mod h1:pDgmNM6seYpwvPos3q+zxlXMsbve6mOIPucUnUOrI7Y= -github.com/gonum/internal v0.0.0-20181124074243-f884aa714029/go.mod h1:Pu4dmpkhSyOzRwuXkOgAvijx4o+4YMUJJo9OvPYMkks= -github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9/go.mod h1:XA3DeT6rxh2EAE789SSiSJNqxPaC0aE9J8NTOI0Jo/A= -github.com/gonum/mathext v0.0.0-20181121095525-8a4bf007ea55/go.mod h1:fmo8aiSEWkJeiGXUJf+sPvuDgEFgqIoZSs843ePKrGg= -github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw= -github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b/go.mod h1:Z4GIJBJO3Wa4gD4vbwQxXXZ+WHmW6E9ixmNrwvs0iZs= -github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -704,16 +594,9 @@ github.com/google/go-containerregistry v0.0.0-20191010200024-a3d713f9b7f8/go.mod github.com/google/go-containerregistry v0.0.0-20200115214256-379933c9c22b/go.mod h1:Wtl/v6YdQxv397EREtzwgd9+Ud7Q5D8XMbi3Zazgkrs= github.com/google/go-containerregistry v0.0.0-20200123184029-53ce695e4179/go.mod h1:Wtl/v6YdQxv397EREtzwgd9+Ud7Q5D8XMbi3Zazgkrs= github.com/google/go-containerregistry v0.0.0-20200331213917-3d03ed9b1ca2/go.mod h1:pD1UFYs7MCAx+ZLShBdttcaOSbyc8F9Na/9IZLNwJeA= -github.com/google/go-containerregistry v0.1.0/go.mod h1:npTSyywOeILcgWqd+rvtzGWflIPPcBQhYoOONaY4ltM= github.com/google/go-containerregistry v0.1.1/go.mod h1:npTSyywOeILcgWqd+rvtzGWflIPPcBQhYoOONaY4ltM= -github.com/google/go-containerregistry v0.1.2/go.mod h1:GPivBPgdAyd2SU+vf6EpsgOtWDuPqjW0hJZt4rNdTZ4= github.com/google/go-containerregistry v0.1.3 h1:vD78UlG9hVJ8DZbUL8uuNco2G1o9eJTA87xR0Y2UX6c= github.com/google/go-containerregistry v0.1.3/go.mod h1:3Wg/Hjgn/ZDxrYYhtzZJWdThOd8zeI2zAmn4oVfm1Wg= -github.com/google/go-containerregistry v0.1.4/go.mod h1:6EGiuQp36pL82lX6rFN0s9AJOVL0Mlgx/DAsYZW5X3s= -github.com/google/go-containerregistry v0.2.0/go.mod h1:Ts3Wioz1r5ayWx8sS6vLcWltWcM1aqFjd/eVrkFhrWM= -github.com/google/go-containerregistry v0.2.1/go.mod h1:Ts3Wioz1r5ayWx8sS6vLcWltWcM1aqFjd/eVrkFhrWM= -github.com/google/go-containerregistry v0.3.0 h1:+vqpHdgIbD7xSeufHJq0iuAx7ILcEeh3fR5Og2nW1R0= -github.com/google/go-containerregistry v0.3.0/go.mod h1:BJ7VxR1hAhdiZBGGnvGETHEmFs1hzXc4VM1xjOPO9wA= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v27 v27.0.6/go.mod h1:/0Gr8pJ55COkmv+S/yPKCczSkUPIM/LnFyubufRNIS0= github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= @@ -724,7 +607,6 @@ github.com/google/go-licenses v0.0.0-20200602185517-f29a4c695c3d/go.mod h1:g1VOU github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -755,12 +637,15 @@ github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/googleapis/gax-go v2.0.2+incompatible h1:silFMLAnr330+NRuag/VjIGF7TLp/LBrV2CJKFLWEww= github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= @@ -769,12 +654,7 @@ github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJ github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= github.com/googleapis/gnostic v0.4.0 h1:BXDUo8p/DaxC+4FJY/SSx3gvnx9C1VdHNgaUkiEL5mk= github.com/googleapis/gnostic v0.4.0/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= -github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I= -github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/gnostic v0.5.3 h1:2qsuRm+bzgwSIKikigPASa2GhW8H2Dn4Qq7UxD8K/48= github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= -github.com/gophercloud/gophercloud v0.0.0-20190117043839-e340f5f89555/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= -github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/goreleaser/goreleaser v0.136.0/go.mod h1:wiKrPUeSNh6Wu8nUHxZydSOVQ/OZvOaO7DTtFqie904= @@ -798,15 +678,11 @@ github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.m github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= -github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.4.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= @@ -816,6 +692,7 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.12.2/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= +github.com/grpc-ecosystem/grpc-gateway v1.14.8 h1:hXClj+iFpmLM8i3lkO6i4Psli4P2qObQuQReiII26U8= github.com/grpc-ecosystem/grpc-gateway v1.14.8/go.mod h1:NZE8t6vs6TnwLL/ITkaK8W3ecMLGAbh2jXTclvpiwYo= github.com/h2non/gock v1.0.9/go.mod h1:CZMcB0Lg5IWnr9bF79pPMg9WeV6WumxQiUJ1UvdO1iE= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= @@ -823,6 +700,7 @@ github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoP github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -831,6 +709,7 @@ github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= @@ -846,6 +725,7 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= @@ -860,11 +740,12 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb v0.0.0-20161215172503-049f9b42e9a5/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a/go.mod h1:9GkyshztGufsdPQWjH+ifgnIr3xNUL5syI70g2dzU1o= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= @@ -886,17 +767,16 @@ github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -912,6 +792,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kelseyhightower/envconfig v1.3.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= +github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -938,6 +819,7 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -945,11 +827,13 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lightstep/tracecontext.go v0.0.0-20181129014701-1757c391b1ac h1:+2b6iGRJe3hvV/yVXrd41yVEjxuFHxasJqDhkIjS4gk= github.com/lightstep/tracecontext.go v0.0.0-20181129014701-1757c391b1ac/go.mod h1:Frd2bnT3w5FB5q49ENTfVlztJES+1k/7lyWX2+9gq/M= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -992,16 +876,16 @@ github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb44 github.com/mattn/go-zglob v0.0.2/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.0/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mholt/archiver/v3 v3.3.0/go.mod h1:YnQtqsp+94Rwd0D/rk5cnLrxusUBUXg+08Ebtr1Mqao= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.17/go.mod h1:WgzbA6oji13JREwiNsRDNfl7jYdPnmz+VEuLrA+/48M= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -1011,13 +895,13 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e/go.mod h1:waEya8ee1Ro/lgxpVhkJI4BVASzkm3UZqkx/cFJiYHM= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.3.1 h1:cCBH2gTD2K0OtLlv/Y5H01VQCqmlDxz30kS5Y5bqfLA= github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -1031,7 +915,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= -github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= github.com/nats-io/gnatsd v1.4.1/go.mod h1:nqco77VO78hLCJpIcVfygDP2rPGfsEHkGTUk94uh5DQ= github.com/nats-io/go-nats v1.7.0/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= @@ -1046,8 +929,10 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/octago/sflags v0.2.0/go.mod h1:G0bjdxh4qPRycF74a2B8pU36iTp9QHGx0w0dFZXPt80= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= @@ -1062,9 +947,9 @@ github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= +github.com/onsi/ginkgo v1.12.1 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1072,12 +957,12 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= @@ -1094,6 +979,7 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ github.com/openzipkin/zipkin-go v0.2.0/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYEJTQzU= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= @@ -1108,6 +994,7 @@ github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtb github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.3.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= +github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw= github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= @@ -1123,7 +1010,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= @@ -1141,6 +1028,7 @@ github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeD github.com/prometheus/client_golang v1.5.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.8.0 h1:zvJNkoCFAnYFNC24FV8nW4JdRJ3GIFcLbg65lL/JDcw= github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -1149,6 +1037,7 @@ github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1: github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= @@ -1164,6 +1053,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20180612222113-7d6f385de8be/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1180,14 +1070,15 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/prometheus/procfs v0.0.10/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/statsd_exporter v0.15.0 h1:UiwC1L5HkxEPeapXdm2Ye0u1vUJfTj7uwT5yydYpa1E= github.com/prometheus/statsd_exporter v0.15.0/go.mod h1:Dv8HnkoLQkeEjkIE4/2ndAA7WL1zHKK7WMqFQqu72rw= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8/go.mod h1:CGFX09Ci3pq9QZdj86B+VGIdNj4VyCo2iPOGS9esB/k= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190706150252-9beb055b7962/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -1238,34 +1129,38 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:s github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= -github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1275,12 +1170,13 @@ github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25/go.mod h1:lbP8t github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= @@ -1288,31 +1184,7 @@ github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0 github.com/tektoncd/pipeline v0.8.0/go.mod h1:IZzJdiX9EqEMuUcgdnElozdYYRh0/ZRC+NKMLj1K3Yw= github.com/tektoncd/pipeline v0.10.1/go.mod h1:D2X0exT46zYx95BU7ByM8+erpjoN7thmUBvlKThOszU= github.com/tektoncd/pipeline v0.11.0/go.mod h1:hlkH32S92+/UODROH0dmxzyuMxfRFp/Nc3e29MewLn8= -github.com/tektoncd/pipeline v0.11.3 h1:OY7uaW784XgA3F9Ee/wWyd67/Ixt6jPCiXWCao9v0HI= -github.com/tektoncd/pipeline v0.11.3/go.mod h1:hlkH32S92+/UODROH0dmxzyuMxfRFp/Nc3e29MewLn8= -github.com/tektoncd/pipeline v0.12.0/go.mod h1:FLppx3k2Xlk8bsEYvlnp/wz3SK07rMFk4vaSAI6aTCM= -github.com/tektoncd/pipeline v0.12.1/go.mod h1:FLppx3k2Xlk8bsEYvlnp/wz3SK07rMFk4vaSAI6aTCM= -github.com/tektoncd/pipeline v0.13.0/go.mod h1:jISolc5UsC2R9qKKiS96TvebwAW2Ihue3SXSGS1nECM= github.com/tektoncd/pipeline v0.13.1-0.20200625065359-44f22a067b75/go.mod h1:R5AlT46x/F8n/pFJFjZ1U1q71GWtVXgG7RZkkoRL554= -github.com/tektoncd/pipeline v0.13.1/go.mod h1:jISolc5UsC2R9qKKiS96TvebwAW2Ihue3SXSGS1nECM= -github.com/tektoncd/pipeline v0.13.2/go.mod h1:jISolc5UsC2R9qKKiS96TvebwAW2Ihue3SXSGS1nECM= -github.com/tektoncd/pipeline v0.14.0/go.mod h1:AAEx5IFwl7+2xHMaEqVZkzs0eTwZqCm97mYFseDMG4Y= -github.com/tektoncd/pipeline v0.14.1/go.mod h1:AAEx5IFwl7+2xHMaEqVZkzs0eTwZqCm97mYFseDMG4Y= -github.com/tektoncd/pipeline v0.14.2/go.mod h1:AAEx5IFwl7+2xHMaEqVZkzs0eTwZqCm97mYFseDMG4Y= -github.com/tektoncd/pipeline v0.14.3/go.mod h1:AAEx5IFwl7+2xHMaEqVZkzs0eTwZqCm97mYFseDMG4Y= -github.com/tektoncd/pipeline v0.15.0/go.mod h1:SaAxUpYbcFik2hKGOTX7NnvOa1VXTzXRGNZsY2TSwTs= -github.com/tektoncd/pipeline v0.15.1/go.mod h1:SaAxUpYbcFik2hKGOTX7NnvOa1VXTzXRGNZsY2TSwTs= -github.com/tektoncd/pipeline v0.15.2/go.mod h1:SaAxUpYbcFik2hKGOTX7NnvOa1VXTzXRGNZsY2TSwTs= -github.com/tektoncd/pipeline v0.16.0/go.mod h1:5vn2IJH46ntWTKLkwNbtZNd38FYkNP0cBtu5sgqm5xA= -github.com/tektoncd/pipeline v0.16.1/go.mod h1:5vn2IJH46ntWTKLkwNbtZNd38FYkNP0cBtu5sgqm5xA= -github.com/tektoncd/pipeline v0.16.2/go.mod h1:5vn2IJH46ntWTKLkwNbtZNd38FYkNP0cBtu5sgqm5xA= -github.com/tektoncd/pipeline v0.16.3/go.mod h1:5vn2IJH46ntWTKLkwNbtZNd38FYkNP0cBtu5sgqm5xA= -github.com/tektoncd/pipeline v0.17.0/go.mod h1:RbS1SgDhFSGB0seQvk15HY36yu0ULD2uBxizwAmPj5I= -github.com/tektoncd/pipeline v0.17.1/go.mod h1:RbS1SgDhFSGB0seQvk15HY36yu0ULD2uBxizwAmPj5I= -github.com/tektoncd/pipeline v0.17.2/go.mod h1:RbS1SgDhFSGB0seQvk15HY36yu0ULD2uBxizwAmPj5I= -github.com/tektoncd/pipeline v0.17.3/go.mod h1:RbS1SgDhFSGB0seQvk15HY36yu0ULD2uBxizwAmPj5I= -github.com/tektoncd/pipeline v0.18.0/go.mod h1:PxRWs4faBD15pG0EGQs3f/65hX97sMjjqtiKG3JY2rk= -github.com/tektoncd/pipeline v0.18.1/go.mod h1:PxRWs4faBD15pG0EGQs3f/65hX97sMjjqtiKG3JY2rk= github.com/tektoncd/pipeline v0.19.0 h1:rJOFe5kxKjKyDKILKXcdQx6NKhQOz7BgIirOAa31ulw= github.com/tektoncd/pipeline v0.19.0/go.mod h1:fcbDwrxMGybeaLFFAVq6bhaM/fvJDMRxQ4IZDJkiGo0= github.com/tektoncd/plumbing v0.0.0-20191216083742-847dcf196de9/go.mod h1:QZHgU07PRBTRF6N57w4+ApRu8OgfYLFNqCDlfEZaD9Y= @@ -1333,9 +1205,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= -github.com/tsenart/go-tsz v0.0.0-20180814232043-cdeb9e1e981e/go.mod h1:SWZznP1z5Ki7hDT2ioqiFKEse8K9tU2OUvaRI0NeGQo= github.com/tsenart/vegeta v12.7.1-0.20190725001342-b5f4fca92137+incompatible/go.mod h1:Smz/ZWfhKRcyDDChZkG3CyTHdj87lHzio/HOCkbndXM= -github.com/tsenart/vegeta/v12 v12.8.4/go.mod h1:ZiJtwLn/9M4fTPdMY7bdbIeyNeFVE8/AHbWFqCsUuho= github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= @@ -1348,16 +1218,14 @@ github.com/urfave/cli v1.18.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vdemeester/k8s-pkg-credentialprovider v0.0.0-20200107171650-7c61ffa44238/go.mod h1:JwQJCMWpUDqjZrB5jpw0f5VbN7U95zxFy1ZDpoEarGo= github.com/vdemeester/k8s-pkg-credentialprovider v1.13.12-1/go.mod h1:Fko0rTxEtDW2kju5Ky7yFJNS3IcNvW8IPsp4/e9oev0= -github.com/vdemeester/k8s-pkg-credentialprovider v1.13.12/go.mod h1:Fko0rTxEtDW2kju5Ky7yFJNS3IcNvW8IPsp4/e9oev0= github.com/vdemeester/k8s-pkg-credentialprovider v1.17.4/go.mod h1:inCTmtUdr5KJbreVojo06krnTgaeAz/Z7lynpPk/Q2c= -github.com/vdemeester/k8s-pkg-credentialprovider v1.18.0/go.mod h1:inCTmtUdr5KJbreVojo06krnTgaeAz/Z7lynpPk/Q2c= -github.com/vdemeester/k8s-pkg-credentialprovider v1.18.1-0.20201019120933-f1d16962a4db/go.mod h1:grWy0bkr1XO6hqbaaCKaPXqkBVlMGHYG6PGykktwbJc= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= @@ -1400,36 +1268,36 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4-0.20200608061201-1901b56b9515/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.3.0/go.mod h1:9CWT6lKIep8U41DDaPiH6eFscnTyjfTANNQNx6LrIcA= -go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.9.2-0.20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= +go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1445,7 +1313,6 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1460,15 +1327,11 @@ golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= @@ -1491,6 +1354,7 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -1500,6 +1364,7 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1527,14 +1392,12 @@ golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1557,8 +1420,6 @@ golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 h1:lwlPPsmjDKK0J6eG6xDWd5XPehI0R024zxjDnw3esPA= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1583,6 +1444,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1655,7 +1517,6 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200802091954-4b90ce9b60b3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1663,7 +1524,6 @@ golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 h1:kzM6+9dur93BcC2kVlYl34cHU+TYZLanmpSJHVMmL64= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1678,12 +1538,10 @@ golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fq golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1703,7 +1561,6 @@ golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -1727,7 +1584,6 @@ golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDq golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190807223507-b346f7fd45de/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1797,19 +1653,18 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58 h1:1Bs6RVeBFtLZ8Yi1Hk07DiOqzvwLD/4hln4iahvFlag= golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k= gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181021000519-a2651947f503/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= @@ -1838,6 +1693,7 @@ google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSr google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo= google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0 h1:l2Nfbl2GPXdWorv+dT2XfinX2jOOw4zv1VhLstx+6rE= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1851,7 +1707,6 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= -google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180608181217-32ee49c4dd80/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -1909,9 +1764,9 @@ google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201211151036-40ec1c210f7a h1:GnJAhasbD8HiT8DZMvsEx3QLVy/X0icq/MGr0MqRJ2M= google.golang.org/genproto v0.0.0-20201211151036-40ec1c210f7a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -1936,6 +1791,7 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1949,46 +1805,44 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/evanphx/json-patch.v4 v4.9.0 h1:T7W7A7+DTEpLTC11pkf8yfaeRfqhRj/gOPf+LtaJdNY= -gopkg.in/evanphx/json-patch.v4 v4.9.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.46.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.52.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.56.0 h1:DPMeDvGTM54DXbPkVIZsp19fp/I2K7zwA/itHYHKo8Y= gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5/go.mod h1:hiOFpYm0ZJbusNj2ywpbrXowU3G8U6GIQzqn2mw1UIE= -gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -2003,6 +1857,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= helm.sh/helm/v3 v3.1.1/go.mod h1:WYsFJuMASa/4XUqLyv54s0U/f3mlAaRErGmyy4z921g= @@ -2015,673 +1870,48 @@ honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20180904230853-4e7be11eab3f/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/api v0.0.0-20181018013834-843ad2d9b9ae/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2/go.mod h1:AOxZTnaXR/xiarlQL0JUfwQPxjmKDvVYoRp58cA7lUo= -k8s.io/api v0.0.0-20191016225839-816a9b7df678/go.mod h1:LZQaT8MvVpl7Bg2lYFcQm7+Mpdxq8p1NFl3yh+5DCwY= -k8s.io/api v0.16.4/go.mod h1:AtzMnsR45tccQss5q8RnF+W8L81DH6XwXwo/joEx9u0= -k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI= -k8s.io/api v0.17.2/go.mod h1:BS9fjjLc4CMuqfSO8vgbHPKMt5+SF0ET6u/RVDihTo4= -k8s.io/api v0.17.3-beta.0/go.mod h1:II7E2nD74NziEP/I5++IpJ/E4xAnLSVSxsWjEY7nTJc= -k8s.io/api v0.17.3/go.mod h1:YZ0OTkuw7ipbe305fMpIdf3GLXZKRigjtZaV5gzC2J0= -k8s.io/api v0.17.4-beta.0/go.mod h1:GvrPCgJXMjQy7jNXQyJTEtLb97iKYOPIRHf12YpPgsg= -k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA= -k8s.io/api v0.17.5-beta.0/go.mod h1:KZb7OowZyrErfJIgFiNbvk8Mz27wiFdZJzgoOg3Ij3k= -k8s.io/api v0.17.5/go.mod h1:0zV5/ungglgy2Rlm3QK8fbxkXVs+BSJWpJP/+8gUVLY= -k8s.io/api v0.17.6-beta.0/go.mod h1:VidxcyvUtKF2+Hul10U4/nUiefO2ZPcMffUpPx0a6F4= -k8s.io/api v0.17.6/go.mod h1:1jKVwkj0UZ4huak/yRt3MFfU5wc32+B41SkNN5HhyFg= -k8s.io/api v0.17.7-rc.0/go.mod h1:ylnUb15MgHL9hzVShVmym+vvrXhkYVsGVlqjPxedP58= -k8s.io/api v0.17.7/go.mod h1:xL40O2BS4IEyvZVKVh6oaN4K5R5ndH8t42Rr7XL+C0k= -k8s.io/api v0.17.8-rc.0/go.mod h1:AnpAXGklERRY50EbG3baxDiKr72a+94ApCWAFVSojyQ= -k8s.io/api v0.17.8-rc.1/go.mod h1:HgC33khAe/osb86ep3PTIgtmqqWA41WwgADVhuOGDQ8= -k8s.io/api v0.17.8/go.mod h1:N++Llhs8kCixMUoCaXXAyMMPbo8dDVnh+IQ36xZV2/0= -k8s.io/api v0.17.9-rc.0/go.mod h1:JlKbuA7pzfQVmJhdY2Z+a2KR2cS3abaBdLdFIYJ1NUk= -k8s.io/api v0.17.9/go.mod h1:avJJAA1fSV6tnbCGW2K+S+ilDFW7WpNr5BScoiZ1M1U= -k8s.io/api v0.17.10-rc.0/go.mod h1:DwrX2XljKQ5ifuFHDbLkaaobHSwW1glSnKRHviIyhYA= -k8s.io/api v0.17.11-rc.1/go.mod h1:8XDtkuh8rrHC4uPmjT8VNPps46zzKvzYXAz1UTMokxQ= -k8s.io/api v0.17.11/go.mod h1:WR3CbTwCAxtfMcEB6c92W3l5aZw09unPCyxmxjYV3xg= -k8s.io/api v0.17.12-rc.0/go.mod h1:UXYfialmd0wmZ1e4UssTp444nISVaGSIajaPJq7qh2o= -k8s.io/api v0.17.12/go.mod h1:pG/E+xpC8mqNPbX81gMa88MH2ER158ucSmWbSa3249w= -k8s.io/api v0.17.13-rc.0/go.mod h1:FiXcL++zwI/v4mTi3WO+nTwQU5SBWaKL9ecdmMDfPag= -k8s.io/api v0.17.13/go.mod h1:BXoqukCVV3sKdK6E2dBxC8aIKxftVRrpyd92HY3Qyjg= -k8s.io/api v0.17.14-rc.0/go.mod h1:A+rWg9K29YoZJYpKqdIT288cwBm20ekIJoZMSnGkflg= -k8s.io/api v0.17.14/go.mod h1:pjv1T5ozRyCkLvZt6BJL92CZ6WZ1hmI6GcxlU0Oy+q4= -k8s.io/api v0.17.15-rc.0/go.mod h1:/ytjBc3LMjrfAYJUTs34qosp2/4NFaP9Vxnh6yG/Qu8= -k8s.io/api v0.17.15/go.mod h1:mCepU58Bb3HpTKL9PsivAEq7oeWHTj9eK2Drst9gPKU= -k8s.io/api v0.17.16-rc.0/go.mod h1:XyYtEl+zHQ2W+YBpPLglaNAGpnnIaz4KvE6gQcV/SkQ= -k8s.io/api v0.17.16-rc.1/go.mod h1:00rDqaz6Cv4wiW11qZa22unUX5F20F1uFIwTrL7mbOE= -k8s.io/api v0.17.16/go.mod h1:W8uKRxJeYRlAbWuk4CZv6BzuC7KuZnB6bSTPI7Pi8no= -k8s.io/api v0.17.17-rc.0/go.mod h1:/uxPxld5lyQO2k5kx7S6L942SjI3I4P8rLKevpg6w+I= -k8s.io/api v0.18.0-alpha.1/go.mod h1:X82bXHlVEfxpVA9rO5PMaSOdQ+VdlSjT9A2Tl/CWL4A= -k8s.io/api v0.18.0-alpha.2/go.mod h1:jmDzGjASmjc+X3sojto6zy8iHsZEpgdnqHz0aWfRTEg= -k8s.io/api v0.18.0-alpha.4/go.mod h1:SvC64HywGrMEvfBPw7FcGXhoKTBfkFrpbuCoS2/gdiA= -k8s.io/api v0.18.0-alpha.5/go.mod h1:4R9YKKdSnQmR4J01O1TXy0QMouQ6r46A+9kwfhV7rZk= -k8s.io/api v0.18.0-beta.0/go.mod h1:VrRplS6LnRDM5Iq8CeqbtMAaAGU2iZDEoO3qNUe32FQ= -k8s.io/api v0.18.0-beta.1/go.mod h1:NcLIcCLuI/dH9R6reQzXe8l3GZMBqYyV7IpCg8ELWNw= -k8s.io/api v0.18.0-beta.2/go.mod h1:2oeNnWEqcSmaM/ibSh3t7xcIqbkGXhzZdn4ezV9T4m0= -k8s.io/api v0.18.0-rc.1/go.mod h1:ZOh6SbHjOYyaMLlWmB2+UOQKEWDpCnVEVpEyt7S2J9s= -k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= -k8s.io/api v0.18.1-beta.0/go.mod h1:xZ5sMb6uqkZxXjcN6D2st2inR6dSqMs935Na0rw/1h4= -k8s.io/api v0.18.1/go.mod h1:3My4jorQWzSs5a+l7Ge6JBbIxChLnY8HnuT58ZWolss= -k8s.io/api v0.18.2-beta.0/go.mod h1:OdO5IPycJkPS91wMkDJJd/yfJpgZukVaxs0MA20Wn6g= -k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= -k8s.io/api v0.18.3-beta.0/go.mod h1:ss0kLYOZJc/0IkQJRi4KutkuOa4a2w91yFcZj/DV22g= -k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA= -k8s.io/api v0.18.4-rc.0/go.mod h1:k05vFzymTGPDymkDoL4/FALcKTydjJmijhvliMpK6JU= -k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= -k8s.io/api v0.18.5-rc.0/go.mod h1:Sen2GNymkPj7QZoPmUNns4ElqshVZynpXpPtDUeSBuM= -k8s.io/api v0.18.5-rc.1/go.mod h1:hRmX4oMFIKdJ8869BD7Hge7SzwFWXcUVC64i1JRD68I= -k8s.io/api v0.18.5/go.mod h1:tN+e/2nbdGKOAH55NMV8oGrMG+3uRlA9GaRfvnCCSNk= -k8s.io/api v0.18.6-rc.0/go.mod h1:uLQmuEFg2FndhM1SpSgW1gG8m0Z6jM1D/7Tg83cYX+8= -k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= -k8s.io/api v0.18.7-rc.0/go.mod h1:v6x7KyKMJ7W/BbG7E9olOQshfszuXKKsxfnjaq+ylrk= -k8s.io/api v0.18.8-rc.1/go.mod h1:eX11THMqPFgbXzU+LxSdZowitGbqvV9QVQHlCJSYfgU= k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/api v0.18.9-rc.0/go.mod h1:32vFAuLAX89RZVkp4GtXk81UEzc/lDGxAYghfu8qFEI= -k8s.io/api v0.18.9/go.mod h1:9u/h6sUh6FxfErv7QqetX1EB3yBMIYOBXzdcf0Gf0rc= -k8s.io/api v0.18.10-rc.0/go.mod h1:+/nAEryKg7rREk9NaRCGstia/6qH7sR6epIIIDu04O0= -k8s.io/api v0.18.10/go.mod h1:xWtwPX1v47j5RTncmlMFGCx8b0avh+nP8OgZZ9hjo3M= -k8s.io/api v0.18.11-rc.0/go.mod h1:DXCaizV44luS4r/QWNPC0fellTA9I46FI+uDb8MKlhU= -k8s.io/api v0.18.12-rc.1/go.mod h1:hSr74GZPEmD/uOftWpIJvkJULI4QhYSdc6zelqZbs7I= -k8s.io/api v0.18.12 h1:97X6znOXMVgCKivTAgpBXGBGlCe3gbM++yFdldgBCaE= -k8s.io/api v0.18.12/go.mod h1:3sS78jmUoGHwERyMbEhxP6owcQ77UxGo+Yy+dKNWrh0= -k8s.io/api v0.19.0-alpha.1 h1:pPa0Q8CMoKhh4SeF9S+ycNbpSkrjI2NBWxFgOg5kHfs= -k8s.io/api v0.19.0-alpha.1/go.mod h1:fNr5XDW1/+18jRxdpIGIdL8AeDhv/8y7jmMGTpIdAoA= -k8s.io/api v0.19.0-alpha.2/go.mod h1:ujOZQ0qV79Ae02qAditrRXodlKq4GMe7khc3uS2hhEw= -k8s.io/api v0.19.0-alpha.3/go.mod h1:W/NfI00K9E3/pXwbly0FrdxxtjIjUs/v4m3Li5pT3J8= -k8s.io/api v0.19.0-beta.0/go.mod h1:6NPoy+1qu2rrljjwWauQMCxWpN1/VfhYnwCB6EB8Mn4= -k8s.io/api v0.19.0-beta.1/go.mod h1:aZcY31HnWwA9OGlx1K9jTTG0gD7hXXLwzpIVn1Td1gw= -k8s.io/api v0.19.0-beta.2/go.mod h1:LgaR0+wwwUQzSn968ds/S5cabkwptRrQB1VKZYB1zZg= -k8s.io/api v0.19.0-rc.0/go.mod h1:WBGMHEmngOdQBAvJiYUgP5mGDdCWXM52yDm1gtos8C0= -k8s.io/api v0.19.0-rc.1/go.mod h1:NdiA9gl+9BuvhHU0WfqE5A7SrA4iO5TrmRE0caDteuA= -k8s.io/api v0.19.0-rc.2/go.mod h1:9nHeM2gbqeaL7yN6UFvOxKzLG5gZ4v+DJ6bpavDetZo= -k8s.io/api v0.19.0-rc.3/go.mod h1:hfDN4tL/yqfs4aVrlvx2vNMhKACfoiTyGSvVnygqSd4= -k8s.io/api v0.19.0-rc.4/go.mod h1:1xlMhKahfl3bVAn1T1PhMriUVYwRNJ7D8YMDnUz/yGw= -k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw= -k8s.io/api v0.19.1-rc.0/go.mod h1:T5DSfVHz1QXbjy7ezqThvoKt7j+goH0ltauR0oz4BGM= -k8s.io/api v0.19.1/go.mod h1:+u/k4/K/7vp4vsfdT7dyl8Oxk1F26Md4g5F26Tu85PU= -k8s.io/api v0.19.2-rc.0/go.mod h1:GOfZBLBzYQ228kgdElkfOSQ0eM8jeInXsVLF1PY0h70= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= -k8s.io/api v0.19.3-rc.0/go.mod h1:DKdstFCtFSLs5mvfUtRXinQi7WSDos1sNMhHHSlRgIY= -k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= -k8s.io/api v0.19.4-rc.0/go.mod h1:DYO54ygnWnKSvSeY4fLIisjCdHqhLdlYBHF2GCMm3bc= -k8s.io/api v0.19.4/go.mod h1:SbtJ2aHCItirzdJ36YslycFNzWADYH3tgOhvBEFtZAk= -k8s.io/api v0.19.5-rc.0/go.mod h1:LXjwJ6bXO1A/5qwIyTuxOUXlomNguRwk9sQhuZhQWJw= -k8s.io/api v0.19.5/go.mod h1:yGZReuNa0vj56op6eT+NLrXJne0R0u9ktexZ8jdJzpc= -k8s.io/api v0.19.6-rc.0/go.mod h1:tlVO/sdyZpLCHwXf1BprD1ifaYoW37EiFOeOuQzmmU8= -k8s.io/api v0.19.6-rc.1/go.mod h1:HOtBdTiGKi4jaLHjHZg9HY9uOORtdfM0J4/VHbGiOFg= -k8s.io/api v0.19.6/go.mod h1:Plxx44Nh4zVblkJrIgxVPgPre1mvng6tXf1Sj3bs0fU= -k8s.io/api v0.19.7-rc.0/go.mod h1:vQ5qPWPKZP1pvbKGYnkQKvwjaQKPJGg4GJ7OwvuX1c0= -k8s.io/api v0.20.0-alpha.0/go.mod h1:FohhHrEf/7kGF1VsCUiYMIBYx8bFyFpBNMrwJE2bUpo= -k8s.io/api v0.20.0-alpha.1/go.mod h1:3rRBn8WYhCl80g0iWiNj0RjkdorSt3LrPznlQ3C4e4M= -k8s.io/api v0.20.0-alpha.2/go.mod h1:+41r16PlP/A1NmXUsIYBilRIRhdxwrfzAeDyfeiI4i4= -k8s.io/api v0.20.0-alpha.3/go.mod h1:moBe4pkvOlCXRnxx1b19LDW+jmT2V2HN4HF31wb0JyU= -k8s.io/api v0.20.0-beta.0/go.mod h1:YFrlsXNhmQ8LhXq3Ri22Yn6njDRqjbyn65hrdgT9gIE= -k8s.io/api v0.20.0-beta.1/go.mod h1:QJBLJQoMZet8G22ON9BdnU476l0wSvuTBdDElv4OOaw= -k8s.io/api v0.20.0-beta.2/go.mod h1:GYLMpsvdRvB+u1feyZEqein68bklcyxaFnDYCvdHeJI= -k8s.io/api v0.20.0-rc.0/go.mod h1:TZGvMxsQZeBZGKMy/829njHkd9HmnW0LWYhY3IVAoKs= -k8s.io/api v0.20.0/go.mod h1:HyLC5l5eoS/ygQYl1BXBgFzWNlkHiAuyNAbevIn+FKg= -k8s.io/api v0.20.1-rc.0/go.mod h1:cZWaRGhRF8bqAQLMlxTkOxixahnjiUNai0dohb91gts= -k8s.io/api v0.20.1-rc.1/go.mod h1:N9jIfHHP1QaO5ntclKoWcajZPeWjJVjAvHXzmlglUyo= -k8s.io/api v0.20.1 h1:ud1c3W3YNzGd6ABJlbFfKXBKXO+1KdGfcgGGNgFR03E= -k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= -k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604/go.mod h1:7H8sjDlWQu89yWB3FhZfsLyRCRLuoXoCoY5qtwW1q6I= -k8s.io/apiextensions-apiserver v0.16.4/go.mod h1:HYQwjujEkXmQNhap2C9YDdIVOSskGZ3et0Mvjcyjbto= -k8s.io/apiextensions-apiserver v0.17.2/go.mod h1:4KdMpjkEjjDI2pPfBA15OscyNldHWdBCfsWMDWAmSTs= -k8s.io/apiextensions-apiserver v0.17.3-beta.0/go.mod h1:Q5Lyewxl3AQAbJRnKyFOWmwxUatTvyDRBbJ3ewMsgm4= -k8s.io/apiextensions-apiserver v0.17.3/go.mod h1:CJbCyMfkKftAd/X/V6OTHYhVn7zXnDdnkUjS1h0GTeY= -k8s.io/apiextensions-apiserver v0.17.4-beta.0/go.mod h1:kFrCjhzJWXDbZX6ZEH50Io8CR8jCw31sNVYcO5M9NQw= -k8s.io/apiextensions-apiserver v0.17.4/go.mod h1:rCbbbaFS/s3Qau3/1HbPlHblrWpFivoaLYccCffvQGI= -k8s.io/apiextensions-apiserver v0.17.5-beta.0/go.mod h1:DBctYQMvRAEa9KM1sV8fV0yIrMQFJ8+meUhA02HRKPE= -k8s.io/apiextensions-apiserver v0.17.5/go.mod h1:Up8qgvIy2v9521+YBhg7fhVtd4jgh/1MjotWr5GvOn4= -k8s.io/apiextensions-apiserver v0.17.6-beta.0/go.mod h1:evMEE5bDUOM+tlqnkdJWEXobPbA7luQCHf8dW+FBW6o= -k8s.io/apiextensions-apiserver v0.17.6/go.mod h1:Z3CHLP3Tha+Rbav7JR3S+ye427UaJkHBomK2c4XtZ3A= -k8s.io/apiextensions-apiserver v0.17.7-rc.0/go.mod h1:at46x60lb+uWCJCpFVW2nncVSRCEIaWsrCT/VhYIsyI= -k8s.io/apiextensions-apiserver v0.17.7/go.mod h1:EKjjclxeShy9HP7VxJrvC47dlLPOc7anjH4KOZZbld0= -k8s.io/apiextensions-apiserver v0.17.8-rc.0/go.mod h1:VcGJHzIzdUESwaIIcAyZvNLFE89ELF9ye0dP3HDIjXg= -k8s.io/apiextensions-apiserver v0.17.8-rc.1/go.mod h1:ZDWCKxqFFtOs0pw/sLkyaAHp6/bZYMRCw8/s9qg8iQg= -k8s.io/apiextensions-apiserver v0.17.8/go.mod h1:5H/i0XiKizIE9SkoAQaU/ou31JJBIffbsT0ALA18GmE= -k8s.io/apiextensions-apiserver v0.17.9-rc.0/go.mod h1:KB2ESadmvHlb/bu2JbR8eKH+AeSAV6KCzjYSoccuO+Y= -k8s.io/apiextensions-apiserver v0.17.9/go.mod h1:p2C9cDflVAUPMl5/QOMHxnSzQWF/cDqu7AP2KUXHHMA= -k8s.io/apiextensions-apiserver v0.17.10-rc.0/go.mod h1:kPG6FL6R19Rv4MlvDMBRl4S6Uqibt6heeRfppL131cw= -k8s.io/apiextensions-apiserver v0.17.11-rc.1/go.mod h1:p0XwvEwk08vj/vdvCdrwq54ceuJswQQwSzCoCCAb6Dg= -k8s.io/apiextensions-apiserver v0.17.11/go.mod h1:aMzH3Efc2Cs94vNV4IxqgEmxs50drRArgtHQZ3y/SvI= -k8s.io/apiextensions-apiserver v0.17.12-rc.0/go.mod h1:7IdnlIypKsWwxytEYUYdKp9LMnLik41hCGQ2IwWufIQ= -k8s.io/apiextensions-apiserver v0.17.12/go.mod h1:GDmtIIBxRlXnNIaNNv5nVd3qf18PUK+Ieq1hJgBMnIY= -k8s.io/apiextensions-apiserver v0.17.13-rc.0/go.mod h1:ztL3NkreKO/OFhZfjtDHgprCp1JGeRHPSdfu22muiO4= -k8s.io/apiextensions-apiserver v0.17.13/go.mod h1:zCLoT+tHrvPifiEozO6bFTkCT95qqBeETk/hVVW/DSM= -k8s.io/apiextensions-apiserver v0.17.14-rc.0/go.mod h1:tySE7P4kRSXJY9l9ZX0+qbpb+maItggzzRt5nMFnxCA= -k8s.io/apiextensions-apiserver v0.17.14/go.mod h1:FQTqaKnKFMZ4FUqU+aqS87200hyGmloVPwgME63Drv0= -k8s.io/apiextensions-apiserver v0.17.15-rc.0/go.mod h1:iAq1w8jCC46d8bS1tUEis3lN5nMZFsGNtz8oA4Cb/mk= -k8s.io/apiextensions-apiserver v0.17.15/go.mod h1:Qk6xT8Lbb88c9reVVWUrQJWwk24iutKH3xWd1iAXvSI= -k8s.io/apiextensions-apiserver v0.17.16-rc.0/go.mod h1:eMc87x5GETw2MNH2hTnFFAdu00Kl8gAPoq577SoIEgs= -k8s.io/apiextensions-apiserver v0.17.16-rc.1/go.mod h1:vsFu2lvRLU+WUYB3a0UJU0ofeh1Wg1rX2pN7ZN5KrOg= -k8s.io/apiextensions-apiserver v0.17.16/go.mod h1:fQ+PyS9msS5qaRYpa0wRj40S5xIrcvwlAtvqoyW1o7M= -k8s.io/apiextensions-apiserver v0.17.17-rc.0/go.mod h1:U4aUvN5cZbxH+/pV0P/JO55OFJNLnWVg7LHDTWedp4U= -k8s.io/apiextensions-apiserver v0.18.0-alpha.1/go.mod h1:g1h5y0Re59B1O/UJez/d4hQfr3G3aV8e9GUEp5NWZL4= -k8s.io/apiextensions-apiserver v0.18.0-alpha.2/go.mod h1:PgDaS5AD5Qhe+mkJuewsDkAolPlghm1dweXUYlMItzA= -k8s.io/apiextensions-apiserver v0.18.0-alpha.4/go.mod h1:8QHdezGnyv47oTlOOoAzDv49FWERocrdiNYCgdYd9Hc= -k8s.io/apiextensions-apiserver v0.18.0-alpha.5/go.mod h1:q00Pi9OxTn5DBvNxo2IGKxxpLuuI14VdnkpHUxTGSw8= -k8s.io/apiextensions-apiserver v0.18.0-beta.0/go.mod h1:ovprH8MtmM6FthdCga/HQ/7P0fjvisvfH2tZLwJW+8s= -k8s.io/apiextensions-apiserver v0.18.0-beta.1/go.mod h1:3vyrlc6a9W64dUhpkU8NcQstRu8F0lpY2mtVrA5x7Cw= -k8s.io/apiextensions-apiserver v0.18.0-beta.2/go.mod h1:Hnrg5jx8/PbxRbUoqDGxtQkULjwx8FDW4WYJaKNK+fk= -k8s.io/apiextensions-apiserver v0.18.0-rc.1/go.mod h1:U5F8MzX2yXVHRuSKY5xBkS9999/VHu6PJNOInIpVLe4= -k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo= -k8s.io/apiextensions-apiserver v0.18.1-beta.0/go.mod h1:fNV0lAbK2f3LwwgGPqujA1StrUSdyIDYqiURH+oRLw8= -k8s.io/apiextensions-apiserver v0.18.1/go.mod h1:O6BY08Jq7b4AkLNYgbEp4HOqJ0rYkFIMtXLZuBYfGes= -k8s.io/apiextensions-apiserver v0.18.2-beta.0/go.mod h1:rxc8u3Zwmc7LASl5SNlubZOzAOmvYorX/+nluL2q9nA= -k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= -k8s.io/apiextensions-apiserver v0.18.3-beta.0/go.mod h1:f1gtsQAUDzYS//fJFvSUKFgdC+NpzGfjOF/rdLR9tSQ= -k8s.io/apiextensions-apiserver v0.18.3/go.mod h1:TMsNGs7DYpMXd+8MOCX8KzPOCx8fnZMoIGB24m03+JE= -k8s.io/apiextensions-apiserver v0.18.4-rc.0/go.mod h1:7DHvEB3F/7GlRGcguTJrnrttgduc0hR7AgubheNubso= -k8s.io/apiextensions-apiserver v0.18.4/go.mod h1:NYeyeYq4SIpFlPxSAB6jHPIdvu3hL0pc36wuRChybio= -k8s.io/apiextensions-apiserver v0.18.5-rc.0/go.mod h1:m8Za6wsOS0xMWZjeADBlVI0rUE2+NUQmmgrDyMQY2ZI= -k8s.io/apiextensions-apiserver v0.18.5-rc.1/go.mod h1:AuLim3Q7dEPlyce++CaXUsc/NtdKHt+AhJ0y3YThB3Y= -k8s.io/apiextensions-apiserver v0.18.5/go.mod h1:woZ7PkEIMHjhHIyApvOwkGOkBLUYKuet0VWVkPTQ/Fs= -k8s.io/apiextensions-apiserver v0.18.6-rc.0/go.mod h1:zFJcSY89Lc7C0smuPseW+L5ZoC42YQSgAMEPPgdRNzU= -k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= -k8s.io/apiextensions-apiserver v0.18.7-rc.0/go.mod h1:bxxYao83mreS8xt7ZC5kbYdR34kqIbPlvQ/c0SLncUQ= -k8s.io/apiextensions-apiserver v0.18.8-rc.1/go.mod h1:fhuRdxL7fRZqES74prIX95qAbCvv/daKLzx0RpEtnwQ= k8s.io/apiextensions-apiserver v0.18.8/go.mod h1:7f4ySEkkvifIr4+BRrRWriKKIJjPyg9mb/p63dJKnlM= -k8s.io/apiextensions-apiserver v0.18.9-rc.0/go.mod h1:NOMJxMJOANriRThUBdmXJzZfESKANMDaXp2B1EzxX20= -k8s.io/apiextensions-apiserver v0.18.9/go.mod h1:JagmAhU0TVENzgUZqHJsjCSDh7YuV5o6g01G1Fwh7zI= -k8s.io/apiextensions-apiserver v0.18.10-rc.0/go.mod h1:NPZDQ0+MXfGYsmbAMtgDoPclOP7aY7g/yN9nBCMnACM= -k8s.io/apiextensions-apiserver v0.18.10/go.mod h1:XOE93YaGrb8Pa+ro00Jx3fhzRJ7UB0bU37jRTQXpTOM= -k8s.io/apiextensions-apiserver v0.18.11-rc.0/go.mod h1:Df8Uzl6vDuF2sVWnzV/W3HBGaejmAszWPA98ukbOCLA= -k8s.io/apiextensions-apiserver v0.18.12-rc.1/go.mod h1:9cu747ghfa0uNTypb5TFFcmyDp9NlrEa50sFfQRmL7U= -k8s.io/apiextensions-apiserver v0.18.12/go.mod h1:nihADkPed1L37Vxpz2/BrtxO9mCtINH23aNtUe/CRLo= -k8s.io/apimachinery v0.0.0-20180904193909-def12e63c512/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apimachinery v0.0.0-20181015213631-60666be32c5d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76/go.mod h1:M2fZgZL9DbLfeJaPBCDqSqNsdsmLN+V29knYJnIXlMA= -k8s.io/apimachinery v0.0.0-20190816221834-a9f1d8a9c101/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d/go.mod h1:3jediapYqJ2w1BFw7lAZPCx7scubsTfosqHkhXCWJKw= -k8s.io/apimachinery v0.0.0-20191016225534-b1267f8c42b4/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw= -k8s.io/apimachinery v0.0.0-20191020214737-6c8691705fc5/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw= -k8s.io/apimachinery v0.16.4/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ= -k8s.io/apimachinery v0.16.5-beta.1/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ= -k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= -k8s.io/apimachinery v0.17.1/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= -k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= -k8s.io/apimachinery v0.17.3-beta.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= -k8s.io/apimachinery v0.17.3/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= -k8s.io/apimachinery v0.17.4-beta.0/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= -k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= -k8s.io/apimachinery v0.17.5-beta.0/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= -k8s.io/apimachinery v0.17.5/go.mod h1:ioIo1G/a+uONV7Tv+ZmCbMG1/a3kVw5YcDdncd8ugQ0= -k8s.io/apimachinery v0.17.6-beta.0/go.mod h1:ioIo1G/a+uONV7Tv+ZmCbMG1/a3kVw5YcDdncd8ugQ0= -k8s.io/apimachinery v0.17.6/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.7-rc.0/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.7/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.8-rc.0/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.8-rc.1/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.8/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.9-rc.0/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.9/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.10-rc.0/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.17.11-rc.1/go.mod h1:q+iFxLyaMeWIBhSlQ4OMkvdwbwrb8Ux0ALl90XD9paU= -k8s.io/apimachinery v0.17.11/go.mod h1:q+iFxLyaMeWIBhSlQ4OMkvdwbwrb8Ux0ALl90XD9paU= -k8s.io/apimachinery v0.17.12-rc.0/go.mod h1:q+iFxLyaMeWIBhSlQ4OMkvdwbwrb8Ux0ALl90XD9paU= -k8s.io/apimachinery v0.17.12/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.13-rc.0/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.13/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.14-rc.0/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.14/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.15-rc.0/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.15/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.16-rc.0/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.16-rc.1/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.16/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.17.17-rc.0/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk= -k8s.io/apimachinery v0.18.0-alpha.1/go.mod h1:Ng1IY8TS7sC44KJxT/WUR6qFRfWwahYYYpNXyYRKOCY= -k8s.io/apimachinery v0.18.0-alpha.2/go.mod h1:j05cPXobKCShrrgR2gz+Wsw3flBA+nvUoLQLo1PdydY= -k8s.io/apimachinery v0.18.0-alpha.4/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= -k8s.io/apimachinery v0.18.0-alpha.5/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= -k8s.io/apimachinery v0.18.0-beta.0/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= -k8s.io/apimachinery v0.18.0-beta.1/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= -k8s.io/apimachinery v0.18.0-beta.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.0-rc.1/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.1-beta.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.1/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.2-beta.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.3-beta.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.3/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.4-rc.0/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.5-rc.0/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.5-rc.1/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.5/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.6-rc.0/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.7-rc.0/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.8-rc.1/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.18.9-rc.0/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.18.9/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk= -k8s.io/apimachinery v0.18.10-rc.0/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk= -k8s.io/apimachinery v0.18.10/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk= -k8s.io/apimachinery v0.18.11-rc.0/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk= -k8s.io/apimachinery v0.18.12-rc.1/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk= -k8s.io/apimachinery v0.18.12/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk= -k8s.io/apimachinery v0.19.0-alpha.1 h1:GnQMPcv4vKiShCI9OSAWbgz6dkf4G0d00xCnmcsMvmA= -k8s.io/apimachinery v0.19.0-alpha.1/go.mod h1:MwmRUlFgPZZjQ9mmX205Ve0gth+HzXB7tiAFmJilVME= -k8s.io/apimachinery v0.19.0-alpha.2/go.mod h1:imoz42hIYwpLTRWXU8pdJ9IE8DbxUsnU9lyVN8Y1SNo= -k8s.io/apimachinery v0.19.0-alpha.3/go.mod h1:imoz42hIYwpLTRWXU8pdJ9IE8DbxUsnU9lyVN8Y1SNo= -k8s.io/apimachinery v0.19.0-beta.0/go.mod h1:x4z2+k1N0YTBvV8PmaVs4/hSmKVVENZmTqI8gBygpLA= -k8s.io/apimachinery v0.19.0-beta.1/go.mod h1:x4z2+k1N0YTBvV8PmaVs4/hSmKVVENZmTqI8gBygpLA= -k8s.io/apimachinery v0.19.0-beta.2/go.mod h1:diAekxQB6O2LunkgrS6bHwK4dfE2K8KIxK3GeFjrgBU= -k8s.io/apimachinery v0.19.0-rc.0/go.mod h1:EjWiYOPi+BZennZ5pGa3JLkQ+znhEOodGy/+umjiLDU= -k8s.io/apimachinery v0.19.0-rc.1/go.mod h1:eHbWZVMaaewmYBAUuRYnAmTTMtDhvpPNZuh8/6Yl7v0= -k8s.io/apimachinery v0.19.0-rc.2/go.mod h1:eHbWZVMaaewmYBAUuRYnAmTTMtDhvpPNZuh8/6Yl7v0= -k8s.io/apimachinery v0.19.0-rc.3/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o= -k8s.io/apimachinery v0.19.0-rc.4/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o= -k8s.io/apimachinery v0.19.0 h1:gjKnAda/HZp5k4xQYjL0K/Yb66IvNqjthCb03QlKpaQ= -k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.1-rc.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.2-rc.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.3-rc.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.4-rc.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.4/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.5-rc.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.5/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= -k8s.io/apimachinery v0.19.6-rc.0/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= -k8s.io/apimachinery v0.19.6-rc.1/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= -k8s.io/apimachinery v0.19.6/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= -k8s.io/apimachinery v0.19.7-rc.0/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= -k8s.io/apimachinery v0.20.0-alpha.0/go.mod h1:EjWiYOPi+BZennZ5pGa3JLkQ+znhEOodGy/+umjiLDU= -k8s.io/apimachinery v0.20.0-alpha.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.20.0-alpha.2/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI= -k8s.io/apimachinery v0.20.0-alpha.3/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI= -k8s.io/apimachinery v0.20.0-beta.0/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI= -k8s.io/apimachinery v0.20.0-beta.1/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI= -k8s.io/apimachinery v0.20.0-beta.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.0-rc.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.1-rc.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.1-rc.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.1 h1:LAhz8pKbgR8tUwn7boK+b2HZdt7MiTu2mkYtFMUjTRQ= -k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1/go.mod h1:4FuDU+iKPjdsdQSN3GsEKZLB/feQsj1y9dhhBDVV2Ns= -k8s.io/apiserver v0.16.4/go.mod h1:kbLJOak655g6W7C+muqu1F76u9wnEycfKMqbVaXIdAc= -k8s.io/apiserver v0.17.0/go.mod h1:ABM+9x/prjINN6iiffRVNCBR2Wk7uY4z+EtEGZD48cg= -k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo= -k8s.io/apiserver v0.17.3-beta.0/go.mod h1:3w+4efyQs28hCv8c9jfRkm5hjCaWbGKlzk9MLKHt7Kc= -k8s.io/apiserver v0.17.3/go.mod h1:iJtsPpu1ZpEnHaNawpSV0nYTGBhhX2dUlnn7/QS7QiY= -k8s.io/apiserver v0.17.4-beta.0/go.mod h1:D9CFsgN1LrGE1dMKxBkFV+0ho/4v2eeJvJOWrCBIz/0= -k8s.io/apiserver v0.17.4/go.mod h1:5ZDQ6Xr5MNBxyi3iUZXS84QOhZl+W7Oq2us/29c0j9I= -k8s.io/apiserver v0.17.5-beta.0/go.mod h1:z53YycJMQErvUvJeu9L2eblu5kRyJbElzxICxna4FH0= -k8s.io/apiserver v0.17.5/go.mod h1:yo2cFZJ7AUj6BYYRWzEzs2cLtkY6F6zdxs8GhLu5V28= -k8s.io/apiserver v0.17.6-beta.0/go.mod h1:hVJKoE5amXUJxX4LM5cqOKfmRDUcgLlQOvf2S4YHGDc= -k8s.io/apiserver v0.17.6/go.mod h1:sAYqm8hUDNA9aj/TzqwsJoExWrxprKv0tqs/z88qym0= -k8s.io/apiserver v0.17.7-rc.0/go.mod h1:QUi/HKalzSk42EkGbr+ZcuOPMkry9fADhGtYbY5W4r0= -k8s.io/apiserver v0.17.7/go.mod h1:N0CougU/nBM93Rz09fDGpCQuaVvEg3B4PZtmwPFNUnI= -k8s.io/apiserver v0.17.8-rc.0/go.mod h1:g8JssRWsvmO4gZrl87oRRsDzOOowUn9X4WdNdcvqaks= -k8s.io/apiserver v0.17.8-rc.1/go.mod h1:520q+HrUpuAEyg7Qfste2j/Tu+IYPr+kE5POBn6b3Zg= -k8s.io/apiserver v0.17.8/go.mod h1:XU2YBi1I/v/P1R5lb0lEwSQ1rnXE01k7yxVtdIWH4Lo= -k8s.io/apiserver v0.17.9-rc.0/go.mod h1:cowgSWw9N4tVUOWkZ87zVLLD+gQfKQv6XdelM0aSY80= -k8s.io/apiserver v0.17.9/go.mod h1:Qaxd3EbeoPRBHVMtFyuKNAObqP6VAkzIMyWYz8KuE2k= -k8s.io/apiserver v0.17.10-rc.0/go.mod h1:c49MTMIzqmh4b2ijqnu5ukYtKt5bakQbh0Fge+t4zI4= -k8s.io/apiserver v0.17.11-rc.1/go.mod h1:ekfJVbQtk/uwMGZj3WoIXSANRLgSQTp400kPUzbFPQU= -k8s.io/apiserver v0.17.11/go.mod h1:NEwGVU8Ubyx8x6KV7PCjaCrDHRbd+U6thpjR4n+3qT4= -k8s.io/apiserver v0.17.12-rc.0/go.mod h1:b/oaFrbyuRBJosdrrx1yc0Gm37A3/ZK1kN4K+ZwrW/s= -k8s.io/apiserver v0.17.12/go.mod h1:Vp9SQiu0m0kbquV7k4XJTtsZkMf5w5FPTeN87KKTx1Y= -k8s.io/apiserver v0.17.13-rc.0/go.mod h1:LJOFFOtdlwmXc/28rL52pkbqBrETKs3rS52HF2IdPkY= -k8s.io/apiserver v0.17.13/go.mod h1:16D3LVaRVplesHI4PQvWDGBJOoPxVOzaSl9jmapUiHk= -k8s.io/apiserver v0.17.14-rc.0/go.mod h1:x7fkMAFoTShxBbhooMeNji5b5aJF9soZg/ULEm+OjiY= -k8s.io/apiserver v0.17.14/go.mod h1:40vA3cDOVebv2uDhGFOT8w+nxpg9iG+qZ7SM/xwGdTc= -k8s.io/apiserver v0.17.15-rc.0/go.mod h1:wS4F1GVn5BHi3Tr62S6thkPG6CUlluzN4YSr3nECgi8= -k8s.io/apiserver v0.17.15/go.mod h1:D3U5E/WgntRX0vcPjGW9BInpLypADtb0YMEd257xz6w= -k8s.io/apiserver v0.17.16-rc.0/go.mod h1:3ugIK7flA2FmK+oZIFoVYd4HsiVPk+OrtZrNkq3qHLE= -k8s.io/apiserver v0.17.16-rc.1/go.mod h1:QISXkacV2ePj9SajOlGbR7+Tm3qXZsSxqPImoSNwW40= -k8s.io/apiserver v0.17.16/go.mod h1:1mXytYVGDLOegDV8pu3ZTyHCntWm8Sdw8YjvJ2b6A04= -k8s.io/apiserver v0.17.17-rc.0/go.mod h1:fj9IUKyNqHBm7L6JfPTJTe39t4eVv+4Mst1tomF3t/s= -k8s.io/apiserver v0.18.0-alpha.1/go.mod h1:5/UIcjrEXBtujhMP7a65y3iJPoxNd/0ZifUXoNYvofc= -k8s.io/apiserver v0.18.0-alpha.2/go.mod h1:rYad5Erij9dTz8MByhv10PNovRLUtvz/MhXp175xASU= -k8s.io/apiserver v0.18.0-alpha.4/go.mod h1:DbMpk7DbxXNoaUzOAfY5IPAWwn7ML7zyyjlOp0G6rG8= -k8s.io/apiserver v0.18.0-alpha.5/go.mod h1:Kpk1wOUO19LBtOVxtJeKv09jRFkN0qvq3vdsqgzVKU4= -k8s.io/apiserver v0.18.0-beta.0/go.mod h1:3AWyS7B0yhtVNkEdTGVyjw/i0/IUsTlV4beC0pkb3DM= -k8s.io/apiserver v0.18.0-beta.1/go.mod h1:aKuBDoSx5bxrr0h23L+e+HLy/yH0LEjuuN8ns5bnOzU= -k8s.io/apiserver v0.18.0-beta.2/go.mod h1:bnblMkMoCFnIfVnVftd0SXJPzyvrk3RtaqSbblphF/A= -k8s.io/apiserver v0.18.0-rc.1/go.mod h1:RYE9w2Lijk1aWW3i3pS7kFGU0Afof+UDoOz1qW9aSYg= -k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= -k8s.io/apiserver v0.18.1-beta.0/go.mod h1:W8JjpqOAdgnDyfjknWznrg8RJ3mUGSp4UrWDAyNDwn4= -k8s.io/apiserver v0.18.1/go.mod h1:RlG/JfWP0FMn1ZS8iUkMY+yIQ1n48Eqxfhh9xyJ2KmI= -k8s.io/apiserver v0.18.2-beta.0/go.mod h1:0f3Jbkruxcm+EeJES/KTS+aUU+Ohti5NC+Ppf1gExm4= -k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= -k8s.io/apiserver v0.18.3-beta.0/go.mod h1:qbewHvUHj1k++gfQXEXI4/nWJgJyXoxyWE2MBCcmPJA= -k8s.io/apiserver v0.18.3/go.mod h1:tHQRmthRPLUtwqsOnJJMoI8SW3lnoReZeE861lH8vUw= -k8s.io/apiserver v0.18.4-rc.0/go.mod h1:Rbj1TWn9CxhGaZlOv5gsgNo+GENWrSbHRjX6MDw6z5Q= -k8s.io/apiserver v0.18.4/go.mod h1:q+zoFct5ABNnYkGIaGQ3bcbUNdmPyOCoEBcg51LChY8= -k8s.io/apiserver v0.18.5-rc.0/go.mod h1:CwCKg3lGX1yp4cDtUaY5eBBc3FFJq9nIFJYixZFTxmY= -k8s.io/apiserver v0.18.5-rc.1/go.mod h1:kJgwJ1BbLZG36i62lzhr0SGbJibJEQMuNB6keen1oAg= -k8s.io/apiserver v0.18.5/go.mod h1:+1XgOMq7YJ3OyqPNSJ54EveHwCoBWcJT9CaPycYI5ps= -k8s.io/apiserver v0.18.6-rc.0/go.mod h1:U8TdM3XQ4O8b6akOiA/EBsRQpVKep891RkjB8aFBTS8= -k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= -k8s.io/apiserver v0.18.7-rc.0/go.mod h1:gIHDGfFzEyJQ8Md+4FJR9Ic4L53CueU72puuKLRoDUw= -k8s.io/apiserver v0.18.8-rc.1/go.mod h1:2hqYAXZG70QwIyO+rCjCmlB3vJvRw4nSdBALieK5d30= k8s.io/apiserver v0.18.8/go.mod h1:12u5FuGql8Cc497ORNj79rhPdiXQC4bf53X/skR/1YM= -k8s.io/apiserver v0.18.9-rc.0/go.mod h1:snsqE09K/OLWDatgIkORAlZOvdR4G8rmyVkgFPAgIF0= -k8s.io/apiserver v0.18.9/go.mod h1:vXQzMtUCLsGg1Bh+7Jo2mZKHpHZFCZn8eTNSepcIA1M= -k8s.io/apiserver v0.18.10-rc.0/go.mod h1:ljl3KMW5oPVEWplgbhg0dhkUXBdnjHmLAEaD/YaXBoQ= -k8s.io/apiserver v0.18.10/go.mod h1:N4FaJo9BeSgmtvVByXi4fPSQPRqhvvLMGqswwkddob8= -k8s.io/apiserver v0.18.11-rc.0/go.mod h1:NbNMbVf9Elj/sY0kXxhFBFOQFsJmbkxaI6mSjp6QVj4= -k8s.io/apiserver v0.18.12-rc.1/go.mod h1:l2i9MyVuIT97l08DNq4+mEDrRym4B+e80wvH/Iv4ZV0= -k8s.io/apiserver v0.18.12/go.mod h1:uFOeW4LlxS6KDgLWy3n3gh0DhC6m41QIFgL33ouk+4w= k8s.io/cli-runtime v0.17.2/go.mod h1:aa8t9ziyQdbkuizkNLAw3qe3srSyWh9zlSB7zTqRNPI= -k8s.io/cli-runtime v0.17.3-beta.0/go.mod h1:x7d7pSeRpllt35hCsPY249kI0yPIpGFB8FeGf8eP9uc= k8s.io/cli-runtime v0.17.3/go.mod h1:X7idckYphH4SZflgNpOOViSxetiMj6xI0viMAjM81TA= -k8s.io/client-go v0.0.0-20180910083459-2cefa64ff137/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/client-go v0.0.0-20190918200256-06eb1244587a/go.mod h1:3YAcTbI2ArBRmhHns5vlHRX8YQqvkVYpz+U/N5i1mVU= -k8s.io/client-go v0.16.4/go.mod h1:ZgxhFDxSnoKY0J0U2/Y1C8obKDdlhGPZwA7oHH863Ok= -k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k= -k8s.io/client-go v0.17.2 h1:ndIfkfXEGrNhLIgkr0+qhRguSD3u6DCmonepn1O6NYc= -k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI= -k8s.io/client-go v0.17.3/go.mod h1:cLXlTMtWHkuK4tD360KpWz2gG2KtdWEr/OT02i3emRQ= -k8s.io/client-go v0.17.4/go.mod h1:ouF6o5pz3is8qU0/qYL2RnoxOPqgfuidYLowytyLJmc= -k8s.io/client-go v0.17.6/go.mod h1:tX5eAbQR/Kbqv+5R93rzHQoyRnPjjW2mm9i0lXnW218= -k8s.io/client-go v0.18.4/go.mod h1:f5sXwL4yAZRkAtzOxRWUhA/N8XzGCb+nPZI8PfobZ9g= k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v0.18.12/go.mod h1:0aC8XkA09dX/goYqHQJ/kVv0zL1t+weOZt3pmz9LpxA= -k8s.io/client-go v1.5.1 h1:XaX/lo2/u3/pmFau8HN+sB5C/b4dc4Dmm2eXjBH4p1E= -k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o= -k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible h1:A5pdeNsAyGjohGD5QrSFEto0ndr0yDWnbgZIFWvNHp0= -k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= k8s.io/cloud-provider v0.17.0/go.mod h1:Ze4c3w2C0bRsjkBUoHpFi+qWe3ob1wI2/7cUn+YQIDE= -k8s.io/cloud-provider v0.17.2/go.mod h1:9rEcGqEsUFHxC83oMUGBcsXTBpRVNVPX/U+nyQJTvHU= -k8s.io/cloud-provider v0.17.3-beta.0/go.mod h1:SX06iahj33Q0czYQVRxFVpwA7U/FLT0ZMYx9X7blx8E= -k8s.io/cloud-provider v0.17.3/go.mod h1:JBkKSQpbcjcYGDqH5PbifFrcgQ/7WOXRswnfLVbXpI8= -k8s.io/cloud-provider v0.17.4-beta.0/go.mod h1:AwHiaEyqqs0oxxmeSK2bCLXc7ZTBzxP2vPLOAUZdFOI= k8s.io/cloud-provider v0.17.4/go.mod h1:XEjKDzfD+b9MTLXQFlDGkk6Ho8SGMpaU8Uugx/KNK9U= -k8s.io/cloud-provider v0.17.5-beta.0/go.mod h1:CUtmUqqQ6YLwx39X+yECbJn2Vj1VRpggy+3SH1K4foY= -k8s.io/cloud-provider v0.17.5/go.mod h1:0c++pXLaTXm0HzIh9RSZ0z7P7+Tlk7j4IMOsFFb/Y1o= -k8s.io/cloud-provider v0.17.6-beta.0/go.mod h1:iwgbvOZG7VMjdungJ9GAPcw8wUYGbkS9JMLXXBEDHm0= -k8s.io/cloud-provider v0.17.6/go.mod h1:8A676iHjWLrjc72gYOayHoPbPGsHsqmWyxayArgX2r8= -k8s.io/cloud-provider v0.17.7-rc.0/go.mod h1:bfpD05kw2Q6pJhwTXQCbySAuPzGYYu8OtkuUzhfWLfs= -k8s.io/cloud-provider v0.17.7/go.mod h1:dHuPcLUGybmbrU5x5EyXoqCL6zu1YaL/nqYynQwFFUg= -k8s.io/cloud-provider v0.17.8-rc.0/go.mod h1:zH+l2RpmwimKZfWHOszUj7Bg0epVplHNgyn0f5VhKdo= -k8s.io/cloud-provider v0.17.8-rc.1/go.mod h1:4K+Qyx/I8DyA8ofGWJrBbBgtg4Xj4XpR3LdAwOBc1oI= -k8s.io/cloud-provider v0.17.8/go.mod h1:mWDJQa74syUaNR01TD5+fpfA9wGGEdAmMZ28+gZsWpk= -k8s.io/cloud-provider v0.17.9-rc.0/go.mod h1:MvoclViEhH6yVj6ieR3+WVygmkPCFOnaf8CwEuE7dQM= -k8s.io/cloud-provider v0.17.9/go.mod h1:yjQQgdWmd3sYNMzraq49mbABlegaptBBB9OEnRXHRbY= -k8s.io/cloud-provider v0.17.10-rc.0/go.mod h1:AWqrSfTlnJjuskwcE87KqYPVtFhMJ4QEC4LGLQd2C8k= -k8s.io/cloud-provider v0.17.11-rc.1/go.mod h1:tQ0JB/t+35D++pjHoVpiUzTbnA20z0lsc5wI1HV0+vc= -k8s.io/cloud-provider v0.17.11/go.mod h1:bFKUkdEPOCAGZMbBhKLC7M1gefQOzwgV6fHoIvHIfRM= -k8s.io/cloud-provider v0.17.12-rc.0/go.mod h1:+5qpyA5KZmX4XuVEJF+RXGgar/xyPlJsqe/wNYlQMxw= -k8s.io/cloud-provider v0.17.12/go.mod h1:18xWkzdK1g65nqCeKiLoSj1hmIBksHQMx8mSS2WUWns= -k8s.io/cloud-provider v0.17.13-rc.0/go.mod h1:zTruHtippUalXxkOdRw1zenV9T0cIoPslcySj53XL8s= -k8s.io/cloud-provider v0.17.13/go.mod h1:8J4vk6/5bQ6uk+b1vMPE57ZAAK/TePkT5LN91Q6VU6E= -k8s.io/cloud-provider v0.17.14-rc.0/go.mod h1:0E8w2n3Q425Udcjs2FL99Pg/zqxKNkj4nKy/IqO+7nU= -k8s.io/cloud-provider v0.17.14/go.mod h1:YyxfeNGcsfv8yjydhhXXzyOlfF32Q7uj6XS5FMR5eSg= -k8s.io/cloud-provider v0.17.15-rc.0/go.mod h1:xs5p4ddbUd8+b+Cqry306ie4zHHlZf400wV8u4HyA7s= -k8s.io/cloud-provider v0.17.15/go.mod h1:S8vBQEmcens4xELx+8e8x0EnozBlq09kP3RzcmRpqb4= -k8s.io/cloud-provider v0.17.16-rc.0/go.mod h1:SqhWbfdn7zzLiXMYDj4mB6sLiyHIfL7hcxTnung3t8Q= -k8s.io/cloud-provider v0.17.16-rc.1/go.mod h1:qJSgUn2nblggqlmM1VGz+GD7F8iB+laOa/Xj2A/2bRE= -k8s.io/cloud-provider v0.17.16/go.mod h1:381KcddwhpBvWYL13MpVbcAEezb9AUolMA1sIZNoyUo= -k8s.io/cloud-provider v0.17.17-rc.0/go.mod h1:9JJfdAjgZxMgDupllokvOhxU40RcUP0XEK+mW22c+AY= -k8s.io/cloud-provider v0.18.0-alpha.1/go.mod h1:pq8M2PVZpD3L5v89L+gLXHM8CvqUksWC8+UQzT9zv+Y= -k8s.io/cloud-provider v0.18.0-alpha.2/go.mod h1:s//90xY9TIpGJCm6gqFll+5xWfCZdqRTwmz/GuinuHU= -k8s.io/cloud-provider v0.18.0-alpha.4/go.mod h1:I0+nLmFOnDDRlLyb5hpBLXBNTklYyMuP/R1XP4kR9us= -k8s.io/cloud-provider v0.18.0-alpha.5/go.mod h1:TFeWjGWLi5xTjDQsFeq9iAnoLmGUNDztS/tVfIopqpc= -k8s.io/cloud-provider v0.18.0-beta.0/go.mod h1:dRJpxB+6SZHMJ2N8FCbquI7lg48FbSN8GXzT4eeh/hU= -k8s.io/cloud-provider v0.18.0-beta.1/go.mod h1:7dyRWxAfLn9PKcrnFLmm0vXM4Dg9YLcs2H1M5m80BSo= -k8s.io/cloud-provider v0.18.0-beta.2/go.mod h1:U/m2sg/lF3IhszPbwlcOGKYG6DxwNRm5i/GzQmnT80U= -k8s.io/cloud-provider v0.18.0-rc.1/go.mod h1:7wyR9pyOItXOAoFP8qAEodKypJ71MfpP3Hl+mY0Z1Z0= -k8s.io/cloud-provider v0.18.0/go.mod h1:ZBq1FhoJ+XoQ8JYBYoyx81LS3JV0RAW/UmHf/6w9E6k= -k8s.io/cloud-provider v0.18.1-beta.0/go.mod h1:K8eEf1lqXUaH84Ln3ys+VcRdlqVnXNRrycuQkvEebEs= -k8s.io/cloud-provider v0.18.1/go.mod h1:AD7y8xd55v2W3UHtD9ukhVnRU/G8S4DeeHX2jZw8xr8= -k8s.io/cloud-provider v0.18.2-beta.0/go.mod h1:Mhv7yqBp2oc7ELrBnK88FrZabR2RyQf2tPf6vJ1JMR4= -k8s.io/cloud-provider v0.18.2/go.mod h1:t1HjnQN2l5wK/fORo/yyu0Q+bZTYuReHYCIpi/qqfms= -k8s.io/cloud-provider v0.18.3-beta.0/go.mod h1:ELQV8dSYB80GHFb7wBYxIVJWv52JCCMjUNVwRvcrRGA= -k8s.io/cloud-provider v0.18.3/go.mod h1:sZelqNhA+TI+FqV6smLvZ84/DQCNdrEUmdQLneZpfC4= -k8s.io/cloud-provider v0.18.4-rc.0/go.mod h1:G2cxaDS7hWAzQ5EO7HvRPYWNs7C19tgrQQGhpnvKItU= -k8s.io/cloud-provider v0.18.4/go.mod h1:JdI6cuSFPSPANEciv0v5qfwztkeyFCVc1S3krLYrw0E= -k8s.io/cloud-provider v0.18.5-rc.0/go.mod h1:lMmoRucr8nyfrEX45u0se9sGi+f2bbbqUzIVrjHkTTw= -k8s.io/cloud-provider v0.18.5-rc.1/go.mod h1:GKMtg8WV9q7wpnRg/EA1S1U1K97aLf0rRM0aby1Q9v8= -k8s.io/cloud-provider v0.18.5/go.mod h1:c/s1K49Pf19RW1Shj7X9yLKaRcjFPAnMmknJ4z4Obrk= -k8s.io/cloud-provider v0.18.6-rc.0/go.mod h1:rRkR2HNp9x7C5GTP5KQRbmISg9JmBGFeJ6n6dypwZ+4= -k8s.io/cloud-provider v0.18.6/go.mod h1:QnPLLdFkvtx1dEyVMaPUdzVWB+ECzEf+PA3DXwIr8bo= -k8s.io/cloud-provider v0.18.7-rc.0/go.mod h1:uGASHkN6+StrxE83M3/uafxqBLhEd6+M1YBlcu7mLFc= -k8s.io/cloud-provider v0.18.8-rc.1/go.mod h1:WuOl6RZhq67YtLz671s/FZT/oWxE2XgQN0twnmK1aAw= -k8s.io/cloud-provider v0.18.8/go.mod h1:cn9AlzMPVIXA4HHLVbgGUigaQlZyHSZ7WAwDEFNrQSs= -k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I= -k8s.io/code-generator v0.0.0-20190831074504-732c9ca86353/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= -k8s.io/code-generator v0.16.4/go.mod h1:mJUgkl06XV4kstAnLHAIzJPVCOzVR+ZcfPIv4fUsFCY= -k8s.io/code-generator v0.17.1/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= -k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= -k8s.io/code-generator v0.17.3/go.mod h1:l8BLVwASXQZTo2xamW5mQNFCe1XPiAesVq7Y1t7PiQQ= -k8s.io/code-generator v0.17.6/go.mod h1:iiHz51+oTx+Z9D0vB3CH3O4HDDPWrvZyUgUYaIE9h9M= -k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= -k8s.io/code-generator v0.18.4/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= k8s.io/code-generator v0.18.8/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/code-generator v0.18.12/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778/go.mod h1:DFWQCXgXVLiWtzFaS17KxHdlUeUymP7FLxZSkmL9/jU= -k8s.io/component-base v0.16.4/go.mod h1:GYQ+4hlkEwdlpAp59Ztc4gYuFhdoZqiAJD1unYDJ3FM= k8s.io/component-base v0.17.0/go.mod h1:rKuRAokNMY2nn2A6LP/MiwpoaMRHpfRnrPaUJJj1Yoc= k8s.io/component-base v0.17.2/go.mod h1:zMPW3g5aH7cHJpKYQ/ZsGMcgbsA/VyhEugF3QT1awLs= -k8s.io/component-base v0.17.3-beta.0/go.mod h1:+mpaQoQGz+U8vcy33M6XQyavg+EzVPLMgAsvLPfO5oQ= -k8s.io/component-base v0.17.3/go.mod h1:GeQf4BrgelWm64PXkIXiPh/XS0hnO42d9gx9BtbZRp8= -k8s.io/component-base v0.17.4-beta.0/go.mod h1:+xMhnjtdsA69bNdgm6F+poz/CNgNTBkLBTaoX6RIDpY= k8s.io/component-base v0.17.4/go.mod h1:5BRqHMbbQPm2kKu35v3G+CpVq4K0RJKC7TRioF0I9lE= -k8s.io/component-base v0.17.5-beta.0/go.mod h1:VwZTTmE+lb1CpqGmQwKugn7mBI/7nqZdttpGzxIcaCE= -k8s.io/component-base v0.17.5/go.mod h1:cZQAW1AUbBjD1lh+e/krbiIpqGz6fipI+vHslOBbuHE= -k8s.io/component-base v0.17.6-beta.0/go.mod h1:snX9BinTV4018CD714MgpKgm/SG8t7h0/57L2W2SLMs= -k8s.io/component-base v0.17.6/go.mod h1:jgRLWl0B0rOzFNtxQ9E4BphPmDqoMafujdau6AdG2Xo= -k8s.io/component-base v0.17.7-rc.0/go.mod h1:i55KkEVYyQugt2lZOxOWFcnyEjKNKb0Cm1X+eEl3S44= -k8s.io/component-base v0.17.7/go.mod h1:eGIlfz1DvIChXUz7svn5KeiP3u2n+khdZ/fb9HD4x8I= -k8s.io/component-base v0.17.8-rc.0/go.mod h1:Id3Og6cRWsVfKCq04x3AnW0bpaB1YVsAIyEMJlqTpXE= -k8s.io/component-base v0.17.8-rc.1/go.mod h1:N96cs3bPwgoxYPMZLroAN90H33tshZ1oIXUtw2Cfe9k= -k8s.io/component-base v0.17.8/go.mod h1:xfNNdTAMsYzdiAa8vXnqDhRVSEgkfza0iMt0FrZDY7s= -k8s.io/component-base v0.17.9-rc.0/go.mod h1:ltI88UEwa8mUq3AKXu1ATZq0e2THL86lNF0sDN9HerA= -k8s.io/component-base v0.17.9/go.mod h1:Wg22ePDK0mfTa+bEFgZHGwr0h40lXnYy6D7D+f7itFk= -k8s.io/component-base v0.17.10-rc.0/go.mod h1:tDqv6tr/rLVYi3paDkK4+v34pH7M0tiT1NJgfVaMZt0= -k8s.io/component-base v0.17.11-rc.1/go.mod h1:DAj2IB/5wojdnPmF3VZOK6pHNKYN7cxBtQQ0q8si6lg= -k8s.io/component-base v0.17.11/go.mod h1:bM0ZtT5LeG5Mj1mW0gL9AKBn/w38QUUk9MP5XkUxRKk= -k8s.io/component-base v0.17.12-rc.0/go.mod h1:E31rsmSCOD+6n0EcXOw5OxgkI0+aC/DLXo8Ad48Qjp4= -k8s.io/component-base v0.17.12/go.mod h1:/wdD58j0ahgzq/5F0CRM0isXDOAnBPo28ozDjD+cdPg= -k8s.io/component-base v0.17.13-rc.0/go.mod h1:hPSQjj+OABPYZOJZYoEvdbYwTU2Hhnos/fvg4SK0gO4= -k8s.io/component-base v0.17.13/go.mod h1:oMo4MumG5RRjqOXrCpVlQdP6hLrFbWaIcH8P5G99jeo= -k8s.io/component-base v0.17.14-rc.0/go.mod h1:mr0eAstvmGCK7pniA2CUldN+GrR2XmcaGNa9ocFEIR0= -k8s.io/component-base v0.17.14/go.mod h1:fNM9wGzoSRl4+NN1e4csNh8+eGembC7p4zoaqFchm8E= -k8s.io/component-base v0.17.15-rc.0/go.mod h1:JRP6oPGj31VZ4TCsszT/WwYNumteYcvjIDEqN3E+6e8= -k8s.io/component-base v0.17.15/go.mod h1:Hi4gj6KS14OpJUtz62ofz5GquCq9qSCHvhn/NLoe8QE= -k8s.io/component-base v0.17.16-rc.0/go.mod h1:5zWs7EbaQ0c9SrOJC2ZvuEgN34gSlMNaicgiOPKVQlI= -k8s.io/component-base v0.17.16-rc.1/go.mod h1:im7Ng8gI1/sxKkY1GrK1s6wITi2rAkRMv3gWKgDh3Kg= -k8s.io/component-base v0.17.16/go.mod h1:v6RzGALGsgBUiwUNpJOB5UVefouIy6qVaqR0vpev2sI= -k8s.io/component-base v0.17.17-rc.0/go.mod h1:zJmHJonbskRaupzu2gThoQV5y2xbpRMKRDAEHOSUdOA= -k8s.io/component-base v0.18.0-alpha.1/go.mod h1:eDvhx/r79NT7SYaUmGJYHIFfsAGWOYYYfz+YdagSy2Q= -k8s.io/component-base v0.18.0-alpha.2/go.mod h1:YUYIWagOVcHY/1abCtKtWFujgu6FM7dOCOccasO7Wng= -k8s.io/component-base v0.18.0-alpha.4/go.mod h1:2ycWO40b9IlLtXryRFt4YToxrSWYYQjh10X8ctbE1Xk= -k8s.io/component-base v0.18.0-alpha.5/go.mod h1:zi+SJPyqK/G2X8AhVD+xZZaydtXuGkAxwE6/095eZ80= -k8s.io/component-base v0.18.0-beta.0/go.mod h1:bNrX5ozoz2VdXwdDcHHho/k7XdsJw5Mlbb/2GpmA9PA= -k8s.io/component-base v0.18.0-beta.1/go.mod h1:Th8v18ZXwuy5DIm6/UUsxIJgo1mO5m/aW4KYw+9BxVw= -k8s.io/component-base v0.18.0-beta.2/go.mod h1:HVk5FpRnyzQ/MjBr9//e/yEBjTVa2qjGXCTuUzcD7ks= -k8s.io/component-base v0.18.0-rc.1/go.mod h1:NNlRaxZEdLqTs2+6yXiU2SHl8gKsbcy19Ii+Sfq53RM= -k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c= -k8s.io/component-base v0.18.1-beta.0/go.mod h1:SmtRwJqd/n+rCy+lz4eY5cbjms1WMxxc0udhzZU5Z+A= -k8s.io/component-base v0.18.1/go.mod h1:r/fjelIVTKZaRczQRx/YzP2CJfhefUsUE4llMc9Pg4g= -k8s.io/component-base v0.18.2-beta.0/go.mod h1:8Lc2wUcIt5jkbSJl8UE8+xFwQYY2YbyoXGrFlN9+wAU= -k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= -k8s.io/component-base v0.18.3-beta.0/go.mod h1:OGjWpevK+HnigavXbachXuwkhC+sfzDz0JbTtZlS/eI= -k8s.io/component-base v0.18.3/go.mod h1:bp5GzGR0aGkYEfTj+eTY0AN/vXTgkJdQXjNTTVUaa3k= -k8s.io/component-base v0.18.4-rc.0/go.mod h1:f5zfBfUZXbFTMegHDl8DZ6KJQYQZMhqWAq92cKuilU4= -k8s.io/component-base v0.18.4/go.mod h1:7jr/Ef5PGmKwQhyAz/pjByxJbC58mhKAhiaDu0vXfPk= -k8s.io/component-base v0.18.5-rc.0/go.mod h1:HVwE+ELVzz88sYXmZLOY20R1gZ4oXYZIgJy4BSHJ4ME= -k8s.io/component-base v0.18.5-rc.1/go.mod h1:lYT7l/Mn2DaJA7NG/DLmCJ0zI6hrbw/aTc0Ef7hMwXg= -k8s.io/component-base v0.18.5/go.mod h1:RSbcboNk4B+S8Acs2JaBOVW3XNz1+A637s2jL+QQrlU= -k8s.io/component-base v0.18.6-rc.0/go.mod h1:2ukzfbzuuPZrLZsW8NFT5DjQIzeuljMobfJzT7auXBE= -k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= -k8s.io/component-base v0.18.7-rc.0/go.mod h1:kcXzsnKx3XwTaP7jB7h7fJX5RdYpVFwKqNcs2Z0tqN4= -k8s.io/component-base v0.18.8-rc.1/go.mod h1:P3ckC3hYmG6BiwLIqDutkoji7DafJrXp7nFdIMFlJj4= k8s.io/component-base v0.18.8/go.mod h1:00frPRDas29rx58pPCxNkhUfPbwajlyyvu8ruNgSErU= -k8s.io/component-base v0.18.9-rc.0/go.mod h1:kiQ+qSb3aTw9HS2MMdUoewEKebvWRHj3/KNrRcFCJsw= -k8s.io/component-base v0.18.9/go.mod h1:tUo4qZtV8m7t/U+0DgY+fcnn4BFZ480fZdzxOkWH4zk= -k8s.io/component-base v0.18.10-rc.0/go.mod h1:Hr+3yZwzbvyxdXqpY/9iq1nWKNxZGRck/rxzDDagkuk= -k8s.io/component-base v0.18.10/go.mod h1:ZzFXjzUBHKOcF0mnWkxBI1wDu5t+CV3GxXKKvHZBLf0= -k8s.io/component-base v0.18.11-rc.0/go.mod h1:K0JljLopREJXeLu0Hoon3g1lRUQkuGTUHFhzUBY1Wic= -k8s.io/component-base v0.18.12-rc.1/go.mod h1:yJhePuZUHm45WrU7AIPUpXmq97mGcrvmu4JV1nW0GVc= -k8s.io/component-base v0.18.12/go.mod h1:pRGKXsx2KWfsJqlDi4sbCc1jpaB87rXIIqupjhr5wj0= k8s.io/csi-translation-lib v0.17.0/go.mod h1:HEF7MEz7pOLJCnxabi45IPkhSsE/KmxPQksuCrHKWls= -k8s.io/csi-translation-lib v0.17.2/go.mod h1:NrhnhXJg/V6cHRTdPbmxvBuV3rJSqXsdLBE5JSRzcVI= -k8s.io/csi-translation-lib v0.17.3-beta.0/go.mod h1:atzlfR7Mdlfe7wAssMpdFGv9lkmdX8yDhkVzKqLGg6E= -k8s.io/csi-translation-lib v0.17.3/go.mod h1:FBya8XvGIqDm2/3evLQNxaFXqv/C2UcZa5JgJt6/qqY= -k8s.io/csi-translation-lib v0.17.4-beta.0/go.mod h1:ukNgnRoXfOQGQ2+wZCZSCquEATGVG+ELwhN/23dTnGY= k8s.io/csi-translation-lib v0.17.4/go.mod h1:CsxmjwxEI0tTNMzffIAcgR9lX4wOh6AKHdxQrT7L0oo= -k8s.io/csi-translation-lib v0.17.5-beta.0/go.mod h1:2iElR6pwwdaRnvuOi4lOGie2VrIt8/xXdWveUcVk2lA= -k8s.io/csi-translation-lib v0.17.5/go.mod h1:8DHduJ0h+9KT32JIRQkafmpDIfCKgMfnB3bQNVwoydw= -k8s.io/csi-translation-lib v0.17.6-beta.0/go.mod h1:XqWTL+qqeBOiB24vANEk1//FgUCTvzDEMuU0W4a51ps= -k8s.io/csi-translation-lib v0.17.6/go.mod h1:ZGRd0pXA4XazjuOjjo+1mQeCp0MzOwL9r9xXz1z8mhY= -k8s.io/csi-translation-lib v0.17.7-rc.0/go.mod h1:AoeM7aOxRSG5B62HXcC8uIVcRZJ4rbe4HWLMoRtfsck= -k8s.io/csi-translation-lib v0.17.7/go.mod h1:9g3Dj2PBvqu0bwJkzJrAmPWOscvdOjeYrdQ2kY6aSGg= -k8s.io/csi-translation-lib v0.17.8-rc.0/go.mod h1:qP0EAeUlLeFw80T/mQCFpV7smD7xU45Jg3hKLll36E0= -k8s.io/csi-translation-lib v0.17.8-rc.1/go.mod h1:5R6zD2Zkflxw0tlAgKRVqhldKuBg3tW13z8/Qq0nLKo= -k8s.io/csi-translation-lib v0.17.8/go.mod h1:+t8mboEYMOF7F9rUVisH6WTInUputoR5mCdFPBKM3dg= -k8s.io/csi-translation-lib v0.17.9-rc.0/go.mod h1:9wkjEFZcxlBkTtbo40TlNnpt5WOZb+KDFHXAdULKKOg= -k8s.io/csi-translation-lib v0.17.9/go.mod h1:wDkbibpo06FClp/OWvaMFpUWf/ogmUYBLSzGqnaTZ3w= -k8s.io/csi-translation-lib v0.17.10-rc.0/go.mod h1:a7DiOrEmsTwNRrEIK3NvPVF/S1NVGU6/OvkRUYi4u8E= -k8s.io/csi-translation-lib v0.17.11-rc.1/go.mod h1:WOWwX+TLjZ2lI+c8vEgymX/pOBq4YYg0EBgsiRlArdc= -k8s.io/csi-translation-lib v0.17.11/go.mod h1:UetkEuJnHp9gFbTktYIOb27kVzOczGPhahmmzZo7mvc= -k8s.io/csi-translation-lib v0.17.12-rc.0/go.mod h1:5v56shMU8WhayREfmCMEYy6/KXZV7IiHkMdiw5XAMGg= -k8s.io/csi-translation-lib v0.17.12/go.mod h1:JXJqFlDJBQvvZELcXw/PYcgLQqwJEJTp+lfhOGXFTyk= -k8s.io/csi-translation-lib v0.17.13-rc.0/go.mod h1:GzmCh+yvUydilBJwFk+kgboM/BVPuEMA31rKJrAViLU= -k8s.io/csi-translation-lib v0.17.13/go.mod h1:z+sZ5cj1eObLERdGZ+rpqLJeAe8f0RIAftj4oSshDw8= -k8s.io/csi-translation-lib v0.17.14-rc.0/go.mod h1:ktP45/BDh3IvwaP22cXLsDwxDtYmuwVoh+JwwBGJHSI= -k8s.io/csi-translation-lib v0.17.14/go.mod h1:d1zUTkVnZ+9BWsVLvPMGSAPW4cnqZhsvOHNEd6IPcpE= -k8s.io/csi-translation-lib v0.17.15-rc.0/go.mod h1:mHvuLVLvW4hOpr9veD8CXkUzop0ALKAyBgSTfpowrWM= -k8s.io/csi-translation-lib v0.17.15/go.mod h1:PBGvLWkIpfBEEc1SKwGjgGBdXadReKfVU2PcTYAcxdw= -k8s.io/csi-translation-lib v0.17.16-rc.0/go.mod h1:RoFt2fdVSXIWe2yYIxHEbAwxS2A1l4FzDWX43VyAYoM= -k8s.io/csi-translation-lib v0.17.16-rc.1/go.mod h1:rvep8JZDwCaoAvz20HcWE1qqtzS5bCCFWYrs08RrkeU= -k8s.io/csi-translation-lib v0.17.16/go.mod h1:jHjb+DC0o4JqNY6lw+9QTdLemRLNuBghr4ADi2dLXWA= -k8s.io/csi-translation-lib v0.17.17-rc.0/go.mod h1:kpivNj5L/oiuKXzyn9ox7X/n6aVlmTnBoQoufyqQsFE= -k8s.io/csi-translation-lib v0.18.0-alpha.1/go.mod h1:/HFnJJDc4M28vXt5a6KrNLbgyxXqHsByjxjyzsLsTsA= -k8s.io/csi-translation-lib v0.18.0-alpha.2/go.mod h1:Ak3gk2G4cv7fRmCzNT2K6BD4r8LCnZ9LVU64UNEDvNE= -k8s.io/csi-translation-lib v0.18.0-alpha.4/go.mod h1:LuK+gK+2NWrclZca8ksqo49TPR5ArHnVHWDpnk8cyDI= -k8s.io/csi-translation-lib v0.18.0-alpha.5/go.mod h1:GoqOYhZDVaj9/Rgfm67m0fW/pNgwqNMRJGFMJhd/rjk= -k8s.io/csi-translation-lib v0.18.0-beta.0/go.mod h1:OSoJeyfmEUwp57ZR0A2OL2aUKGHbHxMn9bHt+j7LomY= -k8s.io/csi-translation-lib v0.18.0-beta.1/go.mod h1:DHhz84bpN9k4Xe8zswo/NKknhJVYxnlPxIgroqH42DA= -k8s.io/csi-translation-lib v0.18.0-beta.2/go.mod h1:RjWZwbp9zZk2jAj3VW4J2Wn1YQkWZ+J2Pya0Jidggg0= -k8s.io/csi-translation-lib v0.18.0-rc.1/go.mod h1:AKtQoNw2l2Mb7CT0GlH5pmPgadDM33PDy9i+ZkzSLL4= -k8s.io/csi-translation-lib v0.18.0/go.mod h1:iF8TE4ACSaPqN1qxmiIjvcU1A8VgkOrpcFGD7Z0hVu0= -k8s.io/csi-translation-lib v0.18.1-beta.0/go.mod h1:pkDA9HMFm7Ym40u0AYekIo3b1u7t1VhMHuLYMsDYWI0= -k8s.io/csi-translation-lib v0.18.1/go.mod h1:8KSCH4LLiGytrz3YPdymTv6F/+5xNHbu4ZUdxXxk8tA= -k8s.io/csi-translation-lib v0.18.2-beta.0/go.mod h1:Lw/nMd4B/AT72D4aDcNPcx8oxMVXITvdGQKXQIyzK8Y= -k8s.io/csi-translation-lib v0.18.2/go.mod h1:2lyXP0OP6MuzAEde802d4L/Rhzj4teNdNBKGVxVKV78= -k8s.io/csi-translation-lib v0.18.3-beta.0/go.mod h1:S8t7q58c/FfLAhCS6yg2VkzaT00dDwnojJege14sZxA= -k8s.io/csi-translation-lib v0.18.3/go.mod h1:4UtVGtxPzhtFdadhRCYBL084NvJLNMouCat3UcTbbu0= -k8s.io/csi-translation-lib v0.18.4-rc.0/go.mod h1:7nM3iDKqylYNLp2N4nwQTIQZSoLpETySawj+JQxpVyQ= -k8s.io/csi-translation-lib v0.18.4/go.mod h1:FTci2m8/3oN8E+8OyblBXei8w4mwbiH4boNPeob4piE= -k8s.io/csi-translation-lib v0.18.5-rc.0/go.mod h1:3xYcJ0tsU/DvwCJ6Ntl+aoUB0JdUesJOR81YZdwMLxs= -k8s.io/csi-translation-lib v0.18.5-rc.1/go.mod h1:OAfuJepBqGWXGMLkDQ2T9mz+PkKLUCy+9rLFo+DSRCU= -k8s.io/csi-translation-lib v0.18.5/go.mod h1:Hu1eUVs8pxz8qdaI4kwk59p8yV3AhwPE+knsb7EpgkE= -k8s.io/csi-translation-lib v0.18.6-rc.0/go.mod h1:aL325vxwitpFw0KD1T98e4R94H9S66lqdG25/MfFtg0= -k8s.io/csi-translation-lib v0.18.6/go.mod h1:w13PRDbRWol3Z9lM3RjxRd5vi/R9wog1DQHAbzzuKOI= -k8s.io/csi-translation-lib v0.18.7-rc.0/go.mod h1:PbxuWAOB0w4Dfvij0uxKxjrr+xBUZkEjI4WR+X7Bpmc= -k8s.io/csi-translation-lib v0.18.8-rc.1/go.mod h1:nrq5ej4Elzxf84Ggq5SzvidmvHSECyEkUK4K0G0EObA= -k8s.io/csi-translation-lib v0.18.8/go.mod h1:6cA6Btlzxy9s3QrS4BCZzQqclIWnTLr6Jx3H2ctAzY4= -k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190306031000-7a1b7fb0289f/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20191108084044-e500ee069b5c/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/kube-openapi v0.0.0-20200316234421-82d701f24f9d/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU= -k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY= -k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 h1:NeQXVJ2XFSkRoPzRo8AId01ZER+j8oV4SZADT4iBOXQ= k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU= -k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= -k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kubectl v0.17.2/go.mod h1:y4rfLV0n6aPmvbRCqZQjvOp3ezxsFgpqL+zF5jH/lxk= k8s.io/kubernetes v1.11.10/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/kubernetes v1.14.7/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/legacy-cloud-providers v0.17.0/go.mod h1:DdzaepJ3RtRy+e5YhNtrCYwlgyK87j/5+Yfp0L9Syp8= -k8s.io/legacy-cloud-providers v0.17.2/go.mod h1:a/qbE67VbTzWOemWfqH0wlcX31zxt4UOxFqZuBltY9Q= -k8s.io/legacy-cloud-providers v0.17.3-beta.0/go.mod h1:YInHy9QGeQzZZllfDG//OUJ6Fcanpo9kmv3I1QuVAIw= -k8s.io/legacy-cloud-providers v0.17.3/go.mod h1:ujZML5v8efVQxiXXTG+nck7SjP8KhMRjUYNIsoSkYI0= -k8s.io/legacy-cloud-providers v0.17.4-beta.0/go.mod h1:u9dWKUhAPYW0j9Z8wM2mfNGscjSkmgRnPRga/WGsDzY= k8s.io/legacy-cloud-providers v0.17.4/go.mod h1:FikRNoD64ECjkxO36gkDgJeiQWwyZTuBkhu+yxOc1Js= -k8s.io/legacy-cloud-providers v0.17.5-beta.0/go.mod h1:eBMUUma8sK8bnnGJ733BVq3EypPKSfL8flOvinlgq/4= -k8s.io/legacy-cloud-providers v0.17.5/go.mod h1:atyAqbM6a6J06102HbPDJaLVFSKaPC7b3QdrhEyxHEQ= -k8s.io/legacy-cloud-providers v0.17.6-beta.0/go.mod h1:vbloX25Qs2/o6rk8VOnsUQUEeCipokiKXvNPWbhqUDs= -k8s.io/legacy-cloud-providers v0.17.6/go.mod h1:EWkXdX3koCoY7OqCBNrBIKy4Ow32rYX9DsemeAoBwAk= -k8s.io/legacy-cloud-providers v0.17.7-rc.0/go.mod h1:vzt8F48eCwkSRcyEmqeDJxeWRLtVa7LkmOOQldoj/fU= -k8s.io/legacy-cloud-providers v0.17.7/go.mod h1:vgS4KiLLZknN25XkXOWeuvZEesKTchLFvsDdhKKhHeI= -k8s.io/legacy-cloud-providers v0.17.8-rc.0/go.mod h1:wqpfn2s2jyuUwoMp1VR3kwg4iM/DhZ1T78oyjlkZfUE= -k8s.io/legacy-cloud-providers v0.17.8-rc.1/go.mod h1:gVcVZ9ZoQvXQv27HmlAmSAFVotKnQRmq/vYOo7f6TYo= -k8s.io/legacy-cloud-providers v0.17.8/go.mod h1:JXHJQnSV8TvCn5DLVMKVLXr1i1FfAqpob0KFSSd9Fxw= -k8s.io/legacy-cloud-providers v0.17.9-rc.0/go.mod h1:5FHssClitK3Lu8zoi9WrkzwFjhdolW+Myi+DKn4hAXM= -k8s.io/legacy-cloud-providers v0.17.9/go.mod h1:6FdEAYK7AlGetm4ulIQ8uZMqkcu02Mv8Z0Z3theL9Rc= -k8s.io/legacy-cloud-providers v0.17.10-rc.0/go.mod h1:DBNPXIXoihktaIslFK6psresFQALYTAl0/Un/A4aDY0= -k8s.io/legacy-cloud-providers v0.17.11-rc.1/go.mod h1:7mzH2NLzqIYKieRtY5RE8AAfxLHqYFA4l43wTAZ0Y7s= -k8s.io/legacy-cloud-providers v0.17.11/go.mod h1:z0QvIdQaRu8iIaW6hUW0tdjEBJ8RzRA/BXquNEku3L8= -k8s.io/legacy-cloud-providers v0.17.12-rc.0/go.mod h1:MDjkyUrj4CxXXEmsK98XntdF9p2tq0th83X4kSr3Bjk= -k8s.io/legacy-cloud-providers v0.17.12/go.mod h1:ypDzx84CJJjECA8HLSYmHmNmabBcfCmE4gMoR6847G0= -k8s.io/legacy-cloud-providers v0.17.13-rc.0/go.mod h1:IP7zNnoQ3S1XfhBphobL+sXI9ydfW5POJbT0ka9AHlY= -k8s.io/legacy-cloud-providers v0.17.13/go.mod h1:O9uAh4fgb1VvG5j+Mnp3xLr7apH+Fbbp5B6ZxjniMRg= -k8s.io/legacy-cloud-providers v0.17.14-rc.0/go.mod h1:UxM06XCXoLWbGKiyZHioveIgYKSNAhXAvL88eXLjy7w= -k8s.io/legacy-cloud-providers v0.17.14/go.mod h1:wGqeJm2FE6YvOwvYPFLx/ZINiDJA3SMBholuo9zCJVY= -k8s.io/legacy-cloud-providers v0.17.15-rc.0/go.mod h1:iJkuUUa4sI5hxENy4ovDmNBiz5FXaKaj8nKJ5V956pU= -k8s.io/legacy-cloud-providers v0.17.15/go.mod h1:7kFLU3V6z3rq3ZtKKnlDaDk+kDReuTOZ7w2XvyZrcoc= -k8s.io/legacy-cloud-providers v0.17.16-rc.0/go.mod h1:uvIT25bLKyuqv7ZszImkpGlpfI7iLCqajcsWDU5rBQc= -k8s.io/legacy-cloud-providers v0.17.16-rc.1/go.mod h1:7bAk2YqTgwJQyVEgwVkcC0D6tVwBFbSML9LA+HCUOkQ= -k8s.io/legacy-cloud-providers v0.17.16/go.mod h1:eufnvvbGGSjJliDL8zT6YhuZXfnX3LZwC/WOm/sbXi0= -k8s.io/legacy-cloud-providers v0.17.17-rc.0/go.mod h1:0Dc1nUpMtYffCNn7V/8RotBD7bogSdE7VhP9fz+NZGI= -k8s.io/legacy-cloud-providers v0.18.0-alpha.1/go.mod h1:Cevep9BYn1XJ5IRhGHAMK43LZeSVl/9Oe3LZCmAsycw= -k8s.io/legacy-cloud-providers v0.18.0-alpha.2/go.mod h1:QxxtGfj0T8zaBbIHhD2xG/i3zmA3swOGu6Uk3Z3TIY4= -k8s.io/legacy-cloud-providers v0.18.0-alpha.4/go.mod h1:/nFG2BP5DzCvexbSMJnfqo38kutV7ZDWWoCoKMHYGvE= -k8s.io/legacy-cloud-providers v0.18.0-alpha.5/go.mod h1:aVPX/TH5okM6lWtC2kr5U4H3nFCEbSICgUfk9aKsEY0= -k8s.io/legacy-cloud-providers v0.18.0-beta.0/go.mod h1:5hBTN0fvk4IGPH6o+MM/zvxKZmc5MfZTfl6LiwzbH6g= -k8s.io/legacy-cloud-providers v0.18.0-beta.1/go.mod h1:vyV4wttaloVxvlu2obe/OLOAjX6b3GNoAgBwiFFxTbM= -k8s.io/legacy-cloud-providers v0.18.0-beta.2/go.mod h1:16zq4JOiDPxRvfkLRS4YIZZYXgw65wiyxTqDbLcEt8g= -k8s.io/legacy-cloud-providers v0.18.0-rc.1/go.mod h1:9LpKPO/JUwl6jBkDAbiMdMjnAYliD/GVocgW88KD5Lo= -k8s.io/legacy-cloud-providers v0.18.0/go.mod h1:4Bc9CdZg8wl0mskyhnaXa8DdqLpTUfPEMkw3FZok+H8= -k8s.io/legacy-cloud-providers v0.18.1-beta.0/go.mod h1:sJ67pElL0v2iIFwgv0q898caVyKWqcbovxUTEePHUZk= -k8s.io/legacy-cloud-providers v0.18.1/go.mod h1:Qfp8J+lK/DnBVZlha1AYJMZkj1rS8F3T86gBNdMokWI= -k8s.io/legacy-cloud-providers v0.18.2-beta.0/go.mod h1:mwRRwI+SM7rIF8qOPGZKTwAl1rXn4q6fTvBr61VF8cc= -k8s.io/legacy-cloud-providers v0.18.2/go.mod h1:zzFRqgDC6cP1SgPl7lMmo1fjILDZ+bsNtTjLnxAfgI0= -k8s.io/legacy-cloud-providers v0.18.3-beta.0/go.mod h1:36d5jctdEot7ha2NpsNbGQ/6JZ2hLb58VRHpaTiFALw= -k8s.io/legacy-cloud-providers v0.18.3/go.mod h1:ZsvkD18BRzT2PUxvlX4ueqDA2+eM35d0N0GZC4Jynl8= -k8s.io/legacy-cloud-providers v0.18.4-rc.0/go.mod h1:QIcJ8+OsQ8jrLvEKnmeP9K+Vs3u4iX/tf5K97mNjfyQ= -k8s.io/legacy-cloud-providers v0.18.4/go.mod h1:Mnxtra7DxVrODfGZHPsrkLi22lwmZOlWkjyyO3vW+WM= -k8s.io/legacy-cloud-providers v0.18.5-rc.0/go.mod h1:dVpJa9zdoMvZkBoZGkzqvsxesm5UI50gEeqWL2OlQMQ= -k8s.io/legacy-cloud-providers v0.18.5-rc.1/go.mod h1:c0Ov2oL4UyHzQyUOgLCoewYk6XnMPrjuu64KeogMOv0= -k8s.io/legacy-cloud-providers v0.18.5/go.mod h1:dbYFPOwLEoQDs7K8s2mmti/znlG7dlYyLJIgKNKu0xM= -k8s.io/legacy-cloud-providers v0.18.6-rc.0/go.mod h1:njjlmdKWy8wtg6GJndXA7TqnpdRJHhiHcfiQJtsjJ/A= -k8s.io/legacy-cloud-providers v0.18.6/go.mod h1:0bU6t0dTOd0YkcByIdjx7WD4ihApa+aUrTgVJpqciZU= -k8s.io/legacy-cloud-providers v0.18.7-rc.0/go.mod h1:9aTr4PWZC9a+lqDUTMFuia44Etc7UgQPGPFdfOISBBU= -k8s.io/legacy-cloud-providers v0.18.8-rc.1/go.mod h1:wQuJvwbqgu85lus3IbmbOkxBN4eQZFW5fk+rK2Rv1Fg= -k8s.io/legacy-cloud-providers v0.18.8/go.mod h1:tgp4xYf6lvjrWnjQwTOPvWQE9IVqSBGPF4on0IyICQE= k8s.io/metrics v0.17.2/go.mod h1:3TkNHET4ROd+NfzNxkjoVfQ0Ob4iZnaHmSEA4vYpwLw= k8s.io/test-infra v0.0.0-20181019233642-2e10a0bbe9b3/go.mod h1:2NzXB13Ji0nqpyublHeiPC4FZwU0TknfvyaaNfl/BTA= k8s.io/test-infra v0.0.0-20191212060232-70b0b49fe247/go.mod h1:d8SKryJBXAwfCFVL4wieRez47J2NOOAb9d029sWLseQ= @@ -2691,9 +1921,7 @@ k8s.io/test-infra v0.0.0-20200617221206-ea73eaeab7ff/go.mod h1:L3+cRvwftUq8IW1Tr k8s.io/test-infra v0.0.0-20200630233406-1dca6122872e/go.mod h1:L3+cRvwftUq8IW1TrHji5m3msnc4uck/7LsE/GR/aZk= k8s.io/test-infra v0.0.0-20200803112140-d8aa4e063646/go.mod h1:rtUd2cOFwT0aBma1ld6W40F7PuVVw4ELLSFlz9ZEmv8= k8s.io/utils v0.0.0-20181019225348-5e321f9a457c/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= -k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20190907131718-3d4f5b7dea0b/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200124190032-861946025e34/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= @@ -2706,7 +1934,6 @@ knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaW knative.dev/caching v0.0.0-20200116200605-67bca2c83dfa/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg= knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g= knative.dev/eventing-contrib v0.11.2/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g= -knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q= knative.dev/pkg v0.0.0-20191111150521-6d806b998379/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q= knative.dev/pkg v0.0.0-20200207155214-fef852970f43 h1:52b67wiu9B62n+ZsDAMjHt84sZfiR0CUBTvtF1UEGmo= @@ -2718,19 +1945,12 @@ knative.dev/pkg v0.0.0-20200528142800-1c6815d7e4c9/go.mod h1:QgNZTxnwpB/oSpNcfnL knative.dev/pkg v0.0.0-20200711004937-22502028e31a/go.mod h1:AqAJV6rYi8IGikDjJ/9ZQd9qKdkXVlesVnVjwx62YB8= knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab h1:4Q+sGqdN4ecLPZnIJcLDdQArEE9oOtRYiU2J6NPCCjU= knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab/go.mod h1:MCyt5KqLaai6ENUitOgRAQsu7Gw7cAIIiXQ2IS+O0NI= -knative.dev/pkg v0.0.0-20201224024804-27db5ac24cfb h1:XVcmpSvfDMZ5Z+1pebSm5Msq5sQey/V4NHF2+dFNU1o= -knative.dev/pkg v0.0.0-20201224024804-27db5ac24cfb/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0= knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU= knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE= knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT3hHhVQm3dmtbuWvIDP7qzgtqxA3/2pE= knative.dev/test-infra v0.0.0-20200707183444-aed09e56ddc7/go.mod h1:RjYAhXnZqeHw9+B0zsbqSPlae0lCvjekO/nw5ZMpLCs= knative.dev/test-infra v0.0.0-20200921012245-37f1a12adbd3/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= @@ -2738,7 +1958,6 @@ mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7/go.mod h1:HGC5lll35J70Y5v7vC mvdan.cc/xurls/v2 v2.0.0/go.mod h1:2/webFPYOXN9jp/lzuj0zuAVlF+9g4KPFJANH1oJhRU= pack.ag/amqp v0.11.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= -pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= @@ -2750,32 +1969,12 @@ sigs.k8s.io/boskos v0.0.0-20200729174948-794df80db9c9/go.mod h1:ZO5RV+VxJS9mb6Dv sigs.k8s.io/controller-runtime v0.3.0/go.mod h1:Cw6PkEg0Sa7dAYovGT4R0tRkGhHXpYijwNxYhAnAZZk= sigs.k8s.io/controller-runtime v0.5.0/go.mod h1:REiJzC7Y00U+2YkMbT8wxgrsX5USpXKGhb2sCtAXiT8= sigs.k8s.io/controller-runtime v0.5.4/go.mod h1:JZUwSMVbxDupo0lTJSSFP5pimEyxGynROImSsqIOx1A= -sigs.k8s.io/controller-runtime v0.5.6/go.mod h1:JZUwSMVbxDupo0lTJSSFP5pimEyxGynROImSsqIOx1A= -sigs.k8s.io/controller-runtime v0.5.7/go.mod h1:KjjGQrdWFaSTHwB5A5VDmX9sMLlvkXjVazxVbfOI3a8= -sigs.k8s.io/controller-runtime v0.5.8/go.mod h1:UI/unU7Q+mo/rWBrND0NAaVNj/Xjh/+aqSv/M3njpmo= -sigs.k8s.io/controller-runtime v0.5.9/go.mod h1:UI/unU7Q+mo/rWBrND0NAaVNj/Xjh/+aqSv/M3njpmo= -sigs.k8s.io/controller-runtime v0.5.10/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A= -sigs.k8s.io/controller-runtime v0.5.11/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A= -sigs.k8s.io/controller-runtime v0.5.12/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A= -sigs.k8s.io/controller-runtime v0.5.13/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A= -sigs.k8s.io/controller-runtime v0.5.14/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A= -sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo= sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gEORz0efEja7A= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= -sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= -sigs.k8s.io/structured-merge-diff v1.0.1 h1:LOs1LZWMsz1xs77Phr/pkB4LFaavH7IVq/3+WTN9XTA= -sigs.k8s.io/structured-merge-diff v1.0.1/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/structured-merge-diff/v2 v2.0.1/go.mod h1:Wb7vfKAodbKgf6tn1Kl0VvGj7mRH6DGaRcixXEJXTsE= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba h1:AAbnc5KQuTWKuh2QSnyghKIOTFzB0Jayv7/OFDn3Cy4= sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba/go.mod h1:V06abazjHneE37ZdSY/UUwPVgcJMKI/jU5XGUjgIKoc= -sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= diff --git a/tekton-catalog/any-sequencer/main.go b/tekton-catalog/any-sequencer/main.go new file mode 100644 index 0000000000..8a6871af98 --- /dev/null +++ b/tekton-catalog/any-sequencer/main.go @@ -0,0 +1,23 @@ +/* +Copyright 2020 kubeflow.org. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package main + +import "github.com/kubeflow/kfp-tekton/tekton-catalog/any-sequencer/cmd" + +func main() { + cmd.Execute() +}
Any-Sequencer --- wait for some output to be true/false/some-value The current implementation of AnySequencer, both in kfp-tekton as DSL extension and the controller itself, can only wait for multiple tasks to complete. It doesn't provide possibility for asynchronous "or" operation --- waiting for any condition to be fulfilled. That's needed to implement the Any-Sequencer's relationship with conditional nodes. Considering how conditional links are evaluated as CELs and exposing `status` output, it would be enough for AnySequencer to modify its argument: ```python class AnySequencer(ContainerOp): def __init__( self, any: Iterable[Union[dsl.ContainerOp, ConditionOperator]] ): ... ``` AnySequencer should wait for either one of its `dsl.ContainerOp` dependencies to finish execution, or for one of its `ConditionOperator` dependencies to become available (i.e. all of its tasks are completed) and to evaluate to `true`. Example: ```python long_calc_op = LongCalculationOp(some_inputs) short_calc_op = ShortCalculationOp(some_inputs) seq = AnySequencer(long_calc_op, short_calc_op.outputs["status"] == "success") ``` In the above example, `long_calc_op` takes long to calculate, but always returns valid result, while `short_calc_op` is some heuristic which is faster, but its results aren't always correct. Because of that, `seq` waits for either `long_calc_op` to finish, or for `short_calc_op` to finish with `"status"` output set to `"success"`.
Here's some implementation details: - If we add a condition we in fact add a task to watch implicitly, since the result can only be evaluated after task finished. - Because the condition is in fact an enforcement for a task to watch, if there's multiple conditions on one task, they must all be met. That is to say for ```seq = AnySequencer(long_calc_op, short_calc_op.outputs["status"] == "success", short_calc_op.outputs["result"] == "succeed")``` the two conditions ```short_calc_op.outputs["status"] == "success", short_calc_op.outputs["result"] == "succeed"``` must all be met for the any sequencer to continue. - the condition is instance of ConditionOperator which means it can be ```short_calc_op.outputs["status"] == "success"``` or ```"success" == short_calc_op.outputs["status"]``` or even ```short_calc_op.outputs["status"] == short_calc_op.outputs["result"]``` - The one condition must come from one task which means we do not allow ```short_calc_op.outputs["status"] == long_calc_op.outputs["result"]```, the reason for this is that firstly it's not our use case and secondly it's very easy to introduce cycle in DAG.
2021-04-14T06:53:45
0.0
[]
[]
kubeflow/kfp-tekton
kubeflow__kfp-tekton-503
05e6f4aba5c8046cc5fc35c01ef435af0b66c5a2
diff --git a/sdk/FEATURES.md b/sdk/FEATURES.md index 10c956d4de..e1dd52027e 100644 --- a/sdk/FEATURES.md +++ b/sdk/FEATURES.md @@ -128,7 +128,7 @@ The `finally` syntax is supported since Tekton version `0.14.0`. ### Pipeline Loops -PipelineLoops is a feature for running a component or a set of component tasks multiple times in a loop. Right now, Tekton supports loop pipeline/tasks via an implementation of [Tekton Custom Tasks](https://github.com/tektoncd/community/blob/master/teps/0002-custom-tasks.md) controller named as "PipelineLoop". Please refer to the examples [here](/tekton-catalog/pipeline-loops/examples) to understand more details about the usage of loops. +PipelineLoops is a feature for running a component or a set of component tasks multiple times in a loop. Right now, Tekton supports loop pipeline/tasks via an implementation of [Tekton Custom Tasks Controller](https://github.com/tektoncd/community/blob/master/teps/0002-custom-tasks.md) named as "PipelineLoop". Please refer to the examples [here](/tekton-catalog/pipeline-loops/examples) to understand more details about the usage of loops. To use this feature, please ensure Tekton version >= v0.19, and "data.enable-custom-tasks" is "true" in feature-flags configmap: `kubectl edit cm feature-flags -n tekton-pipelines` @@ -141,12 +141,12 @@ To see how the Python SDK provides this feature, refer to the examples below: ### Any Sequencer -When any one of the task dependencies completes successfully, the dependent task will be started. Order of execution of the dependencies doesn’t matter, and the pipeline doesn't wait for all the task dependencies to complete before moving to the next step. Please follow the details of the implementation in the [design doc](https://docs.google.com/document/d/1oXOdiItI4GbEe_qzyBmMAqfLBjfYX1nM94WHY3EPa94/edit#heading=h.dt8bhna4spym). +When any one of the task dependencies completes successfully, the dependent task will be started. Order of execution of the dependencies doesn’t matter, and the pipeline doesn't wait for all the task dependencies to complete before moving to the next step. Please follow the details of the implementation in the [design doc](https://docs.google.com/document/d/1oXOdiItI4GbEe_qzyBmMAqfLBjfYX1nM94WHY3EPa94/edit#heading=h.dt8bhna4spym). For example: ``` -from kfp_tekton.dsl._any_seqencer import after_any +from kfp_tekton.tekton import after_any dsl.ContainerOp( ... diff --git a/sdk/python/kfp_tekton/dsl/_any_seqencer.py b/sdk/python/kfp_tekton/tekton.py similarity index 81% rename from sdk/python/kfp_tekton/dsl/_any_seqencer.py rename to sdk/python/kfp_tekton/tekton.py index ecf0e0a8d1..65a7c1f5ed 100644 --- a/sdk/python/kfp_tekton/dsl/_any_seqencer.py +++ b/sdk/python/kfp_tekton/tekton.py @@ -20,16 +20,16 @@ class AnySequencer(ContainerOp): - """Represents an op present that will proceed when any denpendent condition met + """A containerOp that will proceed when any of the dependent containerOps completed + successfully Args: - name: the name of the op. It does not have to be unique within a pipeline - because the pipeline will generates a unique new name in case of conflicts. + name: The name of the containerOp. It does not have to be unique within a pipeline + because the pipeline will generate a unique new name in case of conflicts. - any: the list of `Sidecar` objects describing the sidecar containers to deploy - together with the `main` container. + any: List of `Conditional` containerOps that deploy together with the `main` + containerOp. """ - def __init__(self, any: List[dsl.ContainerOp], name: str = None,):
Enhance AnySequencer to make it an op Enhance AnySequencer to make it an container op with name which is easier to reuse **Which issue is resolved by this Pull Request:** Because Any Sequencer is created implicitly, by applying after_any function to another op. There are two problems here: - any-sequencers can get no name or other user-defined metadata - each op needs its own any-sequencer, even if it's identical to another one I'd suggest to make it an op instead (dsl.AfterAny? dsl.AnySequencer?), and make after_any a simple utility function which creates a new after-any op and sets a dependency on it to the argument op.
/assign @jinchihe @fenglixa Thanks @gang, for the PR. the CI test failed, seems some `license header` was not added caused it. You can run `make lint` before commit to check what's the problem And it can be easily reused if there's multiple tasks depend on the any sequencer, for example task1 and task2 all depend on the AnySequencer: ``` seq = AnySequencer( [op0, op1], # naming the Any Sequencer, like any other op name="wait-for-any-file" ) task1 = dsl.ContainerOp( ...... ).after(seq) task2 = dsl.ContainerOp( ...... ).after(seq) ``` before merging this PR, just make sure to run the following commands to regenerate the tests and fix the python lint ``` make unit_test GENERATE_GOLDEN_YAML=True make lint make check_license ``` > before merging this PR, just make sure to run the following commands to regenerate the tests and fix the python lint > > ``` > make unit_test GENERATE_GOLDEN_YAML=True > make lint > make check_license > ``` Thanks Tommy, got it! Thanks @pugangxa /lgtm /approve [APPROVALNOTIFIER] This PR is **APPROVED** This pull-request has been approved by: *<a href="https://github.com/kubeflow/kfp-tekton/pull/499#issuecomment-800742652" title="Approved">fenglixa</a>*, *<a href="https://github.com/kubeflow/kfp-tekton/pull/499#" title="Author self-approved">pugangxa</a>* The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubeflow%2Fkfp-tekton). The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process) <details > Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/kubeflow/kfp-tekton/blob/master/OWNERS)~~ [fenglixa] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment </details> <!-- META={"approvers":[]} --> @pugangxa Looks great, thanks Gang.
2021-03-17T17:11:25
0.0
[]
[]
maxfischer2781/bootpeg
maxfischer2781__bootpeg-23
621e6ed1bae500cd9d255f47985db6c4c12eeffd
diff --git a/bootpeg/grammars/bpeg.bpeg b/bootpeg/grammars/bpeg.bpeg index db1d421..9996a58 100644 --- a/bootpeg/grammars/bpeg.bpeg +++ b/bootpeg/grammars/bpeg.bpeg @@ -11,9 +11,9 @@ end_line: literal: | ('"' :: '"') | ("'" :: "'") { Literal(.*[1:-1]) } range: - | first=literal spaces "-" spaces last=literal { Range(.first.value, .last.value) } + | first=literal spaces "-" ~ spaces last=literal { Range(.first.value, .last.value) } delimited: - | start=expr spaces "::" spaces stop=expr { Delimited(.start, .stop) } + | start=expr spaces "::" ~ spaces stop=expr { Delimited(.start, .stop) } terminal: | term=(range | nothing | literal | anything) { .term } @@ -24,26 +24,28 @@ identifier: | ( ( "a" - "z" ) | ( "A" - "Z" ) | "_" )+ { .* } optional: - | "[" spaces expr=expr spaces "]" { either(.expr, Nothing()) } + | "[" ~ spaces expr=expr spaces "]" { either(.expr, Nothing()) } group: - | "(" spaces expr=expr spaces ")" { .expr } + | "(" ~ spaces expr=expr spaces ")" { .expr } choice: - | try=expr spaces "|" spaces else=expr { either(.try, .else) } + | try=expr spaces "|" ~ spaces else=expr { either(.try, .else) } sequence: | head=expr spaces tail=expr { chain(.head, .tail) } repeat: | expr=expr spaces "+" { Repeat(.expr) } | expr=expr spaces "*" { either(Repeat(.expr), Nothing()) } capture: - | name=identifier spaces "=" spaces expr=(reference | group) { Capture(.name, .expr) } + | name=identifier spaces "=" ~ spaces expr=(reference | group) { Capture(.name, .expr) } reference: | name=identifier { Reference(.name) } reject: - | "!" spaces expr=expr { Not(.expr) } + | "!" ~ spaces expr=expr { Not(.expr) } require: - | "&" spaces expr=expr { And(.expr) } + | "&" ~ spaces expr=expr { And(.expr) } +commit: + | "~" ~ spaces expr=expr { require(.expr) } expr: - | expr=(choice | sequence | repeat | delimited | capture | reference | group | optional | reject | require | terminal) { .expr } + | expr=(choice | require | sequence | repeat | delimited | capture | reference | group | optional | reject | commit | terminal) { .expr } rule: | "|" spaces expr=expr spaces action=("{" :: "}") { Rule(.expr, Action(.action[1:-1])) } @@ -54,7 +56,7 @@ comment: blank: | spaces end_line { Discard() } define: - | name=identifier ":" spaces end_line rules=rules { (.name, .rules) } + | name=identifier ":" ~ spaces end_line rules=rules { (.name, .rules) } rules: | " " spaces try=rule spaces end_line else=rules { either(.try, .else) } | " " spaces rule=rule spaces end_line { .rule } diff --git a/bootpeg/pika/act.py b/bootpeg/pika/act.py index 54c94c8..620c80f 100644 --- a/bootpeg/pika/act.py +++ b/bootpeg/pika/act.py @@ -1,7 +1,7 @@ """ Pika bottom-up Peg parser extension to transform parsed source """ -from typing import TypeVar, Any, Dict, Tuple, Mapping +from typing import TypeVar, Any, Dict, Tuple, Mapping, Union, NamedTuple import re from .peg import Clause, D, Match, MemoTable, MemoKey, Literal, nested_str, Reference @@ -49,7 +49,7 @@ class Capture(Clause[D]): __slots__ = ("name", "sub_clauses", "_hash") - def __init__(self, name, sub_clause: Clause[D]): + def __init__(self, name: str, sub_clause: Clause[D]): self.name = name self.sub_clauses = (sub_clause,) self._hash = None @@ -192,6 +192,105 @@ def __repr__(self): return f"{self.__class__.__name__}({self.literal!r})" +class Commit(Clause[D]): + """ + The commitment to a clause, requiring a match of the sub_clause + + This clause always matches, even if the sub_clause does not. + As a result, it "cuts" away alternatives of *not* matching the sub_clause. + + Since Pika matches spuriously and can accumulate several failures, + a ``Cut`` does not raise an error during parsing. + Any :py:meth:`~.failed` match should be reported after parsing. + """ + + __slots__ = ("sub_clauses", "_hash") + + def __init__(self, sub_clause: Clause[D]): + self.sub_clauses = (sub_clause,) + self._hash = None + + @property + def maybe_zero(self): + return True + + # The difference between a successful and failed match + # is that we do/don't have a parent match. + # A match length may be 0 in either case, if the parent + # matched 0 length or not at all. + def match(self, source: D, at: int, memo: MemoTable): + # While `Commit` handles cases in which the child is not matched, + # Pika never tries to match `Commit` without the child matching. + # An "empty" match is created by the memo as needed. + parent_match = memo[MemoKey(at, self.sub_clauses[0])] + return Match(parent_match.length, (parent_match,), at, self) + + @classmethod + def failed(cls, match: Match) -> bool: + """Check whether the given ``match`` only succeeded due to the ``Cut``.""" + assert isinstance(match.clause, cls), f"a {cls.__name__} match is required" + return not match.sub_matches and not match.clause.sub_clauses[0].maybe_zero + + def __eq__(self, other): + return isinstance(other, Commit) and self.sub_clauses == other.sub_clauses + + @cache_hash + def __hash__(self): + return hash(self.sub_clauses) + + def __repr__(self): + return f"{self.__class__.__name__}({self.sub_clauses[0]!r})" + + def __str__(self): + return f"~{self.sub_clauses[0]}" + + +class CommitFailure(NamedTuple): + """Information on a single failed :py:class:`~.Commit` match""" + + position: int + commit: Commit + + +class NamedFailure(NamedTuple): + """Information on all failures of a :py:class:`~.Reference` match""" + + name: str + failures: Tuple[CommitFailure] + + +def leaves(failure): + if isinstance(failure, CommitFailure): + yield failure + elif isinstance(failure, NamedFailure): + for child in failure.failures: + yield from leaves(child) + else: + raise NotImplementedError + + +class CapturedParseFailure(Exception): + """Parsing captured match failures""" + + def __init__(self, *failures: Union[NamedFailure, CommitFailure]): + self.failures = failures + leave_failures = sorted( + {leave for failure in failures for leave in leaves(failure)}, + key=lambda failure: failure.position, + ) + leave_reports = ( + f"{str(failure.commit.sub_clauses[0])!r}@{failure.position}" + for failure in leave_failures + ) + super().__init__(f'failed expected parse of {", ".join(leave_reports)}') + + @property + def positions(self): + return { + leave.position for failure in self.failures for leave in leaves(failure) + } + + class TransformFailure(Exception): def __init__(self, clause, matches, captures, exc: Exception): super().__init__(f"failed to transform {clause}: {exc}") @@ -202,25 +301,48 @@ def __init__(self, clause, matches, captures, exc: Exception): def transform(head: Match, memo: MemoTable, namespace: Mapping[str, Any]): - return postorder_transform(head, memo.source, namespace) + matches, captures, failures = postorder_transform(head, memo.source, namespace) + if not failures: + return matches, captures + else: + raise CapturedParseFailure(*failures) # TODO: Use trampoline/coroutines for infinite depth def postorder_transform( match: Match, source: D, namespace: Mapping[str, Any] -) -> Tuple[Any, Dict[str, Any]]: - matches, captures = (), {} +) -> Tuple[Tuple, Dict[str, Any], Tuple]: + matches: Tuple = () + captures: Dict[str, Any] = {} + failures: Tuple = () for sub_match in match.sub_matches: - sub_matches, sub_captures = postorder_transform(sub_match, source, namespace) + sub_matches, sub_captures, sub_failures = postorder_transform( + sub_match, source, namespace + ) matches += sub_matches captures.update(sub_captures) + failures += sub_failures position, clause = match.position, match.clause - if isinstance(clause, Capture): + if isinstance(clause, Commit): + if Commit.failed(match): + failures = (*failures, CommitFailure(position, clause)) + elif isinstance(clause, Reference): + new_failures = tuple( + failure for failure in failures if not isinstance(failure, NamedFailure) + ) + if new_failures: + failures = ( + NamedFailure(clause.target, new_failures), + *(failure for failure in failures if isinstance(failure, NamedFailure)), + ) + if failures: + return (), {}, failures + elif isinstance(clause, Capture): assert len(matches) <= 1, "Captured rule must provide no more than one value" captures[Action.mangle + clause.name] = ( matches[0] if matches else source[position : position + match.length] ) - return (), captures + return (), captures, failures elif isinstance(clause, Rule): matches = matches if matches else source[position : position + match.length] try: @@ -229,5 +351,5 @@ def postorder_transform( raise except Exception as exc: raise TransformFailure(clause, matches, captures, exc) - return (result,) if not isinstance(result, Discard) else (), {} - return matches, captures + return (result,) if not isinstance(result, Discard) else (), {}, failures + return matches, captures, failures diff --git a/bootpeg/pika/boot.bpeg b/bootpeg/pika/boot.bpeg index 1696a92..4396b7f 100644 --- a/bootpeg/pika/boot.bpeg +++ b/bootpeg/pika/boot.bpeg @@ -38,8 +38,10 @@ reject: | "!" spaces expr=expr { Not(.expr) } require: | "&" spaces expr=expr { And(.expr) } +commit: + | "~" spaces expr=expr { require(.expr) } expr: - | expr=(choice | sequence | repeat | delimited | capture | reference | group | optional | reject | require | range | literal | anything | nothing) { .expr } + | expr=(choice | commit | sequence | repeat | delimited | capture | reference | group | optional | reject | require | range | literal | anything | nothing) { .expr } rule: | "|" spaces expr=expr spaces "{" body=(((!"}") .)+) "}" { Rule(.expr, Action(.body)) } diff --git a/bootpeg/pika/boot.py b/bootpeg/pika/boot.py index 2a09b3b..defc556 100644 --- a/bootpeg/pika/boot.py +++ b/bootpeg/pika/boot.py @@ -22,9 +22,11 @@ Rule, Action, Discard, + Commit, transform, chain, either, + require, Range, Delimited, unescape, @@ -126,6 +128,8 @@ def display(parser: Parser): Rule, Action, Discard, + Commit, + require, Range, Delimited, unescape, @@ -326,20 +330,21 @@ def bootpeg() -> Parser: if __name__ == "__main__": parser = bootpeg() + print("Generation:", -1, "(min)") + display(parser) for iteration in range(2): with open(boot_path) as boot_peg: - print("Generation:", iteration) - display(parser) parser = range_parse( boot_peg.read(), parser, ) + print("Generation:", iteration, "(boot)") + display(parser) for iteration in range(2, 4): with open(full_path) as base_peg: - print("Generation:", iteration) - display(min_parser) parser = range_parse( base_peg.read(), parser, ) - display(parser) + print("Generation:", iteration, "(bpeg)") + display(parser) diff --git a/bootpeg/pika/front.py b/bootpeg/pika/front.py index b6edefc..e2de01e 100644 --- a/bootpeg/pika/front.py +++ b/bootpeg/pika/front.py @@ -19,7 +19,16 @@ Terminal, D, ) -from .act import Debug, Capture, Rule, transform, Action, Discard +from .act import ( + Debug, + Capture, + Rule, + transform, + Action, + Discard, + Commit, + CapturedParseFailure, +) from ..utility import cache_hash __all__ = [ @@ -40,6 +49,8 @@ "Rule", "Action", "Discard", + "Commit", + "CapturedParseFailure", "transform", # helpers "chain", @@ -50,7 +61,7 @@ ] -def chain(left, right) -> Sequence: +def chain(left: Clause[D], right: Clause[D]) -> Sequence[D]: """Chain two clauses efficiently""" if isinstance(left, Sequence): if isinstance(right, Sequence): @@ -61,7 +72,7 @@ def chain(left, right) -> Sequence: return Sequence(left, right) -def either(left, right) -> Choice: +def either(left: Clause[D], right: Clause[D]) -> Choice[D]: """Choose between two clauses efficiently""" if isinstance(left, Choice): if isinstance(right, Choice): @@ -72,6 +83,19 @@ def either(left, right) -> Choice: return Choice(left, right) +def require(target: Clause[D]) -> Clause[D]: + """Commit to clauses efficiently""" + # It is tempting to try and remove `maybe_zero` clauses here. + # However, we cannot actually do that: There is no full grammar here, just clauses + # – but at least Reference needs the grammar to derive its `maybe_zero`. + if isinstance(target, Commit): + return target + elif isinstance(target, Sequence): + return Sequence(*(require(clause) for clause in target.sub_clauses)) + else: + return Commit(target) + + class Range(Terminal[D]): """ A terminal matching anything between two bounds inclusively diff --git a/docs/source/grammar_bpeg.rst b/docs/source/grammar_bpeg.rst index 02eea0f..383a02b 100644 --- a/docs/source/grammar_bpeg.rst +++ b/docs/source/grammar_bpeg.rst @@ -77,6 +77,20 @@ any: ``e*`` Match ``e`` zero or several times. Equivalent to ``[ e+ ]``. +commit: ``~ e`` + + Match ``e`` or fail. Always succeeds, may be zero width. + + Failure to match ``e`` records the failure but proceeds "as if" ``e`` matched. + Useful for accurate failure reports. + :: + + # fail on empty and mismatched parentheses + '(' ~ expr ')' | expr + + Binds tighter than sequences and less tight than choices: + ``~e1 e2 | e3`` is equivalent to ``(~e1 ~e2) | e3``. + capture: ``name=e`` Capture the result of matching ``e`` with a given ``name`` for use in a rule action.
Provide rule commitment Top-down PEG parsers commonly provide a "no backup" operator ([PEP 617 ``~``](https://www.python.org/dev/peps/pep-0617/#id9)/[pyparsing ``-``](https://pyparsing-docs.readthedocs.io/en/latest/HowToUsePyparsing.html#operators)) that causes a failure if a follow-up rule does not match. A common example are matching parentheses: an opening parenthesis requires a closing parenthesis: ``` # PEP 617 group: "(" - expr - ")" ``` This "commit to rule" operator simplifies error detection/reporting. Since Pika matches spuriously, it cannot directly commit to a rule and raise an error. Instead, reporting must be delayed until the outer rule has been matched.
Commitment seems to correspond to two parts: - A choice of ``e | ε``, during parsing. This means that a rule does match ("commits") even when its expression would not. - An error if ``ε`` was matched, during translation. This means that a rule was reached, even if its tail was not matched. Open question: What are the optimal ``Clause``, grammatical rule and action? ----------- It seems the clause is straightforward: ``Commit(e)`` performs a match equivalent to ``e | ε``. - ``e`` may not be zero, since that makes the commitment redundant. Parser generation can either reject a ``maybe_zero``-``e``, or unwrap it. - This allows to separate ``e``-matched from ``ε``-matched by the length *or* child-matches. - Should there be a way to customise the error message? Is it enough to customise the ``e`` representation? - This can be added/finalised later on. ----------- How should commitment actually behave? Does ``-`` bind tighter than the sequence? Consider the grammar ``'(' - a ')'``: Is it equivalent to ``'(' (- a) ')'``, ``'(' - (a ')')`` or ``'(' - a - ')'``? It seems useful to go by the desired behaviour. Given ``'(' a 'X'``, do we want: - A backtrack on `'X'`; the commitment is overridden. *Rejecting a commit seems not intuitive.* - A complete sequence error; the fault is reported for ``a ')'``. - An individual clause error; the fault is reported for ``')'``. I feel the first is right out: *Resetting a commit after it fails is not intuitive.* The other two are not so clear, since reporting the precise error seems better but we cannot split just any sequence: given ``- a [b] c`` we cannot trivially rewrite it to ``- a -[b] -c`` since ``- [b]`` is not valid. Since Pika-PEG allows to report more than one error, we should try to accumulate repeated failure: given ``- a b c`` and the input ``a``, we want to report ``b c`` as missing, not ``b`` *and* ``c``. We can solve the first by having a front utility, similar to ``either``: The first first rule must not be ``maybe_zero``, but trailing ones may. The second might be solvable by having reporting string together sequences of failing commits. There doesn't really seem to be a need to exclude ``maybe_zero`` child clauses. It eliminates redundancy, but complicates other things (and I'm not sure if it rejects actual valid matches which "may" be zero because we just don't know). This removes the need to be pedantic when rewriting sequences.
2021-04-27T18:06:57
0.0
[]
[]
maxfischer2781/bootpeg
maxfischer2781__bootpeg-16
2edb9fcd1925163ec05ee121e942fea55f97ed5a
diff --git a/bootpeg/grammars/__init__.py b/bootpeg/grammars/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bootpeg/peg.peg b/bootpeg/grammars/bpeg.bpeg similarity index 95% rename from bootpeg/peg.peg rename to bootpeg/grammars/bpeg.bpeg index 8ae3681..c6bb48a 100644 --- a/bootpeg/peg.peg +++ b/bootpeg/grammars/bpeg.bpeg @@ -36,7 +36,7 @@ reference: reject: | "!" spaces expr=expr { Not(.expr) } expr: - | expr=(choice | sequence | repeat | delimited | capture | reference | group | optional | range | literal | reject | anything | nothing) { .expr } + | expr=(choice | sequence | repeat | delimited | capture | reference | group | optional | range | nothing | literal | reject | anything) { .expr } rule: | "|" spaces expr=expr spaces "{" body=(((!"}") .)+) "}" { Rule(.expr, Action(.body)) } diff --git a/bootpeg/grammars/bpeg.py b/bootpeg/grammars/bpeg.py new file mode 100644 index 0000000..477c619 --- /dev/null +++ b/bootpeg/grammars/bpeg.py @@ -0,0 +1,132 @@ +""" +The default bootpeg grammar +""" +from typing import Union, NamedTuple, Mapping, Callable, Optional, Any +from functools import singledispatch +from pathlib import Path + +from ..pika.peg import ( + Clause, + Nothing, + Anything, + Literal, + Sequence, + Choice, + Repeat, + Not, + Reference, + Parser, +) +from ..pika.act import Capture, Rule, transform +from ..pika.front import Range, Delimited +from ..pika.boot import namespace, bootpeg, boot + + +@singledispatch +def unparse(clause: Union[Clause, Parser], top=True) -> str: + """Format a ``clause`` according to bootpeg standard grammar""" + raise NotImplementedError(f"Cannot unparse {clause!r} as bpeg") + + [email protected](Nothing) +def unparse_nothing(clause: Nothing, top=True) -> str: + return '""' + + [email protected](Anything) +def unparse_anything(clause: Anything, top=True) -> str: + return "." * clause.length + + [email protected](Literal) +def unparse_literal(clause: Literal, top=True) -> str: + return repr(clause.value) + + [email protected](Sequence) +def unparse_sequence(clause: Sequence, top=True) -> str: + children = " ".join( + unparse(sub_clause, top=False) for sub_clause in clause.sub_clauses + ) + return f"({children})" if not top else children + + [email protected](Choice) +def unparse_choice(clause: Choice, top=True) -> str: + children = " | ".join( + unparse(sub_clause, top=False) for sub_clause in clause.sub_clauses + ) + return f"({children})" if not top else children + + [email protected](Repeat) +def unparse_repeat(clause: Repeat, top=True) -> str: + return unparse(clause.sub_clauses[0], top=False) + "+" + + [email protected](Not) +def unparse_not(clause: Not, top=True) -> str: + return "!" + unparse(clause.sub_clauses[0], top=False) + + [email protected](Reference) +def unparse_reference(clause: Reference, top=True) -> str: + return clause.target + + [email protected](Capture) +def unparse_capture(clause: Capture, top=True) -> str: + return f"{clause.name}={unparse(clause.sub_clauses[0], top=False)}" + + [email protected](Rule) +def unparse_rule(clause: Rule, top=True) -> str: + return f"| {unparse(clause.sub_clauses[0])} {{{clause.action.literal}}}" + + [email protected](Range) +def unparse_range(clause: Range, top=True) -> str: + return f"{clause.first!r} - {clause.last!r}" + + [email protected](Delimited) +def unparse_delimited(clause: Delimited, top=True) -> str: + first, last = clause.sub_clauses + return f"{unparse(first, top=False)} :: {unparse(last, top=False)}" + + +class Actions(NamedTuple): + #: names available for translation actions + names: Mapping[str, Callable] + #: postprocessing callable + post: Callable[..., Any] + + +#: :py:class:`~.Actions` needed to construct a Pika parser +PikaActions = Actions( + names=namespace, + post=lambda *args, **kwargs: Parser( + "top", + **{name: clause for name, clause in args[0]}, + ), +) + +_parser_cache: Optional[Parser] = None +grammar_path = Path(__file__).parent / "bpeg.bpeg" + + +def _get_parser() -> Parser: + global _parser_cache + if _parser_cache is None: + parser = bootpeg() + # TODO: does translating twice offer any benefit? + parser = boot(parser, grammar_path.read_text()) + _parser_cache = parser + return _parser_cache + + +def parse(source, actions: Actions = PikaActions): + head, memo = _get_parser().parse(source) + assert head.length == len(source) + args, kwargs = transform(head, memo, actions.names) + return actions.post(*args, **kwargs) diff --git a/bootpeg/pika/act.py b/bootpeg/pika/act.py index 7f8aafd..54c94c8 100644 --- a/bootpeg/pika/act.py +++ b/bootpeg/pika/act.py @@ -1,7 +1,7 @@ """ Pika bottom-up Peg parser extension to transform parsed source """ -from typing import TypeVar, Any, Dict, Tuple +from typing import TypeVar, Any, Dict, Tuple, Mapping import re from .peg import Clause, D, Match, MemoTable, MemoKey, Literal, nested_str, Reference @@ -201,13 +201,13 @@ def __init__(self, clause, matches, captures, exc: Exception): self.exc = exc -def transform(head: Match, memo: MemoTable, namespace: Dict[str, Any]): +def transform(head: Match, memo: MemoTable, namespace: Mapping[str, Any]): return postorder_transform(head, memo.source, namespace) # TODO: Use trampoline/coroutines for infinite depth def postorder_transform( - match: Match, source: D, namespace: Dict[str, Any] + match: Match, source: D, namespace: Mapping[str, Any] ) -> Tuple[Any, Dict[str, Any]]: matches, captures = (), {} for sub_match in match.sub_matches: diff --git a/bootpeg/pika/boot.peg b/bootpeg/pika/boot.bpeg similarity index 100% rename from bootpeg/pika/boot.peg rename to bootpeg/pika/boot.bpeg diff --git a/bootpeg/pika/boot.py b/bootpeg/pika/boot.py index c06827d..ddc9521 100644 --- a/bootpeg/pika/boot.py +++ b/bootpeg/pika/boot.py @@ -1,3 +1,5 @@ +from typing import Optional + import string import time import pathlib @@ -129,7 +131,8 @@ def display(parser: Parser): end_line = Reference("end_line") # Literal("\n") -parser = Parser( +#: Minimal parser required to bootstrap the actual parser +min_parser = Parser( "top", literal=Rule( Choice( @@ -292,8 +295,8 @@ def display(parser: Parser): Action(".*"), ), ) -boot_path = pathlib.Path(__file__).parent / "boot.peg" -full_path = pathlib.Path(__file__).parent.parent / "peg.peg" +boot_path = pathlib.Path(__file__).parent / "boot.bpeg" +full_path = pathlib.Path(__file__).parent.parent / "grammars" / "bpeg.bpeg" def boot(base_parser: Parser, source: str) -> Parser: @@ -306,7 +309,20 @@ def boot(base_parser: Parser, source: str) -> Parser: ) +_parser_cache: Optional[Parser] = None + + +def bootpeg() -> Parser: + """Provide the basic bootpeg Pika parser""" + global _parser_cache + if _parser_cache is None: + with open(boot_path) as boot_peg_stream: + _parser_cache = boot(min_parser, boot_peg_stream.read()) + return _parser_cache + + if __name__ == "__main__": + parser = bootpeg() for iteration in range(2): with open(boot_path) as boot_peg: print("Generation:", iteration) @@ -318,7 +334,7 @@ def boot(base_parser: Parser, source: str) -> Parser: for iteration in range(2, 4): with open(full_path) as base_peg: print("Generation:", iteration) - display(parser) + display(min_parser) parser = range_parse( base_peg.read(), parser, diff --git a/bootpeg/pika/front.py b/bootpeg/pika/front.py index aac0c50..f81cb3d 100644 --- a/bootpeg/pika/front.py +++ b/bootpeg/pika/front.py @@ -19,6 +19,7 @@ D, ) from .act import Debug, Capture, Rule, transform, Action, Discard +from ..utility import cache_hash __all__ = [ # peg @@ -42,6 +43,7 @@ "chain", "either", "Range", + "Delimited", ] @@ -76,7 +78,7 @@ class Range(Terminal[D]): maybe_zero = False def __init__(self, first: D, last: D): - assert len(first) == len(last) > 0 + assert len(first) == len(last) > 0, "Range bounds must be of same length" self.first = first self.last = last self._length = len(first) @@ -109,7 +111,7 @@ class Delimited(Clause[D]): A pair of clauses with arbitrary intermediate filler """ - __slots__ = ("sub_clauses",) + __slots__ = ("sub_clauses", "_hash") @property def maybe_zero(self): @@ -118,6 +120,7 @@ def maybe_zero(self): def __init__(self, start: Clause[D], stop: Clause[D]): self.sub_clauses = start, stop + self._hash = None @property def triggers(self) -> "Tuple[Clause[D]]": @@ -135,6 +138,13 @@ def match(self, source: D, at: int, memo: MemoTable) -> Optional[Match]: return Match(offset + tail.length, (head, tail), at, self) return None + def __eq__(self, other): + return isinstance(other, Delimited) and self.sub_clauses == other.sub_clauses + + @cache_hash + def __hash__(self): + return hash(self.sub_clauses) + def __repr__(self): start, stop = self.sub_clauses return f"{self.__class__.__name__}(start={start!r}, stop={stop!r})"
Factor out pretty-formatting The pretty-printing of clauses and rules currently uses ``__str__``. This spreads out the pretty-formatting format and makes it impossible to have several representations (PEP 617, EBNF, PEG, ...). The ``nested_str`` helper is also a symptom of this. This formatting should be factored out to explicit helpers. ``functools.singledispatch`` can be used to combine the ease of per-clause ``__str__`` with other requirements.
Consider to provide a "representation" as [railroad diagrams](https://github.com/tabatkins/railroad-diagrams).
2021-03-29T18:19:46
0.0
[]
[]
maxfischer2781/bootpeg
maxfischer2781__bootpeg-13
c0090c9cb553788d0c85a5958c19fa7872f28e7d
diff --git a/bootpeg/pika/act.py b/bootpeg/pika/act.py index afa59bb..7f8aafd 100644 --- a/bootpeg/pika/act.py +++ b/bootpeg/pika/act.py @@ -4,7 +4,7 @@ from typing import TypeVar, Any, Dict, Tuple import re -from .peg import Clause, D, Match, MemoTable, MemoKey, Literal, nested_str +from .peg import Clause, D, Match, MemoTable, MemoKey, Literal, nested_str, Reference from ..utility import mono, cache_hash @@ -80,13 +80,42 @@ def __str__(self): return f"{self.name}={nested_str(self.sub_clauses[0])}" +def captures(head: Clause): + if isinstance(head, Capture): + yield head + elif isinstance(head, Reference): + return + else: + for clause in head.sub_clauses: + yield from captures(clause) + + +class ActionCaptureError(TypeError): + def __init__(self, missing, extra, rule): + self.missing = missing + self.extra = extra + self.rule = rule + msg = f"extra {', '.join(map(repr, extra))}" if extra else "" + msg += " and " if extra and missing else "" + msg += f"missing {', '.join(map(repr, missing))}" if missing else "" + super().__init__(f"{msg} captures: {self.rule}") + + class Rule(Clause[D]): __slots__ = ("sub_clauses", "action", "_hash") - def __init__(self, sub_clause: Clause[D], action): + def __init__(self, sub_clause: Clause[D], action: "Action"): self.sub_clauses = (sub_clause,) self.action = action self._hash = None + self._verify_captures() + + def _verify_captures(self): + captured_names = {capture.name for capture in captures(self.sub_clauses[0])} + if captured_names.symmetric_difference(self.action.parameters): + additional = captured_names.difference(self.action.parameters) + missing = set(self.action.parameters) - captured_names + raise ActionCaptureError(missing=missing, extra=additional, rule=self) @property def maybe_zero(self): @@ -123,7 +152,7 @@ def __repr__(self): class Action: - __slots__ = ("literal", "_py_source", "_py_code") + __slots__ = ("literal", "_py_names", "_py_source", "_py_code") # TODO: Define these via a PEG parser unpack = re.compile(r"\.\*") named = re.compile(r"(^|[ (])\.([a-zA-Z]+)") @@ -131,24 +160,24 @@ class Action: def __init__(self, literal: str): self.literal = literal.strip() + self._py_names = tuple(match.group(2) for match in self.named.finditer(literal)) self._py_source = self._encode(self.literal) self._py_code = compile(self._py_source, self._py_source, "eval") + @property + def parameters(self) -> Tuple[str, ...]: + """The parameter names used by the action""" + return self._py_names + def __call__(self, __namespace, *args, **kwargs): - try: - return eval(self._py_code, __namespace)(*args, **kwargs) - except Exception as err: - raise type(err)(f"{err} <{self._py_source}>") - - @classmethod - def _encode(cls, literal): - names = [ - f"{cls.mangle}{match.group(2)}" for match in cls.named.finditer(literal) - ] - body = cls.named.sub( - rf"\1 {cls.mangle}\2", cls.unpack.sub(rf" {cls.mangle}all", literal) + return eval(self._py_code, __namespace)(*args, **kwargs) + + def _encode(self, literal): + names = [f"{self.mangle}{name}" for name in self._py_names] + body = self.named.sub( + rf"\1 {self.mangle}\2", self.unpack.sub(rf" {self.mangle}all", literal) ) - return f'lambda {cls.mangle}all, {", ".join(names)}: {body}' + return f'lambda {self.mangle}all, {", ".join(names)}: {body}' def __eq__(self, other): return isinstance(other, Action) and self.literal == other.literal @@ -196,6 +225,8 @@ def postorder_transform( matches = matches if matches else source[position : position + match.length] try: result = clause.action(namespace, matches, **captures) + except ActionCaptureError: + raise except Exception as exc: raise TransformFailure(clause, matches, captures, exc) return (result,) if not isinstance(result, Discard) else (), {}
Verify Rule+Action captures Both ``Rule`` and ``Action`` can statically derive their provided/supplied arguments. A ``Rule`` should check that its ``Action`` is compatible.
2021-03-21T19:32:38
0.0
[]
[]
MountainDash/nonebot-bison
MountainDash__nonebot-bison-609
67983bd4f0403a8cce79a292b7a03fb43def9304
diff --git a/nonebot_bison/platform/__init__.py b/nonebot_bison/platform/__init__.py index c99ce122..accdf83f 100644 --- a/nonebot_bison/platform/__init__.py +++ b/nonebot_bison/platform/__init__.py @@ -3,6 +3,7 @@ from collections import defaultdict from importlib import import_module +from ..plugin_config import plugin_config from .platform import Platform, make_no_target_group _package_dir = str(Path(__file__).resolve().parent) @@ -22,3 +23,15 @@ platform_manager[name] = platform_list[0] else: platform_manager[name] = make_no_target_group(platform_list) + + +def _get_unavailable_platforms() -> dict[str, str]: + res = {} + for name, platform in platform_manager.items(): + if platform.site.require_browser and not plugin_config.bison_use_browser: + res[name] = "需要启用 bison_use_browser" + return res + + +# platform => reason for not available +unavailable_paltforms: dict[str, str] = _get_unavailable_platforms() diff --git a/nonebot_bison/sub_manager/add_sub.py b/nonebot_bison/sub_manager/add_sub.py index 38dddf08..107b9b5f 100644 --- a/nonebot_bison/sub_manager/add_sub.py +++ b/nonebot_bison/sub_manager/add_sub.py @@ -9,9 +9,9 @@ from ..types import Target from ..config import config from ..apis import check_sub_target -from ..platform import Platform, platform_manager from ..config.db_config import SubscribeDupException from .utils import common_platform, ensure_user_info, gen_handle_cancel +from ..platform import Platform, platform_manager, unavailable_paltforms def do_add_sub(add_sub: type[Matcher]): @@ -39,6 +39,8 @@ async def parse_platform(state: T_State, platform: str = ArgPlainText()) -> None elif platform == "取消": await add_sub.finish("已中止订阅") elif platform in platform_manager: + if platform in unavailable_paltforms: + await add_sub.finish(f"无法订阅 {platform}，{unavailable_paltforms[platform]}") state["platform"] = platform else: await add_sub.reject("平台输入错误")
新版本提示AttributeError: ("'NoneType' object has no attribute 'get_live_action'", []) ## 环境 - nonebot-bison 版本：fix/bilibili-dyn - nonebot 版本：2.2.1 - 安装方式：（以下方式的一种或者其他方式） 1. 通过 nb-cli 安装 - 操作系统：WIN10 ## 问题 显示报错("'NoneType' object has no attribute 'get_live_action'", []) ## 日志 ``` 05-04 20:11:20 [ERROR] apscheduler | Job "Scheduler.exec_fetch (trigger: interval[0:00:15], next run at: 2024-05-04 20:11:35 CST)" raised an exception Traceback (most recent call last): File "<string>", line 15, in <module> File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot\__init__.py", line 334, in run get_driver().run(*args, **kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot\drivers\fastapi.py", line 186, in run uvicorn.run( File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\main.py", line 575, in run server.run() File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\server.py", line 65, in run return asyncio.run(self.serve(sockets=sockets)) File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\runners.py", line 44, in run return loop.run_until_complete(main) File "C:\Users\\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 636, in run_until_complete self.run_forever() File "C:\Users\\AppData\Local\Programs\Python\Python310\lib\asyncio\windows_events.py", line 321, in run_forever super().run_forever() File "C:\Users\\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 603, in run_forever self._run_once() File "C:\Users\\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 1906, in _run_once handle._run() File "C:\Users\\AppData\Local\Programs\Python\Python310\lib\asyncio\events.py", line 80, in _run self._context.run(self._callback, *self._args) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\apscheduler\executors\base_py3.py", line 30, in run_coroutine_job retval = await job.func(*job.args, **job.kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\scheduler\scheduler.py", line 107, in exec_fetch to_send = await platform_obj.do_fetch_new_post(SubUnit(schedulable.target, send_userinfo_list)) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 109, in do_fetch_new_post return await catch_network_error(self.fetch_new_post, sub_unit) or [] File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 53, in catch_network_error return await func(*args, **kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 396, in fetch_new_post return await self._handle_status_change(new_status, sub_unit) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 376, in _handle_status_change diff = self.compare_status(sub_unit.sub_target, old_status, new_status) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\bilibili\platforms.py", line 443, in compare_status match new_status.get_live_action(old_status): AttributeError: ("'NoneType' object has no attribute 'get_live_action'", []) ``` - [√] 我搜索过了 issue，但是并没有发现过与我类似的问题 - [√] 我确认在日志中去掉了敏感信息
可以的话能不能提供一下关注的主播？ UID:690608698 B站 订阅分类:专栏文章、一般动态、视频、文字、转发、直播推送 Bilibili直播 开播提醒、标题更新提醒、下播提醒 以及新的2个报错log，导致直播无法推送，服务器规则代理日本 ```05-14 08:16:14 [WARNING] nonebot_bison | API request record: https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids?uids%5B%5D=1827139579&uids%5B%5D=666726799&uids%5B%5D=14950589&uids%5B%5D=1873291&uids%5B%5D=690608698&uids%5B%5D=477317922&uids%5B%5D=1464029182&uids%5B%5D=14387072&uids%5B%5D=1542516095&uids%5B%5D=1762745&uids%5B%5D=2039332008&uids%5B%5D=617459493&uids%5B%5D=863287&uids%5B%5D=594827452&uids%5B%5D=1950658&uids%5B%5D=56748733&uids%5B%5D=731556&uids%5B%5D=23269266&uids%5B%5D=1873291%20 Headers({'host': 'api.live.bilibili.com', 'accept': '*/*', 'accept-encoding': 'gzip, deflate', 'connection': 'keep-alive', 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36', 'cookie': [200] Headers({'date': 'Tue, 14 May 2024 00:16:14 GMT', 'content-type': 'application/json', 'content-length': '143', 'connection': 'keep-alive', 'bili-status-code': '65530', 'bili-trace-id': '64cb2cb9a513a3e90ada9038056642ad:17cf32bde09505fd:ada9038056642ad:0', 'cache-control': 'no-cache', 'server': 'swoole-http-server', 'x-bili-trace-id': '64cb2cb9a513a3e90ada9038056642ad:17cf32bde09505fd:ada9038056642ad:0', 'x-envoy-upstream-service-time': '0', 'vary': 'Accept-Encoding,Origin', 'expires': 'Tue, 14 May 2024 00:16:13 GMT', 'x-cache-webcdn': 'BYPASS from blzone06'}) {"code":65530,"msg":"route_exception","message":"route_exception","data":{"excp_code":0,"excp_msg":"Expect integer.","excp_class":"Exception"}} 05-14 08:16:14 [ERROR] apscheduler | Job "Scheduler.exec_fetch (trigger: interval[0:00:15], next run at: 2024-05-14 08:16:28 CST)" raised an exception Traceback (most recent call last): File "<string>", line 15, in <module> File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot\__init__.py", line 334, in run get_driver().run(*args, **kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot\drivers\fastapi.py", line 186, in run uvicorn.run( File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\main.py", line 575, in run server.run() File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\server.py", line 65, in run return asyncio.run(self.serve(sockets=sockets)) File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\runners.py", line 44, in run return loop.run_until_complete(main) File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 636, in run_until_complete self.run_forever() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\windows_events.py", line 321, in run_forever super().run_forever() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 603, in run_forever self._run_once() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 1906, in _run_once handle._run() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\events.py", line 80, in _run self._context.run(self._callback, *self._args) > File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\apscheduler\executors\base_py3.py", line 30, in run_coroutine_job retval = await job.func(*job.args, **job.kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\scheduler\scheduler.py", line 102, in exec_fetch to_send = await platform_obj.do_batch_fetch_new_post(sub_units) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 115, in do_batch_fetch_new_post return await catch_network_error(self.batch_fetch_new_post, sub_units) or [] File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 53, in catch_network_error return await func(*args, **kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 401, in batch_fetch_new_post new_statuses = await self.batch_get_status([x[0] for x in sub_units]) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\bilibili\platforms.py", line 430, in batch_get_status raise self.FetchError() nonebot_bison.platform.platform.StatusChange.FetchError: ['https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids?uids%5B%5D=1827139579&uids%5B%5D=666726799&uids%5B%5D=14950589&uids%5B%5D=1873291&uids%5B%5D=690608698&uids%5B%5D=477317922&uids%5B%5D=1464029182&uids%5B%5D=14387072&uids%5B%5D=1542516095&uids%5B%5D=1762745&uids%5B%5D=2039332008&uids%5B%5D=617459493&uids%5B%5D=863287&uids%5B%5D=594827452&uids%5B%5D=1950658&uids%5B%5D=56748733&uids%5B%5D=731556&uids%5B%5D=23269266&uids%5B%5D=1873291%20 Headers({\'host\': \'api.live.bilibili.com\', \'accept\': \'*/*\', \'accept-encoding\': \'gzip, deflate\', \'connection\': \'keep-alive\', \'user-agent\': \'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\', \'cookie\': | [200] Headers({\'date\': \'Tue, 14 May 2024 00:16:14 GMT\', \'content-type\': \'application/json\', \'content-length\': \'143\', \'connection\': \'keep-alive\', \'bili-status-code\': \'65530\', \'bili-trace-id\': \'64cb2cb9a513a3e90ada9038056642ad:17cf32bde09505fd:ada9038056642ad:0\', \'cache-control\': \'no-cache\', \'server\': \'swoole-http-server\', \'x-bili-trace-id\': \'64cb2cb9a513a3e90ada9038056642ad:17cf32bde09505fd:ada9038056642ad:0\', \'x-envoy-upstream-service-time\': \'0\', \'vary\': \'Accept-Encoding,Origin\', \'expires\': \'Tue, 14 May 2024 00:16:13 GMT\', \'x-cache-webcdn\': \'BYPASS from blzone06\'}) {"code":65530,"msg":"route_exception","message":"route_exception","data":{"excp_code":0,"excp_msg":"Expect integer.","excp_class":"Exception"}}'] ``` ```05-14 08:16:44 [WARNING] nonebot_bison | API request record: https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids?uids%5B%5D=1827139579&uids%5B%5D=666726799&uids%5B%5D=14950589&uids%5B%5D=1873291&uids%5B%5D=690608698&uids%5B%5D=477317922&uids%5B%5D=1464029182&uids%5B%5D=14387072&uids%5B%5D=1542516095&uids%5B%5D=1762745&uids%5B%5D=2039332008&uids%5B%5D=617459493&uids%5B%5D=863287&uids%5B%5D=594827452&uids%5B%5D=1950658&uids%5B%5D=56748733&uids%5B%5D=731556&uids%5B%5D=23269266&uids%5B%5D=1873291%20 Headers({'host': 'api.live.bilibili.com', 'accept': '*/*', 'accept-encoding': 'gzip, deflate', 'connection': 'keep-alive', 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36', 'cookie': [200] Headers({'date': 'Tue, 14 May 2024 00:16:44 GMT', 'content-type': 'application/json', 'content-length': '143', 'connection': 'keep-alive', 'bili-status-code': '65530', 'bili-trace-id': '1ddf2d1c3b4e6dd867a9dbface6642ad:17cf32c4ddb4183b:67a9dbface6642ad:0', 'cache-control': 'no-cache', 'server': 'swoole-http-server', 'x-bili-trace-id': '1ddf2d1c3b4e6dd867a9dbface6642ad:17cf32c4ddb4183b:67a9dbface6642ad:0', 'x-envoy-upstream-service-time': '1', 'vary': 'Accept-Encoding,Origin', 'expires': 'Tue, 14 May 2024 00:16:43 GMT', 'x-cache-webcdn': 'BYPASS from blzone05'}) {"code":65530,"msg":"route_exception","message":"route_exception","data":{"excp_code":0,"excp_msg":"Expect integer.","excp_class":"Exception"}} 05-14 08:16:44 [ERROR] apscheduler | Job "Scheduler.exec_fetch (trigger: interval[0:00:15], next run at: 2024-05-14 08:16:58 CST)" raised an exception Traceback (most recent call last): File "<string>", line 15, in <module> File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot\__init__.py", line 334, in run get_driver().run(*args, **kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot\drivers\fastapi.py", line 186, in run uvicorn.run( File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\main.py", line 575, in run server.run() File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\server.py", line 65, in run return asyncio.run(self.serve(sockets=sockets)) File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\runners.py", line 44, in run return loop.run_until_complete(main) File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 636, in run_until_complete self.run_forever() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\windows_events.py", line 321, in run_forever super().run_forever() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 603, in run_forever self._run_once() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 1906, in _run_once handle._run() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\events.py", line 80, in _run self._context.run(self._callback, *self._args) > File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\apscheduler\executors\base_py3.py", line 30, in run_coroutine_job retval = await job.func(*job.args, **job.kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\scheduler\scheduler.py", line 102, in exec_fetch to_send = await platform_obj.do_batch_fetch_new_post(sub_units) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 115, in do_batch_fetch_new_post return await catch_network_error(self.batch_fetch_new_post, sub_units) or [] File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 53, in catch_network_error return await func(*args, **kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\platform.py", line 401, in batch_fetch_new_post new_statuses = await self.batch_get_status([x[0] for x in sub_units]) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\platform\bilibili\platforms.py", line 430, in batch_get_status raise self.FetchError() nonebot_bison.platform.platform.StatusChange.FetchError: ['https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?host_mid=&timezone_offset=-480&offset= Headers({\'host\': \'api.bilibili.com\', \'accept\': \'*/*\', \'accept-encoding\': \'gzip, deflate\', \'connection\': \'keep-alive\', \'user-agent\': \'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\', \'cookie\| [200] Headers({\'date\': \'Tue, 14 May 2024 00:16:44 GMT\', \'content-type\': \'application/json; charset=utf-8\', \'transfer-encoding\': \'chunked\', \'connection\': \'keep-alive\', \'bili-status-code\': \'0\', \'bili-trace-id\': \'25fcbb4f2d6642ad\', \'cpu_usage\': \'13\', \'x-bili-trace-id\': \'18ac1b70f5d9563e25fcbb4f2d6642ad\', \'x-rid-result\': \'2\', \'content-encoding\': \'gzip\', \'expires\': \'Tue, 14 May 2024 00:16:43 GMT\', \'cache-control\': \'no-cache\', \'x-cache-webcdn\': \'BYPASS from blzone05\'}) {"count":1,"forbidden":false,"status":false}}},"type":"DYNAMIC_TYPE_AV","visible":true}],"offset":"874585122531180563","update_baseline":"","update_num":0}}', 'https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids?uids%5B%5D=1827139579&uids%5B%5D=666726799&uids%5B%5D=14950589&uids%5B%5D=1873291&uids%5B%5D=690608698&uids%5B%5D=477317922&uids%5B%5D=1464029182&uids%5B%5D=14387072&uids%5B%5D=1542516095&uids%5B%5D=1762745&uids%5B%5D=2039332008&uids%5B%5D=617459493&uids%5B%5D=863287&uids%5B%5D=594827452&uids%5B%5D=1950658&uids%5B%5D=56748733&uids%5B%5D=731556&uids%5B%5D=23269266&uids%5B%5D=1873291%20 Headers({\'host\': \'api.live.bilibili.com\', \'accept\': \'*/*\', \'accept-encoding\': \'gzip, deflate\', \'connection\': \'keep-alive\', \'user-agent\': \'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36\', \'cookie\'| [200] Headers({\'date\': \'Tue, 14 May 2024 00:16:44 GMT\', \'content-type\': \'application/json\', \'content-length\': \'143\', \'connection\': \'keep-alive\', \'bili-status-code\': \'65530\', \'bili-trace-id\': \'1ddf2d1c3b4e6dd867a9dbface6642ad:17cf32c4ddb4183b:67a9dbface6642ad:0\', \'cache-control\': \'no-cache\', \'server\': \'swoole-http-server\', \'x-bili-trace-id\': \'1ddf2d1c3b4e6dd867a9dbface6642ad:17cf32c4ddb4183b:67a9dbface6642ad:0\', \'x-envoy-upstream-service-time\': \'1\', \'vary\': \'Accept-Encoding,Origin\', \'expires\': \'Tue, 14 May 2024 00:16:43 GMT\', \'x-cache-webcdn\': \'BYPASS from blzone05\'}) {"code":65530,"msg":"route_exception","message":"route_exception","data":{"excp_code":0,"excp_msg":"Expect integer.","excp_class":"Exception"}}'] ``` ``` 05-14 08:29:52 [INFO] nonebot_bison | register scheduler for arknights with interval {'seconds': 30} 05-14 08:29:52 [INFO] nonebot_bison | register scheduler for bilibili.com with interval {'seconds': 40} 05-14 08:29:52 [INFO] nonebot_bison | register scheduler for live.bilibili.com with interval {'seconds': 15} 05-14 08:29:52 [INFO] nonebot_bison | register scheduler for AnonymousScheduleConfig[ff14] with interval {'seconds': 60} 05-14 08:29:52 [INFO] nonebot_bison | register scheduler for music.163.com with interval {'minutes': 1} 05-14 08:29:52 [INFO] nonebot_bison | register scheduler for rss with interval {'seconds': 30} 05-14 08:29:52 [INFO] nonebot_bison | register scheduler for weibo.com with interval {'seconds': 3} ``` 所用的branch看起来并不是main？ 以及一个推送小bug ```B站 小可学妹 发布了新的动态： {"live_record_info":null,"type":1,"live_play_info":{"live_screen_type":0,"live_id":"494537236140868417","watched_show":{"num":2044,"text_small":"2044","text_large":"2044人看过","icon":"https://i0.hdslb.com/bfs/live/a725a9e61242ef44d764ac911691a7ce07f36c1d.png","icon_location":"","icon_web":"https://i0.hdslb.com/bfs/live/8d9d0f33ef8bf6f308742752d13dd0df731df19c.png","switch":true},"room_type":0,"title":"【小可】主打原生态","parent_area_name":"虚拟主播","parent_area_id":9,"room_paid_type":0,"uid":14387072,"live_s... 详情: https://t.bilibili.com/931290467632414725 ``` > 所用的branch看起来并不是main？ 所以是我NB的问题？ 如果你订阅了B站的直播推送，而不是B站直播的推送，就会这样（ 遇到了一样的问题，报错信息AttributeError: ("'NoneType' object has no attribute 'get_live_action'", [])以下是关注列表 B站 | 弥希Miki | 477317922 | 一般动态 专栏文章 视频 纯文字 转发 Bilibili直播 | 弥希Miki | 477317922 | 开播提醒 标题更新提醒 新浪微博 | 弥希MIKI | 7576338081 | 转发 视频 图文 文字 B站 | 千幽Chiyuu | 690608691 | 一般动态 专栏文章 视频 纯文字 转发 Bilibili直播 | 千幽Chiyuu | 690608691 | 开播提醒 标题更新提醒 **日志** ``` AttributeError: ("'NoneType' object has no attribute 'get_live_action'", []) 06-15 03:38:57 [ERROR] apscheduler | Job "Scheduler.exec_fetch (trigger: interval[0:00:03], next run at: 2024-06-15 03:39:00 CST)" raised an exception Traceback (most recent call last): File "<string>", line 21, in <module> File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\nonebot\__init__.py", line 335, in run get_driver().run(*args, **kwargs) File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\nonebot\drivers\fastapi.py", line 186, in run uvicorn.run( File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\uvicorn\main.py", line 577, in run server.run() File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\uvicorn\server.py", line 65, in run return asyncio.run(self.serve(sockets=sockets)) File "C:\Users\***\AppData\Local\Programs\Python\Python311\Lib\asyncio\runners.py", line 190, in run return runner.run(main) File "C:\Users\***\AppData\Local\Programs\Python\Python311\Lib\asyncio\runners.py", line 118, in run return self._loop.run_until_complete(task) File "C:\Users\***\AppData\Local\Programs\Python\Python311\Lib\asyncio\base_events.py", line 641, in run_until_complete self.run_forever() File "C:\Users\***\AppData\Local\Programs\Python\Python311\Lib\asyncio\windows_events.py", line 321, in run_forever super().run_forever() File "C:\Users\***\AppData\Local\Programs\Python\Python311\Lib\asyncio\base_events.py", line 608, in run_forever self._run_once() File "C:\Users\***\AppData\Local\Programs\Python\Python311\Lib\asyncio\base_events.py", line 1936, in _run_once handle._run() File "C:\Users\***\AppData\Local\Programs\Python\Python311\Lib\asyncio\events.py", line 84, in _run self._context.run(self._callback, *self._args) > File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\apscheduler\executors\base_py3.py", line 30, in run_coroutine_job retval = await job.func(*job.args, **job.kwargs) File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\nonebot_bison\scheduler\scheduler.py", line 107, in exec_fetch to_send = await platform_obj.do_fetch_new_post(SubUnit(schedulable.target, send_userinfo_list)) File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\nonebot_bison\platform\platform.py", line 109, in do_fetch_new_post return await catch_network_error(self.fetch_new_post, sub_unit) or [] File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\nonebot_bison\platform\platform.py", line 53, in catch_network_error return await func(*args, **kwargs) File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\nonebot_bison\platform\platform.py", line 396, in fetch_new_post return await self._handle_status_change(new_status, sub_unit) File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\nonebot_bison\platform\platform.py", line 376, in _handle_status_change diff = self.compare_status(sub_unit.sub_target, old_status, new_status) File "C:\Users\***\Desktop\QQbot\nonebot\***\.venv\Lib\site-packages\nonebot_bison\platform\bilibili.py", line 449, in compare_status match new_status.get_live_action(old_status): AttributeError: ("'NoneType' object has no attribute 'get_live_action'", []) ``` 看看最新的 v0.9.3 还有问题吗 ```08-08 16:51:18 [ERROR] uvicorn | Exception in ASGI application  Traceback (most recent call last): File "<string>", line 15, in <module> File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot\__init__.py", line 335, in run get_driver().run(*args, **kwargs) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot\drivers\fastapi.py", line 186, in run uvicorn.run( File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\main.py", line 575, in run server.run() File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\server.py", line 65, in run return asyncio.run(self.serve(sockets=sockets)) File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\runners.py", line 44, in run return loop.run_until_complete(main) File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 636, in run_until_complete self.run_forever() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\windows_events.py", line 321, in run_forever super().run_forever() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 603, in run_forever self._run_once() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\base_events.py", line 1906, in _run_once handle._run() File "C:\Users\550N\AppData\Local\Programs\Python\Python310\lib\asyncio\events.py", line 80, in _run self._context.run(self._callback, *self._args) > File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\protocols\http\httptools_impl.py", line 411, in run_asgi result = await app( # type: ignore[func-returns-value] File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\uvicorn\middleware\proxy_headers.py", line 69, in __call__ return await self.app(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\fastapi\applications.py", line 1054, in __call__ await super().__call__(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\applications.py", line 123, in __call__ await self.middleware_stack(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\middleware\errors.py", line 186, in __call__ raise exc File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\middleware\errors.py", line 164, in __call__ await self.app(scope, receive, _send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\middleware\exceptions.py", line 65, in __call__ await wrap_app_handling_exceptions(self.app, conn)(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\_exception_handler.py", line 64, in wrapped_app raise exc File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app await app(scope, receive, sender) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\routing.py", line 756, in __call__ await self.middleware_stack(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\routing.py", line 776, in app await route.handle(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\routing.py", line 485, in handle await self.app(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\fastapi\applications.py", line 1054, in __call__ await super().__call__(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\applications.py", line 123, in __call__ await self.middleware_stack(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\middleware\errors.py", line 186, in __call__ raise exc File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\middleware\errors.py", line 164, in __call__ await self.app(scope, receive, _send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\middleware\exceptions.py", line 65, in __call__ await wrap_app_handling_exceptions(self.app, conn)(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\_exception_handler.py", line 64, in wrapped_app raise exc File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app await app(scope, receive, sender) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\routing.py", line 756, in __call__ await self.middleware_stack(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\routing.py", line 776, in app await route.handle(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\routing.py", line 297, in handle await self.app(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\routing.py", line 77, in app await wrap_app_handling_exceptions(app, request)(scope, receive, send) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\_exception_handler.py", line 64, in wrapped_app raise exc File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app await app(scope, receive, sender) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\starlette\routing.py", line 72, in app response = await func(request) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\fastapi\routing.py", line 278, in app raw_response = await run_endpoint_function( File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\fastapi\routing.py", line 191, in run_endpoint_function return await dependant.call(**values) File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\admin_page\api.py", line 144, in get_target_name return {"targetName": await check_sub_target(platformName, T_Target(target))} File "D:\BOT\Nonbot2\Bison\.venv\lib\site-packages\nonebot_bison\apis.py", line 9, in check_sub_target scheduler = scheduler_dict[scheduler_conf_class] KeyError: <class 'nonebot_bison.platform.bilibili.scheduler.BilibiliSite'> ``` 新版本添加B站用户提示这个
2024-08-12T12:49:45
0.0
[]
[]
MountainDash/nonebot-bison
MountainDash__nonebot-bison-584
dacd03d6e86f2de42b20a8ffdb330fa6638f1167
diff --git a/nonebot_bison/scheduler/manager.py b/nonebot_bison/scheduler/manager.py index 750c0daa..badb91ad 100644 --- a/nonebot_bison/scheduler/manager.py +++ b/nonebot_bison/scheduler/manager.py @@ -52,6 +52,8 @@ async def handle_insert_new_target(platform_name: str, target: T_Target): async def handle_delete_target(platform_name: str, target: T_Target): + if platform_name not in platform_manager: + return platform = platform_manager[platform_name] scheduler_obj = scheduler_dict[platform.site] scheduler_obj.delete_schedulable(platform_name, target) diff --git a/nonebot_bison/sub_manager/del_sub.py b/nonebot_bison/sub_manager/del_sub.py index c1003c28..b70d923a 100644 --- a/nonebot_bison/sub_manager/del_sub.py +++ b/nonebot_bison/sub_manager/del_sub.py @@ -28,12 +28,15 @@ async def send_list(state: T_State, user_info: PlatformTarget = Arg("target_user "target": sub.target.target, } res += f"{index} {sub.target.platform_name} {sub.target.target_name} {sub.target.target}\n" - platform = platform_manager[sub.target.platform_name] - if platform.categories: - res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories)) - if platform.enable_tag: - res += " {}".format(", ".join(sub.tags)) - res += "\n" + if platform := platform_manager.get(sub.target.platform_name): + if platform.categories: + res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories)) + if platform.enable_tag: + res += " {}".format(", ".join(sub.tags)) + else: + res += f" （平台 {sub.target.platform_name} 已失效，请删除此订阅）" + if res[-1] != "\n": + res += "\n" res += "请输入要删除的订阅的序号\n输入'取消'中止" await MessageFactory(await parse_text(res)).send() diff --git a/nonebot_bison/sub_manager/query_sub.py b/nonebot_bison/sub_manager/query_sub.py index 5bce8122..8f4d7bab 100644 --- a/nonebot_bison/sub_manager/query_sub.py +++ b/nonebot_bison/sub_manager/query_sub.py @@ -17,12 +17,15 @@ async def _(user_info: PlatformTarget = Arg("target_user_info")): sub_list = await config.list_subscribe(user_info) res = "订阅的帐号为：\n" for sub in sub_list: - res += f"{sub.target.platform_name} {sub.target.target_name} {sub.target.target}" - platform = platform_manager[sub.target.platform_name] - if platform.categories: - res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories)) - if platform.enable_tag: - res += " {}".format(", ".join(sub.tags)) - res += "\n" + res += f"{sub.target.platform_name} {sub.target.target_name} {sub.target.target}\n" + if platform := platform_manager.get(sub.target.platform_name): + if platform.categories: + res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories)) + if platform.enable_tag: + res += " {}".format(", ".join(sub.tags)) + else: + res += f" （平台 {sub.target.platform_name} 已失效，请删除此订阅）" + if res[-1] != "\n": + res += "\n" await MessageFactory(await parse_text(res)).send() await query_sub.finish()
在订阅了已弃用的 Platform 的群里查询订阅会导致报错 mcbbsnews已被弃用，源代码已从项目中移除 而 `查询订阅` 命令会尝试获取 `mcbbsnews` 这个名称在`platform_manager`中所对应的类，但显然已经找不到了导致抛出异常 https://github.com/MountainDash/nonebot-bison/blob/020aa389e2e07d6590e9ac8d0c4b1f0b35aa1b4d/nonebot_bison/sub_manager/query_sub.py#L20-L22
2024-06-27T03:32:54
0.0
[]
[]
MountainDash/nonebot-bison
MountainDash__nonebot-bison-553
0c1012b0f4a5c0d4698d9a326317a76615af1e9f
diff --git a/nonebot_bison/platform/arknights.py b/nonebot_bison/platform/arknights.py index fb9732f5..f22fd28a 100644 --- a/nonebot_bison/platform/arknights.py +++ b/nonebot_bison/platform/arknights.py @@ -1,3 +1,5 @@ +import re +import html from typing import Any from functools import partial @@ -10,6 +12,7 @@ from ..post import Post from ..utils import Site from ..types import Target, RawPost, Category +from ..post.protocol import HTMLContentSupport from .platform import NewMessage, StatusChange @@ -58,6 +61,39 @@ class ArknightsSite(Site): schedule_setting = {"seconds": 30} +class ArknightsPost(Post, HTMLContentSupport): + def _cleantext(self, text: str, old_split="\n", new_split="\n") -> str: + """清理文本：去掉所有多余的空格和换行""" + lines = text.strip().split(old_split) + cleaned_lines = [line.strip() for line in lines if line != ""] + return new_split.join(cleaned_lines) + + async def get_html_content(self) -> str: + return self.content + + async def get_plain_content(self) -> str: + content = html.unescape(self.content) # 转义HTML特殊字符 + content = re.sub( + r'\<p style="text-align:center;"\>(.*?)\<strong\>(.*?)\<span style=(.*?)\>(.*?)\<\/span\>(.*?)\<\/strong\>(.*?)<\/p\>', # noqa: E501 + r"==\4==\n", + content, + flags=re.DOTALL, + ) # 去“标题型”p + content = re.sub( + r'\<p style="text-align:(left|right);"?\>(.*?)\<\/p\>', + r"\2\n", + content, + flags=re.DOTALL, + ) # 去左右对齐的p + content = re.sub(r"\<p\>(.*?)\</p\>", r"\1\n", content, flags=re.DOTALL) # 去普通p + content = re.sub(r'\<a href="(.*?)" target="_blank">(.*?)\<\/a\>', r"\1", content, flags=re.DOTALL) # 去a + content = re.sub(r"<br/>", "\n", content) # 去br + content = re.sub(r"\<strong\>(.*?)\</strong\>", r"\1", content) # 去strong + content = re.sub(r'<span style="color:(#.*?)">(.*?)</span>', r"\2", content) # 去color + content = re.sub(r'<div class="media-wrap image-wrap">(.*?)</div>', "", content) # 去img + return self._cleantext(content) + + class Arknights(NewMessage): categories = {1: "游戏公告"} platform_name = "arknights" @@ -108,7 +144,7 @@ def title_escape(text: str) -> str: # 只有一张图片 title = title_escape(data.title) - return Post( + return ArknightsPost( self, content=data.content, title=title, @@ -205,7 +241,7 @@ async def parse(self, raw_post: RawPost) -> Post: text = f'{raw_post["title"]}\n{soup.text.strip()}' return Post( self, - text, + content=text, images=imgs, url=url, nickname="塞壬唱片新闻", @@ -246,7 +282,7 @@ async def parse(self, raw_post: RawPost) -> Post: url = f'https://terra-historicus.hypergryph.com/comic/{raw_post["comicCid"]}/episode/{raw_post["episodeCid"]}' return Post( self, - raw_post["subtitle"], + content=raw_post["subtitle"], title=f'{raw_post["title"]} - {raw_post["episodeShortTitle"]}', images=[raw_post["coverUrl"]], url=url, diff --git a/nonebot_bison/platform/bilibili/platforms.py b/nonebot_bison/platform/bilibili/platforms.py index 5324156f..3aeafa38 100644 --- a/nonebot_bison/platform/bilibili/platforms.py +++ b/nonebot_bison/platform/bilibili/platforms.py @@ -465,7 +465,7 @@ async def parse(self, raw_post: Info) -> Post: target_name = f"{raw_post.uname} {raw_post.area_name}" return Post( self, - "", + content="", title=title, url=url, images=list(pic), @@ -550,7 +550,7 @@ async def parse(self, raw_post: RawPost) -> Post: title = lastest_episode["share_copy"] return Post( self, - content, + content=content, title=title, url=url, images=list(pic), diff --git a/nonebot_bison/platform/ff14.py b/nonebot_bison/platform/ff14.py index 31df7147..412a4632 100644 --- a/nonebot_bison/platform/ff14.py +++ b/nonebot_bison/platform/ff14.py @@ -44,4 +44,4 @@ async def parse(self, raw_post: RawPost) -> Post: title = raw_post["Title"] text = raw_post["Summary"] url = raw_post["Author"] - return Post(self, text, title=title, url=url, nickname="最终幻想XIV官方公告") + return Post(self, content=text, title=title, url=url, nickname="最终幻想XIV官方公告") diff --git a/nonebot_bison/platform/ncm.py b/nonebot_bison/platform/ncm.py index 1595cc5b..069ef9c0 100644 --- a/nonebot_bison/platform/ncm.py +++ b/nonebot_bison/platform/ncm.py @@ -69,7 +69,7 @@ async def parse(self, raw_post: RawPost) -> Post: target_name = raw_post["artist"]["name"] pics = [raw_post["picUrl"]] url = "https://music.163.com/#/album?id={}".format(raw_post["id"]) - return Post(self, text, url=url, images=pics, nickname=target_name) + return Post(self, content=text, url=url, images=pics, nickname=target_name) class NcmRadio(NewMessage): @@ -130,4 +130,4 @@ async def parse(self, raw_post: RawPost) -> Post: target_name = raw_post["radio"]["name"] pics = [raw_post["coverUrl"]] url = "https://music.163.com/#/program/{}".format(raw_post["id"]) - return Post(self, text, url=url, images=pics, nickname=target_name) + return Post(self, content=text, url=url, images=pics, nickname=target_name) diff --git a/nonebot_bison/platform/rss.py b/nonebot_bison/platform/rss.py index 39360420..895b1e2c 100644 --- a/nonebot_bison/platform/rss.py +++ b/nonebot_bison/platform/rss.py @@ -9,7 +9,7 @@ from ..post import Post from .platform import NewMessage from ..types import Target, RawPost -from ..utils import Site, text_similarity +from ..utils import Site, text_fletten, text_similarity class RssSite(Site): @@ -18,6 +18,23 @@ class RssSite(Site): schedule_setting = {"seconds": 30} +class RssPost(Post): + + async def get_plain_content(self) -> str: + soup = bs(self.content, "html.parser") + + for img in soup.find_all("img"): + img.replace_with("[图片]") + + for br in soup.find_all("br"): + br.replace_with("\n") + + for p in soup.find_all("p"): + p.insert_after("\n") + + return text_fletten(soup.get_text()) + + class Rss(NewMessage): categories = {} enable_tag = False @@ -72,9 +89,9 @@ async def parse(self, raw_post: RawPost) -> Post: for media in raw_post["media_content"]: if media.get("medium") == "image" and media.get("url"): pics.append(media.get("url")) - return Post( + return RssPost( self, - desc, + content=desc, title=title, url=raw_post.link, images=pics, diff --git a/nonebot_bison/platform/weibo.py b/nonebot_bison/platform/weibo.py index ee771312..1c4876dd 100644 --- a/nonebot_bison/platform/weibo.py +++ b/nonebot_bison/platform/weibo.py @@ -183,7 +183,13 @@ async def _parse_weibo(self, info: dict) -> Post: res.raise_for_status() pics.append(res.content) detail_url = f"https://weibo.com/{info['user']['id']}/{info['bid']}" - return Post(self, parsed_text, url=detail_url, images=pics, nickname=info["user"]["screen_name"]) + return Post( + self, + content=parsed_text, + url=detail_url, + images=pics, + nickname=info["user"]["screen_name"], + ) async def parse(self, raw_post: RawPost) -> Post: info = raw_post["mblog"] diff --git a/nonebot_bison/post/post.py b/nonebot_bison/post/post.py index e7bbd07b..2a1a8a5f 100644 --- a/nonebot_bison/post/post.py +++ b/nonebot_bison/post/post.py @@ -10,6 +10,7 @@ from ..theme import theme_manager from .abstract_post import AbstractPost from ..plugin_config import plugin_config +from .protocol import PlainContentSupport from ..theme.types import ThemeRenderError, ThemeRenderUnsupportError if TYPE_CHECKING: @@ -17,7 +18,7 @@ @dataclass -class Post(AbstractPost): +class Post(AbstractPost, PlainContentSupport): """最通用的Post，理论上包含所有常用的数据 对于更特殊的需要，可以考虑另外实现一个Post @@ -62,6 +63,12 @@ def get_priority_themes(self) -> list[str]: themes_by_priority.append("basic") return themes_by_priority + async def get_content(self): + return self.content + + async def get_plain_content(self): + return self.content + async def generate(self) -> list[MessageSegmentFactory]: """生成消息""" themes = self.get_priority_themes() @@ -95,12 +102,13 @@ def __str__(self) -> str: 来源: <Platform {self.platform.platform_name}> """ post_format += "附加信息:\n" - for field in fields(self): - if field.name in ("content", "platform", "repost"): + for cls_field in fields(self): + if cls_field.name in ("content", "platform", "repost"): continue - value = getattr(self, field.name) - if value is not None: - post_format += f"- {field.name}: {aRepr.repr(value)}\n" + else: + value = getattr(self, cls_field.name) + if value is not None: + post_format += f"- {cls_field.name}: {aRepr.repr(value)}\n" if self.repost: post_format += "\n转发:\n" diff --git a/nonebot_bison/post/protocol.py b/nonebot_bison/post/protocol.py new file mode 100644 index 00000000..4bdf9125 --- /dev/null +++ b/nonebot_bison/post/protocol.py @@ -0,0 +1,16 @@ +from typing import Protocol, runtime_checkable + + +@runtime_checkable +class PlainContentSupport(Protocol): + async def get_plain_content(self) -> str: ... + + +@runtime_checkable +class HTMLContentSupport(Protocol): + async def get_html_content(self) -> str: ... + + +@runtime_checkable +class MarkdownContentSupport(Protocol): + async def get_markdown_content(self) -> str: ... diff --git a/nonebot_bison/theme/themes/arknights/build.py b/nonebot_bison/theme/themes/arknights/build.py index 01c932ea..ec6265d7 100644 --- a/nonebot_bison/theme/themes/arknights/build.py +++ b/nonebot_bison/theme/themes/arknights/build.py @@ -10,7 +10,7 @@ from nonebot_bison.theme import Theme, ThemeRenderError, ThemeRenderUnsupportError if TYPE_CHECKING: - from nonebot_bison.post import Post + from nonebot_bison.platform.arknights import ArknightsPost @dataclass @@ -32,7 +32,7 @@ class ArknightsTheme(Theme): template_path: Path = Path(__file__).parent / "templates" template_name: str = "announce.html.jinja" - async def render(self, post: "Post"): + async def render(self, post: "ArknightsPost"): from nonebot_plugin_htmlrender import template_to_pic if not post.title: @@ -49,10 +49,9 @@ async def render(self, post: "Post"): raise ThemeRenderUnsupportError( f"图片类型错误, 期望 str | Path | bytes | BytesIO | None, 实际为 {type(banner)}" ) - ark_data = ArkData( announce_title=text_fletten(post.title), - content=post.content, + content=await post.get_content(), banner_image_url=banner, ) diff --git a/nonebot_bison/theme/themes/basic/build.py b/nonebot_bison/theme/themes/basic/build.py index 8b33278d..95d22497 100644 --- a/nonebot_bison/theme/themes/basic/build.py +++ b/nonebot_bison/theme/themes/basic/build.py @@ -24,12 +24,15 @@ async def render(self, post: "Post") -> list[MessageSegmentFactory]: text += f"{post.title}\n\n" if post.title else "" - text += post.content if len(post.content) < 500 else f"{post.content[:500]}..." + content = await post.get_plain_content() + text += content if len(content) < 500 else f"{content[:500]}..." if rp := post.repost: text += f"\n--------------\n转发自 {rp.nickname or ''}:\n" text += f"{rp.title}\n\n" if rp.title else "" - text += rp.content if len(rp.content) < 500 else f"{rp.content[:500]}..." + rp_content = await rp.get_plain_content() + + text += rp_content if len(rp_content) < 500 else f"{rp_content[:500]}..." text += "\n--------------\n" diff --git a/nonebot_bison/theme/themes/ceobe_canteen/build.py b/nonebot_bison/theme/themes/ceobe_canteen/build.py index 862b1116..9d3a2be9 100644 --- a/nonebot_bison/theme/themes/ceobe_canteen/build.py +++ b/nonebot_bison/theme/themes/ceobe_canteen/build.py @@ -95,7 +95,7 @@ async def parse(self, post: "Post") -> tuple[CeobeCard, list[str | bytes | Path if post.images: images = await self.merge_pics(post.images, http_client) - content = CeoboContent(text=post.content) + content = CeoboContent(text=await post.get_content()) retweet: CeoboRetweet | None = None if post.repost: @@ -106,7 +106,9 @@ async def parse(self, post: "Post") -> tuple[CeobeCard, list[str | bytes | Path images.extend(repost_images) repost_nickname = f"@{post.repost.nickname}:" if post.repost.nickname else "" - retweet = CeoboRetweet(image=repost_head_pic, content=post.repost.content, author=repost_nickname) + retweet = CeoboRetweet( + image=repost_head_pic, content=await post.repost.get_content(), author=repost_nickname + ) return ( CeobeCard( diff --git a/nonebot_bison/theme/themes/ht2i/build.py b/nonebot_bison/theme/themes/ht2i/build.py index 3134a28b..4f95fa49 100644 --- a/nonebot_bison/theme/themes/ht2i/build.py +++ b/nonebot_bison/theme/themes/ht2i/build.py @@ -5,6 +5,7 @@ from nonebot_plugin_saa import Text, Image, MessageSegmentFactory from nonebot_bison.theme import Theme, ThemeRenderError +from nonebot_bison.post.protocol import HTMLContentSupport from nonebot_bison.utils import pic_merge, is_pics_mergable if TYPE_CHECKING: @@ -30,16 +31,28 @@ async def _text_render(self, text: str): raise ThemeRenderError(f"渲染文本失败: {e}") async def render(self, post: "Post"): + md_text = "" md_text += f"## {post.title}\n\n" if post.title else "" - md_text += post.content if len(post.content) < 500 else f"{post.content[:500]}..." + if isinstance(post, HTMLContentSupport): + content = await post.get_html_content() + else: + content = await post.get_content() + md_text += content if len(content) < 500 else f"{content[:500]}..." md_text += "\n\n" if rp := post.repost: md_text += f"> 转发自 {f'**{rp.nickname}**' if rp.nickname else ''}: \n" md_text += f"> {rp.title} \n" if rp.title else "" - md_text += "> \n> " + rp.content if len(rp.content) < 500 else f"{rp.content[:500]}..." + " \n" + if isinstance(rp, HTMLContentSupport): + rp_content = await rp.get_html_content() + else: + rp_content = await rp.get_content() + + md_text += ( + "> \n> " + rp_content if len(rp_content) < 500 else f"{rp_content[:500]}..." + " \n" # noqa: E501 + ) # noqa: E501 md_text += "\n\n" md_text += f"###### 来源: {post.platform.name} {post.nickname or ''}\n" diff --git a/nonebot_bison/theme/types.py b/nonebot_bison/theme/types.py index 3d4a312c..8802a087 100644 --- a/nonebot_bison/theme/types.py +++ b/nonebot_bison/theme/types.py @@ -38,7 +38,6 @@ async def do_render(self, post: "AbstractPost") -> list[MessageSegmentFactory]: raise ThemeRenderUnsupportError(f"Theme [{self.name}] does not support render {post} by support check") await self.prepare() - return await self.render(post) def check_htmlrender_plugin_enable(self):
Fallback主题渲染时不清理富文本部分 ## 环境 - nonebot-bison 版本：0.9.2 - nonebot 版本：1.4.1 - 安装方式： 1. 通过 nb-cli 安装 ## 问题 fallback导致的直接发送HTML文本 ## 日志 ``` 制作组通讯#41期 <p>感谢大家一直以来对《明日方舟》的关注与支持，很高兴和大家再次见面。在本期制作组通讯发布之际，SideStory「巴别塔」活动已经开启了一段时间，欢迎大家进行体验。</p><p><br/>以下，则是本次制作组通讯为大家带来的最新一期的相关活动及版本内容：<br/><br/></p><div class="media-wrap image-wrap"><img src="https://web.hycdn.cn/announce/images/20240419/c8951a159730643eaae3d55c5c77ce3b.jpg"/></div><p><strong>【通讯节点·一】 </strong></p><p>◆《明日方舟》五周年庆典特别直播节目将于04月27日19:30进行。</p><p>◆ 观看地址：<a href="https://live.bilibili.com/5555734 " target="_blank">https://live.bilibili.com/5555734 </a> 或 <a href=" https://v.douyin.com/iLR... -------------- 来源: 明日方舟游戏信息 明日方舟游戏内公告 ``` - [x] 我搜索过了 issue，但是并没有发现过与我类似的问题 - [x] 我确认在日志中去掉了敏感信息
因为目前basic是直接把post.content发出来的，如果content里的文本是混杂有html标签的话，就会出现这种情况
2024-06-08T09:48:49
0.0
[]
[]
MountainDash/nonebot-bison
MountainDash__nonebot-bison-496
a6809d30e77ebd7ff24a41ff3bb7412fcac5565b
diff --git a/nonebot_bison/admin_page/__init__.py b/nonebot_bison/admin_page/__init__.py index cb5f29c0..4c2d4e68 100644 --- a/nonebot_bison/admin_page/__init__.py +++ b/nonebot_bison/admin_page/__init__.py @@ -66,7 +66,7 @@ def register_get_token_handler(): @get_token.handle() async def send_token(bot: "Bot", event: PrivateMessageEvent, state: T_State): token = tm.get_user_token((event.get_user_id(), event.sender.nickname)) - await get_token.finish(f"请访问: {plugin_config.outer_url}auth/{token}") + await get_token.finish(f"请访问: {plugin_config.outer_url / 'auth' / token}") get_token.__help__name__ = "获取后台管理地址" # type: ignore get_token.__help__info__ = "获取管理bot后台的地址，该地址会在一段时间过后过期，请不要泄漏该地址" # type: ignore diff --git a/nonebot_bison/plugin_config.py b/nonebot_bison/plugin_config.py index 60b179b6..a0734eb3 100644 --- a/nonebot_bison/plugin_config.py +++ b/nonebot_bison/plugin_config.py @@ -1,4 +1,5 @@ import nonebot +from yarl import URL from nonebot import get_plugin_config from pydantic import Field, BaseModel @@ -32,8 +33,11 @@ class PlugConfig(BaseModel): bison_platform_theme: dict[PlatformName, ThemeName] = {} @property - def outer_url(self) -> str: - return self.bison_outer_url or f"http://localhost:{global_config.port}/bison/" + def outer_url(self) -> URL: + if self.bison_outer_url: + return URL(self.bison_outer_url) + else: + return URL(f"http://localhost:{global_config.port}/bison/") plugin_config = get_plugin_config(PlugConfig) diff --git a/poetry.lock b/poetry.lock index 566c625e..0de4b7b1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1645,13 +1645,13 @@ reference = "offical-source" [[package]] name = "ipython" -version = "8.22.1" +version = "8.22.2" description = "IPython: Productive Interactive Computing" optional = false python-versions = ">=3.10" files = [ - {file = "ipython-8.22.1-py3-none-any.whl", hash = "sha256:869335e8cded62ffb6fac8928e5287a05433d6462e3ebaac25f4216474dd6bc4"}, - {file = "ipython-8.22.1.tar.gz", hash = "sha256:39c6f9efc079fb19bfb0f17eee903978fe9a290b1b82d68196c641cecb76ea22"}, + {file = "ipython-8.22.2-py3-none-any.whl", hash = "sha256:3c86f284c8f3d8f2b6c662f885c4889a91df7cd52056fd02b7d8d6195d7f56e9"}, + {file = "ipython-8.22.2.tar.gz", hash = "sha256:2dcaad9049f9056f1fef63514f176c7d41f930daa78d05b82a176202818f2c14"}, ] [package.dependencies] @@ -1956,67 +1956,68 @@ reference = "offical-source" [[package]] name = "msgpack" -version = "1.0.7" +version = "1.0.8" description = "MessagePack serializer" optional = false python-versions = ">=3.8" files = [ - {file = "msgpack-1.0.7-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:04ad6069c86e531682f9e1e71b71c1c3937d6014a7c3e9edd2aa81ad58842862"}, - {file = "msgpack-1.0.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cca1b62fe70d761a282496b96a5e51c44c213e410a964bdffe0928e611368329"}, - {file = "msgpack-1.0.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e50ebce52f41370707f1e21a59514e3375e3edd6e1832f5e5235237db933c98b"}, - {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a7b4f35de6a304b5533c238bee86b670b75b03d31b7797929caa7a624b5dda6"}, - {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28efb066cde83c479dfe5a48141a53bc7e5f13f785b92ddde336c716663039ee"}, - {file = "msgpack-1.0.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4cb14ce54d9b857be9591ac364cb08dc2d6a5c4318c1182cb1d02274029d590d"}, - {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b573a43ef7c368ba4ea06050a957c2a7550f729c31f11dd616d2ac4aba99888d"}, - {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ccf9a39706b604d884d2cb1e27fe973bc55f2890c52f38df742bc1d79ab9f5e1"}, - {file = "msgpack-1.0.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cb70766519500281815dfd7a87d3a178acf7ce95390544b8c90587d76b227681"}, - {file = "msgpack-1.0.7-cp310-cp310-win32.whl", hash = "sha256:b610ff0f24e9f11c9ae653c67ff8cc03c075131401b3e5ef4b82570d1728f8a9"}, - {file = "msgpack-1.0.7-cp310-cp310-win_amd64.whl", hash = "sha256:a40821a89dc373d6427e2b44b572efc36a2778d3f543299e2f24eb1a5de65415"}, - {file = "msgpack-1.0.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:576eb384292b139821c41995523654ad82d1916da6a60cff129c715a6223ea84"}, - {file = "msgpack-1.0.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:730076207cb816138cf1af7f7237b208340a2c5e749707457d70705715c93b93"}, - {file = "msgpack-1.0.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:85765fdf4b27eb5086f05ac0491090fc76f4f2b28e09d9350c31aac25a5aaff8"}, - {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3476fae43db72bd11f29a5147ae2f3cb22e2f1a91d575ef130d2bf49afd21c46"}, - {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d4c80667de2e36970ebf74f42d1088cc9ee7ef5f4e8c35eee1b40eafd33ca5b"}, - {file = "msgpack-1.0.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5b0bf0effb196ed76b7ad883848143427a73c355ae8e569fa538365064188b8e"}, - {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f9a7c509542db4eceed3dcf21ee5267ab565a83555c9b88a8109dcecc4709002"}, - {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:84b0daf226913133f899ea9b30618722d45feffa67e4fe867b0b5ae83a34060c"}, - {file = "msgpack-1.0.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ec79ff6159dffcc30853b2ad612ed572af86c92b5168aa3fc01a67b0fa40665e"}, - {file = "msgpack-1.0.7-cp311-cp311-win32.whl", hash = "sha256:3e7bf4442b310ff154b7bb9d81eb2c016b7d597e364f97d72b1acc3817a0fdc1"}, - {file = "msgpack-1.0.7-cp311-cp311-win_amd64.whl", hash = "sha256:3f0c8c6dfa6605ab8ff0611995ee30d4f9fcff89966cf562733b4008a3d60d82"}, - {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f0936e08e0003f66bfd97e74ee530427707297b0d0361247e9b4f59ab78ddc8b"}, - {file = "msgpack-1.0.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:98bbd754a422a0b123c66a4c341de0474cad4a5c10c164ceed6ea090f3563db4"}, - {file = "msgpack-1.0.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b291f0ee7961a597cbbcc77709374087fa2a9afe7bdb6a40dbbd9b127e79afee"}, - {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebbbba226f0a108a7366bf4b59bf0f30a12fd5e75100c630267d94d7f0ad20e5"}, - {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e2d69948e4132813b8d1131f29f9101bc2c915f26089a6d632001a5c1349672"}, - {file = "msgpack-1.0.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bdf38ba2d393c7911ae989c3bbba510ebbcdf4ecbdbfec36272abe350c454075"}, - {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:993584fc821c58d5993521bfdcd31a4adf025c7d745bbd4d12ccfecf695af5ba"}, - {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:52700dc63a4676669b341ba33520f4d6e43d3ca58d422e22ba66d1736b0a6e4c"}, - {file = "msgpack-1.0.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e45ae4927759289c30ccba8d9fdce62bb414977ba158286b5ddaf8df2cddb5c5"}, - {file = "msgpack-1.0.7-cp312-cp312-win32.whl", hash = "sha256:27dcd6f46a21c18fa5e5deed92a43d4554e3df8d8ca5a47bf0615d6a5f39dbc9"}, - {file = "msgpack-1.0.7-cp312-cp312-win_amd64.whl", hash = "sha256:7687e22a31e976a0e7fc99c2f4d11ca45eff652a81eb8c8085e9609298916dcf"}, - {file = "msgpack-1.0.7-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5b6ccc0c85916998d788b295765ea0e9cb9aac7e4a8ed71d12e7d8ac31c23c95"}, - {file = "msgpack-1.0.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:235a31ec7db685f5c82233bddf9858748b89b8119bf4538d514536c485c15fe0"}, - {file = "msgpack-1.0.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cab3db8bab4b7e635c1c97270d7a4b2a90c070b33cbc00c99ef3f9be03d3e1f7"}, - {file = "msgpack-1.0.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0bfdd914e55e0d2c9e1526de210f6fe8ffe9705f2b1dfcc4aecc92a4cb4b533d"}, - {file = "msgpack-1.0.7-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:36e17c4592231a7dbd2ed09027823ab295d2791b3b1efb2aee874b10548b7524"}, - {file = "msgpack-1.0.7-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:38949d30b11ae5f95c3c91917ee7a6b239f5ec276f271f28638dec9156f82cfc"}, - {file = "msgpack-1.0.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ff1d0899f104f3921d94579a5638847f783c9b04f2d5f229392ca77fba5b82fc"}, - {file = "msgpack-1.0.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:dc43f1ec66eb8440567186ae2f8c447d91e0372d793dfe8c222aec857b81a8cf"}, - {file = "msgpack-1.0.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:dd632777ff3beaaf629f1ab4396caf7ba0bdd075d948a69460d13d44357aca4c"}, - {file = "msgpack-1.0.7-cp38-cp38-win32.whl", hash = "sha256:4e71bc4416de195d6e9b4ee93ad3f2f6b2ce11d042b4d7a7ee00bbe0358bd0c2"}, - {file = "msgpack-1.0.7-cp38-cp38-win_amd64.whl", hash = "sha256:8f5b234f567cf76ee489502ceb7165c2a5cecec081db2b37e35332b537f8157c"}, - {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bfef2bb6ef068827bbd021017a107194956918ab43ce4d6dc945ffa13efbc25f"}, - {file = "msgpack-1.0.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:484ae3240666ad34cfa31eea7b8c6cd2f1fdaae21d73ce2974211df099a95d81"}, - {file = "msgpack-1.0.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3967e4ad1aa9da62fd53e346ed17d7b2e922cba5ab93bdd46febcac39be636fc"}, - {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8dd178c4c80706546702c59529ffc005681bd6dc2ea234c450661b205445a34d"}, - {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6ffbc252eb0d229aeb2f9ad051200668fc3a9aaa8994e49f0cb2ffe2b7867e7"}, - {file = "msgpack-1.0.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:822ea70dc4018c7e6223f13affd1c5c30c0f5c12ac1f96cd8e9949acddb48a61"}, - {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:384d779f0d6f1b110eae74cb0659d9aa6ff35aaf547b3955abf2ab4c901c4819"}, - {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f64e376cd20d3f030190e8c32e1c64582eba56ac6dc7d5b0b49a9d44021b52fd"}, - {file = "msgpack-1.0.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ed82f5a7af3697b1c4786053736f24a0efd0a1b8a130d4c7bfee4b9ded0f08f"}, - {file = "msgpack-1.0.7-cp39-cp39-win32.whl", hash = "sha256:f26a07a6e877c76a88e3cecac8531908d980d3d5067ff69213653649ec0f60ad"}, - {file = "msgpack-1.0.7-cp39-cp39-win_amd64.whl", hash = "sha256:1dc93e8e4653bdb5910aed79f11e165c85732067614f180f70534f056da97db3"}, - {file = "msgpack-1.0.7.tar.gz", hash = "sha256:572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87"}, + {file = "msgpack-1.0.8-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:505fe3d03856ac7d215dbe005414bc28505d26f0c128906037e66d98c4e95868"}, + {file = "msgpack-1.0.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e6b7842518a63a9f17107eb176320960ec095a8ee3b4420b5f688e24bf50c53c"}, + {file = "msgpack-1.0.8-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:376081f471a2ef24828b83a641a02c575d6103a3ad7fd7dade5486cad10ea659"}, + {file = "msgpack-1.0.8-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e390971d082dba073c05dbd56322427d3280b7cc8b53484c9377adfbae67dc2"}, + {file = "msgpack-1.0.8-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00e073efcba9ea99db5acef3959efa45b52bc67b61b00823d2a1a6944bf45982"}, + {file = "msgpack-1.0.8-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:82d92c773fbc6942a7a8b520d22c11cfc8fd83bba86116bfcf962c2f5c2ecdaa"}, + {file = "msgpack-1.0.8-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:9ee32dcb8e531adae1f1ca568822e9b3a738369b3b686d1477cbc643c4a9c128"}, + {file = "msgpack-1.0.8-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e3aa7e51d738e0ec0afbed661261513b38b3014754c9459508399baf14ae0c9d"}, + {file = "msgpack-1.0.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:69284049d07fce531c17404fcba2bb1df472bc2dcdac642ae71a2d079d950653"}, + {file = "msgpack-1.0.8-cp310-cp310-win32.whl", hash = "sha256:13577ec9e247f8741c84d06b9ece5f654920d8365a4b636ce0e44f15e07ec693"}, + {file = "msgpack-1.0.8-cp310-cp310-win_amd64.whl", hash = "sha256:e532dbd6ddfe13946de050d7474e3f5fb6ec774fbb1a188aaf469b08cf04189a"}, + {file = "msgpack-1.0.8-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9517004e21664f2b5a5fd6333b0731b9cf0817403a941b393d89a2f1dc2bd836"}, + {file = "msgpack-1.0.8-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d16a786905034e7e34098634b184a7d81f91d4c3d246edc6bd7aefb2fd8ea6ad"}, + {file = "msgpack-1.0.8-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e2872993e209f7ed04d963e4b4fbae72d034844ec66bc4ca403329db2074377b"}, + {file = "msgpack-1.0.8-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c330eace3dd100bdb54b5653b966de7f51c26ec4a7d4e87132d9b4f738220ba"}, + {file = "msgpack-1.0.8-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:83b5c044f3eff2a6534768ccfd50425939e7a8b5cf9a7261c385de1e20dcfc85"}, + {file = "msgpack-1.0.8-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1876b0b653a808fcd50123b953af170c535027bf1d053b59790eebb0aeb38950"}, + {file = "msgpack-1.0.8-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:dfe1f0f0ed5785c187144c46a292b8c34c1295c01da12e10ccddfc16def4448a"}, + {file = "msgpack-1.0.8-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3528807cbbb7f315bb81959d5961855e7ba52aa60a3097151cb21956fbc7502b"}, + {file = "msgpack-1.0.8-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e2f879ab92ce502a1e65fce390eab619774dda6a6ff719718069ac94084098ce"}, + {file = "msgpack-1.0.8-cp311-cp311-win32.whl", hash = "sha256:26ee97a8261e6e35885c2ecd2fd4a6d38252246f94a2aec23665a4e66d066305"}, + {file = "msgpack-1.0.8-cp311-cp311-win_amd64.whl", hash = "sha256:eadb9f826c138e6cf3c49d6f8de88225a3c0ab181a9b4ba792e006e5292d150e"}, + {file = "msgpack-1.0.8-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:114be227f5213ef8b215c22dde19532f5da9652e56e8ce969bf0a26d7c419fee"}, + {file = "msgpack-1.0.8-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d661dc4785affa9d0edfdd1e59ec056a58b3dbb9f196fa43587f3ddac654ac7b"}, + {file = "msgpack-1.0.8-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d56fd9f1f1cdc8227d7b7918f55091349741904d9520c65f0139a9755952c9e8"}, + {file = "msgpack-1.0.8-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0726c282d188e204281ebd8de31724b7d749adebc086873a59efb8cf7ae27df3"}, + {file = "msgpack-1.0.8-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8db8e423192303ed77cff4dce3a4b88dbfaf43979d280181558af5e2c3c71afc"}, + {file = "msgpack-1.0.8-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:99881222f4a8c2f641f25703963a5cefb076adffd959e0558dc9f803a52d6a58"}, + {file = "msgpack-1.0.8-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b5505774ea2a73a86ea176e8a9a4a7c8bf5d521050f0f6f8426afe798689243f"}, + {file = "msgpack-1.0.8-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:ef254a06bcea461e65ff0373d8a0dd1ed3aa004af48839f002a0c994a6f72d04"}, + {file = "msgpack-1.0.8-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e1dd7839443592d00e96db831eddb4111a2a81a46b028f0facd60a09ebbdd543"}, + {file = "msgpack-1.0.8-cp312-cp312-win32.whl", hash = "sha256:64d0fcd436c5683fdd7c907eeae5e2cbb5eb872fafbc03a43609d7941840995c"}, + {file = "msgpack-1.0.8-cp312-cp312-win_amd64.whl", hash = "sha256:74398a4cf19de42e1498368c36eed45d9528f5fd0155241e82c4082b7e16cffd"}, + {file = "msgpack-1.0.8-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0ceea77719d45c839fd73abcb190b8390412a890df2f83fb8cf49b2a4b5c2f40"}, + {file = "msgpack-1.0.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1ab0bbcd4d1f7b6991ee7c753655b481c50084294218de69365f8f1970d4c151"}, + {file = "msgpack-1.0.8-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1cce488457370ffd1f953846f82323cb6b2ad2190987cd4d70b2713e17268d24"}, + {file = "msgpack-1.0.8-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3923a1778f7e5ef31865893fdca12a8d7dc03a44b33e2a5f3295416314c09f5d"}, + {file = "msgpack-1.0.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a22e47578b30a3e199ab067a4d43d790249b3c0587d9a771921f86250c8435db"}, + {file = "msgpack-1.0.8-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bd739c9251d01e0279ce729e37b39d49a08c0420d3fee7f2a4968c0576678f77"}, + {file = "msgpack-1.0.8-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:d3420522057ebab1728b21ad473aa950026d07cb09da41103f8e597dfbfaeb13"}, + {file = "msgpack-1.0.8-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5845fdf5e5d5b78a49b826fcdc0eb2e2aa7191980e3d2cfd2a30303a74f212e2"}, + {file = "msgpack-1.0.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a0e76621f6e1f908ae52860bdcb58e1ca85231a9b0545e64509c931dd34275a"}, + {file = "msgpack-1.0.8-cp38-cp38-win32.whl", hash = "sha256:374a8e88ddab84b9ada695d255679fb99c53513c0a51778796fcf0944d6c789c"}, + {file = "msgpack-1.0.8-cp38-cp38-win_amd64.whl", hash = "sha256:f3709997b228685fe53e8c433e2df9f0cdb5f4542bd5114ed17ac3c0129b0480"}, + {file = "msgpack-1.0.8-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f51bab98d52739c50c56658cc303f190785f9a2cd97b823357e7aeae54c8f68a"}, + {file = "msgpack-1.0.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:73ee792784d48aa338bba28063e19a27e8d989344f34aad14ea6e1b9bd83f596"}, + {file = "msgpack-1.0.8-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f9904e24646570539a8950400602d66d2b2c492b9010ea7e965025cb71d0c86d"}, + {file = "msgpack-1.0.8-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e75753aeda0ddc4c28dce4c32ba2f6ec30b1b02f6c0b14e547841ba5b24f753f"}, + {file = "msgpack-1.0.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5dbf059fb4b7c240c873c1245ee112505be27497e90f7c6591261c7d3c3a8228"}, + {file = "msgpack-1.0.8-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4916727e31c28be8beaf11cf117d6f6f188dcc36daae4e851fee88646f5b6b18"}, + {file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7938111ed1358f536daf311be244f34df7bf3cdedb3ed883787aca97778b28d8"}, + {file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:493c5c5e44b06d6c9268ce21b302c9ca055c1fd3484c25ba41d34476c76ee746"}, + {file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5fbb160554e319f7b22ecf530a80a3ff496d38e8e07ae763b9e82fadfe96f273"}, + {file = "msgpack-1.0.8-cp39-cp39-win32.whl", hash = "sha256:f9af38a89b6a5c04b7d18c492c8ccf2aee7048aff1ce8437c4683bb5a1df893d"}, + {file = "msgpack-1.0.8-cp39-cp39-win_amd64.whl", hash = "sha256:ed59dd52075f8fc91da6053b12e8c89e37aa043f8986efd89e61fae69dc1b011"}, + {file = "msgpack-1.0.8-py3-none-any.whl", hash = "sha256:24f727df1e20b9876fa6e95f840a2a2651e34c0ad147676356f4bf5fbb0206ca"}, + {file = "msgpack-1.0.8.tar.gz", hash = "sha256:95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3"}, ] [package.source] @@ -2197,13 +2198,13 @@ reference = "offical-source" [[package]] name = "nonebot-adapter-onebot" -version = "2.4.1" +version = "2.4.2" description = "OneBot(CQHTTP) adapter for nonebot2" optional = false python-versions = ">=3.8,<4.0" files = [ - {file = "nonebot_adapter_onebot-2.4.1-py3-none-any.whl", hash = "sha256:67fb0ebaec0265708cc1005a5f45a3408fa8d7b78c835d70d97bd0831d5d5a44"}, - {file = "nonebot_adapter_onebot-2.4.1.tar.gz", hash = "sha256:632e5ea84ba0553d54773a1a6283985d028647eadb07ff8940ea32e8aebe79bc"}, + {file = "nonebot_adapter_onebot-2.4.2-py3-none-any.whl", hash = "sha256:7e97a08300c7dc0a9ba2c7fb4b7dda8b0038fa4e73f5c730932da5d12c4972be"}, + {file = "nonebot_adapter_onebot-2.4.2.tar.gz", hash = "sha256:7ef7eca7b3eaf60f503c7e4f8df8ab0c58506645bbcca8297a9b93159ce98033"}, ] [package.dependencies] @@ -2702,18 +2703,18 @@ reference = "offical-source" [[package]] name = "playwright" -version = "1.41.2" +version = "1.42.0" description = "A high-level API to automate web browsers" optional = false python-versions = ">=3.8" files = [ - {file = "playwright-1.41.2-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:cf68335a5dfa4038fa797a4ba0105faee0094ebbb372547d7a27feec5b23c672"}, - {file = "playwright-1.41.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:431e3a05f8c99147995e2b3e8475d07818745294fd99f1510b61756e73bdcf68"}, - {file = "playwright-1.41.2-py3-none-macosx_11_0_universal2.whl", hash = "sha256:0608717cbf291a625ba6f751061af0fc0cc9bdace217e69d87b1eb1383b03406"}, - {file = "playwright-1.41.2-py3-none-manylinux1_x86_64.whl", hash = "sha256:4bf214d812092cf5b9b9648ba84611aa35e28685519911342a7da3a3031f9ed6"}, - {file = "playwright-1.41.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eaa17ab44622c447de26ed8f7d99912719568d8dbc3a9db0e07f0ae1487709d9"}, - {file = "playwright-1.41.2-py3-none-win32.whl", hash = "sha256:edb210a015e70bb0d328bf1c9b65fa3a08361f33e4d7c4ddd1ad2adb6d9b4479"}, - {file = "playwright-1.41.2-py3-none-win_amd64.whl", hash = "sha256:71ead0f33e00f5a8533c037c647938b99f219436a1b27d4ba4de4e6bf0567278"}, + {file = "playwright-1.42.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:e2b293f077efeaa45253fde31cea4bc6b0ae8be6b5e65e8ce8b4aa3b9f0d55b6"}, + {file = "playwright-1.42.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:283887f0bdd0039c3d720e32fbc73a045c24fa800599a6ad60fb199c29580534"}, + {file = "playwright-1.42.0-py3-none-macosx_11_0_universal2.whl", hash = "sha256:4e1fc1c049a0af64626ddd50814d14a01f316bcbb4d1aa83c3416fe420add558"}, + {file = "playwright-1.42.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:313f2551a772f57c9ccca017c4dd4661f2277166f9e1d84bbf5a2e316f0f892c"}, + {file = "playwright-1.42.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b2a46a24641e5d468046cde567c98fdb8d85e32df901630b14dfb288cbd1ed4f"}, + {file = "playwright-1.42.0-py3-none-win32.whl", hash = "sha256:dbf473496808d4c2c816902c1dee2aabc029648e56ce8514b643f5a1a6fc8e22"}, + {file = "playwright-1.42.0-py3-none-win_amd64.whl", hash = "sha256:e092c6cfbf797bff03fbdfc53c3e6a9e29fbcf6b82f9e43113d37494aee0561b"}, ] [package.dependencies] @@ -3176,13 +3177,13 @@ reference = "offical-source" [[package]] name = "pymdown-extensions" -version = "10.7" +version = "10.7.1" description = "Extension pack for Python Markdown." optional = false python-versions = ">=3.8" files = [ - {file = "pymdown_extensions-10.7-py3-none-any.whl", hash = "sha256:6ca215bc57bc12bf32b414887a68b810637d039124ed9b2e5bd3325cbb2c050c"}, - {file = "pymdown_extensions-10.7.tar.gz", hash = "sha256:c0d64d5cf62566f59e6b2b690a4095c931107c250a8c8e1351c1de5f6b036deb"}, + {file = "pymdown_extensions-10.7.1-py3-none-any.whl", hash = "sha256:f5cc7000d7ff0d1ce9395d216017fa4df3dde800afb1fb72d1c7d3fd35e710f4"}, + {file = "pymdown_extensions-10.7.1.tar.gz", hash = "sha256:c70e146bdd83c744ffc766b4671999796aba18842b268510a329f7f64700d584"}, ] [package.dependencies] @@ -3336,13 +3337,13 @@ reference = "offical-source" [[package]] name = "python-dateutil" -version = "2.8.2" +version = "2.9.0.post0" description = "Extensions to the standard Python datetime module" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" files = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, + {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"}, + {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"}, ] [package.dependencies] @@ -3617,13 +3618,13 @@ reference = "offical-source" [[package]] name = "rich" -version = "13.7.0" +version = "13.7.1" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false python-versions = ">=3.7.0" files = [ - {file = "rich-13.7.0-py3-none-any.whl", hash = "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"}, - {file = "rich-13.7.0.tar.gz", hash = "sha256:5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf5403fa"}, + {file = "rich-13.7.1-py3-none-any.whl", hash = "sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222"}, + {file = "rich-13.7.1.tar.gz", hash = "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"}, ] [package.dependencies] @@ -3777,60 +3778,60 @@ reference = "offical-source" [[package]] name = "sqlalchemy" -version = "2.0.27" +version = "2.0.28" description = "Database Abstraction Library" optional = false python-versions = ">=3.7" files = [ - {file = "SQLAlchemy-2.0.27-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d04e579e911562f1055d26dab1868d3e0bb905db3bccf664ee8ad109f035618a"}, - {file = "SQLAlchemy-2.0.27-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fa67d821c1fd268a5a87922ef4940442513b4e6c377553506b9db3b83beebbd8"}, - {file = "SQLAlchemy-2.0.27-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c7a596d0be71b7baa037f4ac10d5e057d276f65a9a611c46970f012752ebf2d"}, - {file = "SQLAlchemy-2.0.27-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:954d9735ee9c3fa74874c830d089a815b7b48df6f6b6e357a74130e478dbd951"}, - {file = "SQLAlchemy-2.0.27-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5cd20f58c29bbf2680039ff9f569fa6d21453fbd2fa84dbdb4092f006424c2e6"}, - {file = "SQLAlchemy-2.0.27-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:03f448ffb731b48323bda68bcc93152f751436ad6037f18a42b7e16af9e91c07"}, - {file = "SQLAlchemy-2.0.27-cp310-cp310-win32.whl", hash = "sha256:d997c5938a08b5e172c30583ba6b8aad657ed9901fc24caf3a7152eeccb2f1b4"}, - {file = "SQLAlchemy-2.0.27-cp310-cp310-win_amd64.whl", hash = "sha256:eb15ef40b833f5b2f19eeae65d65e191f039e71790dd565c2af2a3783f72262f"}, - {file = "SQLAlchemy-2.0.27-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6c5bad7c60a392850d2f0fee8f355953abaec878c483dd7c3836e0089f046bf6"}, - {file = "SQLAlchemy-2.0.27-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a3012ab65ea42de1be81fff5fb28d6db893ef978950afc8130ba707179b4284a"}, - {file = "SQLAlchemy-2.0.27-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dbcd77c4d94b23e0753c5ed8deba8c69f331d4fd83f68bfc9db58bc8983f49cd"}, - {file = "SQLAlchemy-2.0.27-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d177b7e82f6dd5e1aebd24d9c3297c70ce09cd1d5d37b43e53f39514379c029c"}, - {file = "SQLAlchemy-2.0.27-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:680b9a36029b30cf063698755d277885d4a0eab70a2c7c6e71aab601323cba45"}, - {file = "SQLAlchemy-2.0.27-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1306102f6d9e625cebaca3d4c9c8f10588735ef877f0360b5cdb4fdfd3fd7131"}, - {file = "SQLAlchemy-2.0.27-cp311-cp311-win32.whl", hash = "sha256:5b78aa9f4f68212248aaf8943d84c0ff0f74efc65a661c2fc68b82d498311fd5"}, - {file = "SQLAlchemy-2.0.27-cp311-cp311-win_amd64.whl", hash = "sha256:15e19a84b84528f52a68143439d0c7a3a69befcd4f50b8ef9b7b69d2628ae7c4"}, - {file = "SQLAlchemy-2.0.27-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:0de1263aac858f288a80b2071990f02082c51d88335a1db0d589237a3435fe71"}, - {file = "SQLAlchemy-2.0.27-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ce850db091bf7d2a1f2fdb615220b968aeff3849007b1204bf6e3e50a57b3d32"}, - {file = "SQLAlchemy-2.0.27-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8dfc936870507da96aebb43e664ae3a71a7b96278382bcfe84d277b88e379b18"}, - {file = "SQLAlchemy-2.0.27-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4fbe6a766301f2e8a4519f4500fe74ef0a8509a59e07a4085458f26228cd7cc"}, - {file = "SQLAlchemy-2.0.27-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4535c49d961fe9a77392e3a630a626af5baa967172d42732b7a43496c8b28876"}, - {file = "SQLAlchemy-2.0.27-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:0fb3bffc0ced37e5aa4ac2416f56d6d858f46d4da70c09bb731a246e70bff4d5"}, - {file = "SQLAlchemy-2.0.27-cp312-cp312-win32.whl", hash = "sha256:7f470327d06400a0aa7926b375b8e8c3c31d335e0884f509fe272b3c700a7254"}, - {file = "SQLAlchemy-2.0.27-cp312-cp312-win_amd64.whl", hash = "sha256:f9374e270e2553653d710ece397df67db9d19c60d2647bcd35bfc616f1622dcd"}, - {file = "SQLAlchemy-2.0.27-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e97cf143d74a7a5a0f143aa34039b4fecf11343eed66538610debc438685db4a"}, - {file = "SQLAlchemy-2.0.27-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7b5a3e2120982b8b6bd1d5d99e3025339f7fb8b8267551c679afb39e9c7c7f1"}, - {file = "SQLAlchemy-2.0.27-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e36aa62b765cf9f43a003233a8c2d7ffdeb55bc62eaa0a0380475b228663a38f"}, - {file = "SQLAlchemy-2.0.27-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:5ada0438f5b74c3952d916c199367c29ee4d6858edff18eab783b3978d0db16d"}, - {file = "SQLAlchemy-2.0.27-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b1d9d1bfd96eef3c3faedb73f486c89e44e64e40e5bfec304ee163de01cf996f"}, - {file = "SQLAlchemy-2.0.27-cp37-cp37m-win32.whl", hash = "sha256:ca891af9f3289d24a490a5fde664ea04fe2f4984cd97e26de7442a4251bd4b7c"}, - {file = "SQLAlchemy-2.0.27-cp37-cp37m-win_amd64.whl", hash = "sha256:fd8aafda7cdff03b905d4426b714601c0978725a19efc39f5f207b86d188ba01"}, - {file = "SQLAlchemy-2.0.27-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ec1f5a328464daf7a1e4e385e4f5652dd9b1d12405075ccba1df842f7774b4fc"}, - {file = "SQLAlchemy-2.0.27-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ad862295ad3f644e3c2c0d8b10a988e1600d3123ecb48702d2c0f26771f1c396"}, - {file = "SQLAlchemy-2.0.27-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48217be1de7d29a5600b5c513f3f7664b21d32e596d69582be0a94e36b8309cb"}, - {file = "SQLAlchemy-2.0.27-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e56afce6431450442f3ab5973156289bd5ec33dd618941283847c9fd5ff06bf"}, - {file = "SQLAlchemy-2.0.27-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:611068511b5531304137bcd7fe8117c985d1b828eb86043bd944cebb7fae3910"}, - {file = "SQLAlchemy-2.0.27-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b86abba762ecfeea359112b2bb4490802b340850bbee1948f785141a5e020de8"}, - {file = "SQLAlchemy-2.0.27-cp38-cp38-win32.whl", hash = "sha256:30d81cc1192dc693d49d5671cd40cdec596b885b0ce3b72f323888ab1c3863d5"}, - {file = "SQLAlchemy-2.0.27-cp38-cp38-win_amd64.whl", hash = "sha256:120af1e49d614d2525ac247f6123841589b029c318b9afbfc9e2b70e22e1827d"}, - {file = "SQLAlchemy-2.0.27-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d07ee7793f2aeb9b80ec8ceb96bc8cc08a2aec8a1b152da1955d64e4825fcbac"}, - {file = "SQLAlchemy-2.0.27-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:cb0845e934647232b6ff5150df37ceffd0b67b754b9fdbb095233deebcddbd4a"}, - {file = "SQLAlchemy-2.0.27-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fc19ae2e07a067663dd24fca55f8ed06a288384f0e6e3910420bf4b1270cc51"}, - {file = "SQLAlchemy-2.0.27-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b90053be91973a6fb6020a6e44382c97739736a5a9d74e08cc29b196639eb979"}, - {file = "SQLAlchemy-2.0.27-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2f5c9dfb0b9ab5e3a8a00249534bdd838d943ec4cfb9abe176a6c33408430230"}, - {file = "SQLAlchemy-2.0.27-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:33e8bde8fff203de50399b9039c4e14e42d4d227759155c21f8da4a47fc8053c"}, - {file = "SQLAlchemy-2.0.27-cp39-cp39-win32.whl", hash = "sha256:d873c21b356bfaf1589b89090a4011e6532582b3a8ea568a00e0c3aab09399dd"}, - {file = "SQLAlchemy-2.0.27-cp39-cp39-win_amd64.whl", hash = "sha256:ff2f1b7c963961d41403b650842dc2039175b906ab2093635d8319bef0b7d620"}, - {file = "SQLAlchemy-2.0.27-py3-none-any.whl", hash = "sha256:1ab4e0448018d01b142c916cc7119ca573803a4745cfe341b8f95657812700ac"}, - {file = "SQLAlchemy-2.0.27.tar.gz", hash = "sha256:86a6ed69a71fe6b88bf9331594fa390a2adda4a49b5c06f98e47bf0d392534f8"}, + {file = "SQLAlchemy-2.0.28-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0b148ab0438f72ad21cb004ce3bdaafd28465c4276af66df3b9ecd2037bf252"}, + {file = "SQLAlchemy-2.0.28-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:bbda76961eb8f27e6ad3c84d1dc56d5bc61ba8f02bd20fcf3450bd421c2fcc9c"}, + {file = "SQLAlchemy-2.0.28-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:feea693c452d85ea0015ebe3bb9cd15b6f49acc1a31c28b3c50f4db0f8fb1e71"}, + {file = "SQLAlchemy-2.0.28-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5da98815f82dce0cb31fd1e873a0cb30934971d15b74e0d78cf21f9e1b05953f"}, + {file = "SQLAlchemy-2.0.28-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4a5adf383c73f2d49ad15ff363a8748319ff84c371eed59ffd0127355d6ea1da"}, + {file = "SQLAlchemy-2.0.28-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:56856b871146bfead25fbcaed098269d90b744eea5cb32a952df00d542cdd368"}, + {file = "SQLAlchemy-2.0.28-cp310-cp310-win32.whl", hash = "sha256:943aa74a11f5806ab68278284a4ddd282d3fb348a0e96db9b42cb81bf731acdc"}, + {file = "SQLAlchemy-2.0.28-cp310-cp310-win_amd64.whl", hash = "sha256:c6c4da4843e0dabde41b8f2e8147438330924114f541949e6318358a56d1875a"}, + {file = "SQLAlchemy-2.0.28-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46a3d4e7a472bfff2d28db838669fc437964e8af8df8ee1e4548e92710929adc"}, + {file = "SQLAlchemy-2.0.28-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0d3dd67b5d69794cfe82862c002512683b3db038b99002171f624712fa71aeaa"}, + {file = "SQLAlchemy-2.0.28-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c61e2e41656a673b777e2f0cbbe545323dbe0d32312f590b1bc09da1de6c2a02"}, + {file = "SQLAlchemy-2.0.28-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0315d9125a38026227f559488fe7f7cee1bd2fbc19f9fd637739dc50bb6380b2"}, + {file = "SQLAlchemy-2.0.28-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:af8ce2d31679006e7b747d30a89cd3ac1ec304c3d4c20973f0f4ad58e2d1c4c9"}, + {file = "SQLAlchemy-2.0.28-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:81ba314a08c7ab701e621b7ad079c0c933c58cdef88593c59b90b996e8b58fa5"}, + {file = "SQLAlchemy-2.0.28-cp311-cp311-win32.whl", hash = "sha256:1ee8bd6d68578e517943f5ebff3afbd93fc65f7ef8f23becab9fa8fb315afb1d"}, + {file = "SQLAlchemy-2.0.28-cp311-cp311-win_amd64.whl", hash = "sha256:ad7acbe95bac70e4e687a4dc9ae3f7a2f467aa6597049eeb6d4a662ecd990bb6"}, + {file = "SQLAlchemy-2.0.28-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d3499008ddec83127ab286c6f6ec82a34f39c9817f020f75eca96155f9765097"}, + {file = "SQLAlchemy-2.0.28-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9b66fcd38659cab5d29e8de5409cdf91e9986817703e1078b2fdaad731ea66f5"}, + {file = "SQLAlchemy-2.0.28-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bea30da1e76cb1acc5b72e204a920a3a7678d9d52f688f087dc08e54e2754c67"}, + {file = "SQLAlchemy-2.0.28-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:124202b4e0edea7f08a4db8c81cc7859012f90a0d14ba2bf07c099aff6e96462"}, + {file = "SQLAlchemy-2.0.28-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:e23b88c69497a6322b5796c0781400692eca1ae5532821b39ce81a48c395aae9"}, + {file = "SQLAlchemy-2.0.28-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4b6303bfd78fb3221847723104d152e5972c22367ff66edf09120fcde5ddc2e2"}, + {file = "SQLAlchemy-2.0.28-cp312-cp312-win32.whl", hash = "sha256:a921002be69ac3ab2cf0c3017c4e6a3377f800f1fca7f254c13b5f1a2f10022c"}, + {file = "SQLAlchemy-2.0.28-cp312-cp312-win_amd64.whl", hash = "sha256:b4a2cf92995635b64876dc141af0ef089c6eea7e05898d8d8865e71a326c0385"}, + {file = "SQLAlchemy-2.0.28-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e91b5e341f8c7f1e5020db8e5602f3ed045a29f8e27f7f565e0bdee3338f2c7"}, + {file = "SQLAlchemy-2.0.28-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45c7b78dfc7278329f27be02c44abc0d69fe235495bb8e16ec7ef1b1a17952db"}, + {file = "SQLAlchemy-2.0.28-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3eba73ef2c30695cb7eabcdb33bb3d0b878595737479e152468f3ba97a9c22a4"}, + {file = "SQLAlchemy-2.0.28-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:5df5d1dafb8eee89384fb7a1f79128118bc0ba50ce0db27a40750f6f91aa99d5"}, + {file = "SQLAlchemy-2.0.28-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2858bbab1681ee5406650202950dc8f00e83b06a198741b7c656e63818633526"}, + {file = "SQLAlchemy-2.0.28-cp37-cp37m-win32.whl", hash = "sha256:9461802f2e965de5cff80c5a13bc945abea7edaa1d29360b485c3d2b56cdb075"}, + {file = "SQLAlchemy-2.0.28-cp37-cp37m-win_amd64.whl", hash = "sha256:a6bec1c010a6d65b3ed88c863d56b9ea5eeefdf62b5e39cafd08c65f5ce5198b"}, + {file = "SQLAlchemy-2.0.28-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:843a882cadebecc655a68bd9a5b8aa39b3c52f4a9a5572a3036fb1bb2ccdc197"}, + {file = "SQLAlchemy-2.0.28-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:dbb990612c36163c6072723523d2be7c3eb1517bbdd63fe50449f56afafd1133"}, + {file = "SQLAlchemy-2.0.28-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bd7e4baf9161d076b9a7e432fce06217b9bd90cfb8f1d543d6e8c4595627edb9"}, + {file = "SQLAlchemy-2.0.28-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e0a5354cb4de9b64bccb6ea33162cb83e03dbefa0d892db88a672f5aad638a75"}, + {file = "SQLAlchemy-2.0.28-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:fffcc8edc508801ed2e6a4e7b0d150a62196fd28b4e16ab9f65192e8186102b6"}, + {file = "SQLAlchemy-2.0.28-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aca7b6d99a4541b2ebab4494f6c8c2f947e0df4ac859ced575238e1d6ca5716b"}, + {file = "SQLAlchemy-2.0.28-cp38-cp38-win32.whl", hash = "sha256:8c7f10720fc34d14abad5b647bc8202202f4948498927d9f1b4df0fb1cf391b7"}, + {file = "SQLAlchemy-2.0.28-cp38-cp38-win_amd64.whl", hash = "sha256:243feb6882b06a2af68ecf4bec8813d99452a1b62ba2be917ce6283852cf701b"}, + {file = "SQLAlchemy-2.0.28-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fc4974d3684f28b61b9a90fcb4c41fb340fd4b6a50c04365704a4da5a9603b05"}, + {file = "SQLAlchemy-2.0.28-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:87724e7ed2a936fdda2c05dbd99d395c91ea3c96f029a033a4a20e008dd876bf"}, + {file = "SQLAlchemy-2.0.28-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68722e6a550f5de2e3cfe9da6afb9a7dd15ef7032afa5651b0f0c6b3adb8815d"}, + {file = "SQLAlchemy-2.0.28-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:328529f7c7f90adcd65aed06a161851f83f475c2f664a898af574893f55d9e53"}, + {file = "SQLAlchemy-2.0.28-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:df40c16a7e8be7413b885c9bf900d402918cc848be08a59b022478804ea076b8"}, + {file = "SQLAlchemy-2.0.28-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:426f2fa71331a64f5132369ede5171c52fd1df1bd9727ce621f38b5b24f48750"}, + {file = "SQLAlchemy-2.0.28-cp39-cp39-win32.whl", hash = "sha256:33157920b233bc542ce497a81a2e1452e685a11834c5763933b440fedd1d8e2d"}, + {file = "SQLAlchemy-2.0.28-cp39-cp39-win_amd64.whl", hash = "sha256:2f60843068e432311c886c5f03c4664acaef507cf716f6c60d5fde7265be9d7b"}, + {file = "SQLAlchemy-2.0.28-py3-none-any.whl", hash = "sha256:78bb7e8da0183a8301352d569900d9d3594c48ac21dc1c2ec6b3121ed8b6c986"}, + {file = "SQLAlchemy-2.0.28.tar.gz", hash = "sha256:dd53b6c4e6d960600fd6532b79ee28e2da489322fcf6648738134587faf767b6"}, ] [package.dependencies] @@ -4564,4 +4565,4 @@ yaml = [] [metadata] lock-version = "2.0" python-versions = ">=3.10,<4.0.0" -content-hash = "356856bb309e6d78db621bee41abef3dedbdd68dd3d7afb800cd80596b24ba0e" +content-hash = "19e95bf80b9de2a80cf985563fe73ddaa67044e73e096a7cdb18337c15aeedce" diff --git a/pyproject.toml b/pyproject.toml index 1d6131a0..81bb1fc7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,7 @@ python-socketio = "^5.4.0" tinydb = "^4.3.0" qrcode = "^7.4.2" pydantic = ">=1.10.0,<3.0.0,!=2.5.0,!=2.5.1" +yarl = ">=1.9.4" [tool.poetry.group.dev.dependencies] black = ">=23.7,<25.0"
docker-compose文件少了/，文档内似乎也没有 - 安装方式：（以下方式的一种或者其他方式） docker -compose安装 - 操作系统： ## 问题 docker-compose文件后台登录url少打了一个/， 导致使用后台管理登录not found，建议改一下，对我们这些菜鸡比较重要，搜了好一会bing才找到问题 实际应该http://<你的服务器ip>:8080/bison/ 才能登陆 ## 日志 ![image](https://github.com/MountainDash/nonebot-bison/assets/108792311/9c177e3d-3d90-4b9f-9ded-57f0981e76ad) ``` 请在这里粘贴你的日志 ``` - [x] 我搜索过了 issue，但是并没有发现过与我类似的问题 - [ ] 我确认在日志中去掉了敏感信息
2024-03-08T05:57:11
0.0
[]
[]
MountainDash/nonebot-bison
MountainDash__nonebot-bison-405
05d01aee6c11cb1edc10d029fc879da1ae387b0e
diff --git a/docs/usage/README.md b/docs/usage/README.md index 33d407dd..3b1da447 100644 --- a/docs/usage/README.md +++ b/docs/usage/README.md @@ -31,14 +31,24 @@ next: /usage/easy-use ::: - `BISON_SKIP_BROWSER_CHECK`: 是否在启动时自动下载浏览器，如果选择`False`会在用到浏览器时自动下载， 默认`True` -- `BISON_OUTER_URL`: 从外部访问服务器的地址，默认为`http://localhost:8080/bison/`，如果你的插件部署 - 在服务器上，建议配置为`http://<你的服务器ip>:8080/bison/` +- `BISON_OUTER_URL`: 从外部访问服务器的地址，不设置或为空时默认值为 `http://localhost:<Bot运行在的端口>/bison/` ::: warning 请注意，该网址**并不能直接访问**Bison 的后台管理网页，正确的访问方法请参见[私聊机器人获取后台地址](#私聊机器人获取后台地址) ::: - ::: tip - 如果需要从外网或者 Docker 容器外访问后台页面，请确保`HOST=0.0.0.0` + ::: tip 配置建议 + 请选择你的部署情况： + <div class="outer_url_help"> + <input type="checkbox" id="docker" v-model="docker"/> + <label for="docker">使用容器部署</label> + <input type="checkbox" id="server" v-model="server"/> + <label for="server">部署在服务器上</label> + <input type="checkbox" id="reverse-proxy" v-model="reverseProxy"/> + <label for="reverse-proxy">启用反代</label> + </div> + 下面是配置建议： + <div class="outer_url_help" v-html="outerUrlHelp"></div> ::: + - `BISON_FILTER_LOG`: 是否过滤来自`nonebot`的 warning 级以下的 log，如果你的 bot 只运行了这个插件可以考虑 开启，默认关 - `BISON_USE_QUEUE`: 是否用队列的方式发送消息，降低发送频率，默认开 @@ -190,3 +200,56 @@ Bison 在处理每条推送时，会按照以下规则检查推送中的 Tag： - 如果推送中含有任何已记录的**需订阅 Tag**，Bison 会将该推送发送到群中，不管是否有其他 Tag。 - 如果**没有记录**任何需订阅 Tag，Bison 会将所有通过第一条规则检查的推送发送到群中。 - 如果记录了至少一个需订阅 Tag，Bison 会**丢弃所有**不含任何需订阅 Tag 的推送，即使通过了第一条规则检查。 + +<script setup> +import { ref, computed } from 'vue'; + +const docker = ref(false); +const server = ref(false); +const reverseProxy = ref(false); + +const outerUrlHelp = computed(() => { + let helpText = ''; + + if ((docker.value || server.value) && !reverseProxy.value) + helpText += '将Bot配置中的 <code>HOST</code> 部分设置为 <code>0.0.0.0</code><br>'; + + if (docker.value && !server.value && !reverseProxy.value) + helpText += '将 <code>BISON_OUTER_URL</code> 设置为 <code>http://localhost:[Docker映射到主机的端口]/bison/</code><br>'; + + if (server.value && !reverseProxy.value){ + if (docker.value) + helpText += '将 <code>BISON_OUTER_URL</code> 设置为 <code>http://[你的服务器ip]:[Docker映射到主机的端口]/bison/</code><br>'; + else + helpText += '将 <code>BISON_OUTER_URL</code> 设置为 <code>http://[你的服务器ip]:[Bot运行的端口]/bison/</code><br>'; + } + + if (reverseProxy.value){ + if (server.value){ + helpText += '将 <code>BISON_OUTER_URL</code> 设置为 <code>http://[你的服务器ip]:[反代端口]/bison/</code><br>'; + if (docker.value) + helpText += '请注意反代端口应该指向Docker映射到主机的端口<br>'; + else + helpText += '请注意反代端口应该指向Bot运行的端口<br>'; + } + else + helpText += '谁没事在自己电脑上起反代啊（<br>'; + } + + if (!docker.value && !server.value && !reverseProxy.value) + helpText += '你无需设置此项<br>'; + + return helpText; +}); +</script> + +<style> +.outer_url_help { + margin-top: 10px; + margin-bottom: 10px; +} + +.outer_url_help label { + margin-right: 15px; +} +</style> diff --git a/docs/usage/easy-use.md b/docs/usage/easy-use.md index 94256c5b..a6b6c3dd 100644 --- a/docs/usage/easy-use.md +++ b/docs/usage/easy-use.md @@ -144,7 +144,7 @@ Bison 提供了一个网页管理订阅的功能，你可以在网页上查看 ::: tip Bison 给出的链接无效？ Bison 所给的链接中的 ip 和 port 是`BISON_OUTER_URL`配置决定的，也就是说 Bison 本身不能获取服务器的 ip 与自身的 port，所以 Bison 给出的链接可能是无效的。你可以在`BISON_OUTER_URL`中设置你的服务器 ip 与 port，或者直接修改 Bison 给出的链接为正确的`http://<ip>:<port>/bison/...`来进入网页管理订阅的界面。 -参见[详细介绍-配置](usage/#配置)的`BISON_OUTER_URL`部分 +参见[详细介绍-配置](/usage/#配置)的`BISON_OUTER_URL`部分 ::: ::: tip 认证失败？ :bug: diff --git a/nonebot_bison/admin_page/__init__.py b/nonebot_bison/admin_page/__init__.py index b14b81b5..cb5f29c0 100644 --- a/nonebot_bison/admin_page/__init__.py +++ b/nonebot_bison/admin_page/__init__.py @@ -66,7 +66,7 @@ def register_get_token_handler(): @get_token.handle() async def send_token(bot: "Bot", event: PrivateMessageEvent, state: T_State): token = tm.get_user_token((event.get_user_id(), event.sender.nickname)) - await get_token.finish(f"请访问: {plugin_config.bison_outer_url}auth/{token}") + await get_token.finish(f"请访问: {plugin_config.outer_url}auth/{token}") get_token.__help__name__ = "获取后台管理地址" # type: ignore get_token.__help__info__ = "获取管理bot后台的地址，该地址会在一段时间过后过期，请不要泄漏该地址" # type: ignore diff --git a/nonebot_bison/plugin_config.py b/nonebot_bison/plugin_config.py index 842bf409..8d52d3bd 100644 --- a/nonebot_bison/plugin_config.py +++ b/nonebot_bison/plugin_config.py @@ -1,13 +1,15 @@ import nonebot from pydantic import BaseSettings +global_config = nonebot.get_driver().config + class PlugConfig(BaseSettings): bison_config_path: str = "" bison_use_pic: bool = False bison_init_filter: bool = True bison_use_queue: bool = True - bison_outer_url: str = "http://localhost:8080/bison/" + bison_outer_url: str = "" bison_filter_log: bool = False bison_to_me: bool = True bison_skip_browser_check: bool = False @@ -20,9 +22,12 @@ class PlugConfig(BaseSettings): ) bison_show_network_warning: bool = True + @property + def outer_url(self) -> str: + return self.bison_outer_url or f"http://localhost:{global_config.port}/bison/" + class Config: extra = "ignore" -global_config = nonebot.get_driver().config plugin_config = PlugConfig(**global_config.dict())
BISON_OUTER_URL的配置文档不明确 ## 环境 - nonebot-bison 版本：0.8.0 - nonebot 版本：1.2.2 - 安装方式：通过 nb-cli 安装 - 操作系统：Debian ## 问题 无论设置 BISON_OUTER_URL 为 `http://服务器ip:8080/bison/` 还是 `http://0.0.0.0:8080/bison/`，访问后台网页都返回 502 错误 若设置为 localhost 并启用反代，出现 #277 的问题 ## 日志 ``` 无相关日志 ``` - [x] 我搜索过了 issue，但是并没有发现过与我类似的问题 - [x] 我确认在日志中去掉了敏感信息
还是需要提供你的网络和部署环境 bot 部署在腾讯云服务器上 防火墙的对应端口都开放了 如果url不包含/bison/呢，会返回什么 > 如果url不包含/bison/呢，会返回什么 同样502 正常情况应该返回404，如果是502可能需要排查一下反代或者是访问链路的问题 我大概懂了 现在Bison的web管理界面是开在和Bot同一个端口的，这个配置项只是为了修改Bot发送的提醒 把反代目标设置为Bot的端口就解决问题了 文档是不是最好改改 感觉这样有点迷惑） 既然这样 要不pr一个？（ 其实感觉更好的解决方案是根据配置的url来起配置界面（？ 主要是做不到（ 那改成只填ip，端口用读到的Nonebot端口？ 之前提过，也是做不到( https://github.com/MountainDash/nonebot-bison/blob/05d01aee6c11cb1edc10d029fc879da1ae387b0e/nonebot_bison/admin_page/__init__.py#L56 那这边是什么（ 好像确实 要不你试试看(? 那 `bison_outer_url` 的默认值改成 `http://localhost` 吗 感觉是不是换个名字（？ 这个localhost用<your ip>什么的替换一下吧，免得有误解 > 那改成只填ip，端口用读到的Nonebot端口？ 也倒不是做不到，如果使用 docker 部署或者用 nginx 做了反向代理，那么从如何从外部访问 nonebot 是肯定需要额外配置的。当然修改一下默认值是可以的 或者加个检测，当用户填写的 `bison_outer_url` 中的端口号与 nonebot 端口号不一致的时候提醒一句？ 然后文档补充一下说明
2023-10-23T11:22:00
0.0
[]
[]
milvus-io/pymilvus
milvus-io__pymilvus-1739
9ad35418d6230e8e252238a70d484c9d6031fd01
diff --git a/examples/hello_milvus_array.py b/examples/hello_milvus_array.py new file mode 100644 index 000000000..05f4165ea --- /dev/null +++ b/examples/hello_milvus_array.py @@ -0,0 +1,79 @@ +from pymilvus import CollectionSchema, FieldSchema, Collection, connections, DataType, Partition, utility +import numpy as np +import random +import pandas as pd +connections.connect() + +dim = 128 +collection_name = "test_array" +arr_len = 100 +nb = 10 +if utility.has_collection(collection_name): + utility.drop_collection(collection_name) +# create collection +pk_field = FieldSchema(name="int64", dtype=DataType.INT64, is_primary=True, description='pk') +vector_field = FieldSchema(name="float_vector", dtype=DataType.FLOAT_VECTOR, dim=dim) +int8_array = FieldSchema(name="int8_array", dtype=DataType.ARRAY, element_type=DataType.INT8, max_capacity=arr_len) +int16_array = FieldSchema(name="int16_array", dtype=DataType.ARRAY, element_type=DataType.INT16, max_capacity=arr_len) +int32_array = FieldSchema(name="int32_array", dtype=DataType.ARRAY, element_type=DataType.INT32, max_capacity=arr_len) +int64_array = FieldSchema(name="int64_array", dtype=DataType.ARRAY, element_type=DataType.INT64, max_capacity=arr_len) +bool_array = FieldSchema(name="bool_array", dtype=DataType.ARRAY, element_type=DataType.BOOL, max_capacity=arr_len) +float_array = FieldSchema(name="float_array", dtype=DataType.ARRAY, element_type=DataType.FLOAT, max_capacity=arr_len) +double_array = FieldSchema(name="double_array", dtype=DataType.ARRAY, element_type=DataType.DOUBLE, max_capacity=arr_len) +string_array = FieldSchema(name="string_array", dtype=DataType.ARRAY, element_type=DataType.VARCHAR, max_capacity=arr_len, + max_length=100) + +fields = [pk_field, vector_field, int8_array, int16_array, int32_array, int64_array, + bool_array, float_array, double_array, string_array] + +schema = CollectionSchema(fields=fields) +collection = Collection(collection_name, schema=schema) + +# insert data +pk_value = [i for i in range(nb)] +vector_value = [[random.random() for _ in range(dim)] for i in range(nb)] +int8_value = [[np.int8(j) for j in range(arr_len)] for i in range(nb)] +int16_value = [[np.int16(j) for j in range(arr_len)] for i in range(nb)] +int32_value = [[np.int32(j) for j in range(arr_len)] for i in range(nb)] +int64_value = [[np.int64(j) for j in range(arr_len)] for i in range(nb)] +bool_value = [[np.bool_(j) for j in range(arr_len)] for i in range(nb)] +float_value = [[np.float32(j) for j in range(arr_len)] for i in range(nb)] +double_value = [[np.double(j) for j in range(arr_len)] for i in range(nb)] +string_value = [[str(j) for j in range(arr_len)] for i in range(nb)] + +data = [pk_value, vector_value, + int8_value,int16_value, int32_value, int64_value, + bool_value, + float_value, + double_value, + string_value + ] + +#collection.insert(data) + +data = pd.DataFrame({ + 'int64': pk_value, + 'float_vector': vector_value, + "int8_array": int8_value, + "int16_array": int16_value, + "int32_array": int32_value, + "int64_array": int64_value, + "bool_array": bool_value, + "float_array": float_value, + "double_array": double_value, + "string_array": string_value +}) +collection.insert(data) + +index = { + "index_type": "IVF_FLAT", + "metric_type": "L2", + "params": {"nlist": 128}, +} + +collection.create_index("float_vector", index) +collection.load() + +res = collection.query("int64 >= 0", output_fields=["int8_array"]) +for hits in res: + print(hits) diff --git a/pymilvus/client/entity_helper.py b/pymilvus/client/entity_helper.py index fb8debba7..f0b1fa50d 100644 --- a/pymilvus/client/entity_helper.py +++ b/pymilvus/client/entity_helper.py @@ -70,8 +70,8 @@ def entity_to_json_arr(entity: Dict): return convert_to_json_arr(entity.get("values", [])) -def convert_to_array_arr(objs: List[Any]): - return [convert_to_array_arr(obj) for obj in objs] +def convert_to_array_arr(objs: List[Any], field_info: Any): + return [convert_to_array(obj, field_info) for obj in objs] def convert_to_array(obj: List[Any], field_info: Any): @@ -100,8 +100,8 @@ def convert_to_array(obj: List[Any], field_info: Any): ) -def entity_to_array_arr(entity: List[Any]): - return convert_to_array_arr(entity.get("values", [])) +def entity_to_array_arr(entity: List[Any], field_info: Any): + return convert_to_array_arr(entity.get("values", []), field_info) def pack_field_value_to_field_data(field_value: Any, field_data: Any, field_info: Any): @@ -166,7 +166,7 @@ def entity_to_field_data(entity: Any, field_info: Any): elif entity_type == DataType.JSON: field_data.scalars.json_data.data.extend(entity_to_json_arr(entity)) elif entity_type == DataType.ARRAY: - field_data.scalars.array_data.data.extend(entity_to_array_arr(entity)) + field_data.scalars.array_data.data.extend(entity_to_array_arr(entity, field_info)) else: raise ParamError(message=f"UnSupported data type: {entity_type}") diff --git a/pymilvus/client/grpc_handler.py b/pymilvus/client/grpc_handler.py index 40fb7523d..6e4803708 100644 --- a/pymilvus/client/grpc_handler.py +++ b/pymilvus/client/grpc_handler.py @@ -570,7 +570,6 @@ def batch_insert( m = MutationResult(response) ts_utils.update_collection_ts(collection_name, m.timestamp) return m - raise MilvusException( response.status.code, response.status.reason, response.status.error_code ) diff --git a/pymilvus/milvus_client/milvus_client.py b/pymilvus/milvus_client/milvus_client.py index 15129335e..da367f2ab 100644 --- a/pymilvus/milvus_client/milvus_client.py +++ b/pymilvus/milvus_client/milvus_client.py @@ -493,19 +493,19 @@ def create_collection_with_schema( self, collection_name: str, schema: CollectionSchema, - index_param: Dict, + index_params: Dict, timeout: Optional[float] = None, **kwargs, ): schema.verify() - if kwargs.get("auto_id", True): + if kwargs.get("auto_id", False): schema.auto_id = True if kwargs.get("enable_dynamic_field", False): schema.enable_dynamic_field = True schema.verify() - index_param = index_param or {} - vector_field_name = index_param.pop("field_name", "") + index_params = index_params or {} + vector_field_name = index_params.pop("field_name", "") if not vector_field_name: schema_dict = schema.to_dict() vector_field_name = self._get_vector_field_name(schema_dict) @@ -520,7 +520,7 @@ def create_collection_with_schema( logger.error("Failed to create collection: %s", collection_name) raise ex from ex - self._create_index(collection_name, vector_field_name, index_param, timeout=timeout) + self._create_index(collection_name, vector_field_name, index_params, timeout=timeout) self._load(collection_name, timeout=timeout) def close(self): diff --git a/pymilvus/orm/schema.py b/pymilvus/orm/schema.py index bdab6b6f9..3f83a2e23 100644 --- a/pymilvus/orm/schema.py +++ b/pymilvus/orm/schema.py @@ -98,9 +98,10 @@ def _check_fields(self): primary_field_name = self._kwargs.get("primary_field", None) partition_key_field_name = self._kwargs.get("partition_key_field", None) for field in self._fields: - if primary_field_name == field.name: + if primary_field_name and primary_field_name == field.name: field.is_primary = True - if partition_key_field_name == field.name: + + if partition_key_field_name and partition_key_field_name == field.name: field.is_partition_key = True if field.is_primary: @@ -403,6 +404,45 @@ def check_is_row_based(data: Union[List[List], List[Dict], Dict, pd.DataFrame]) return False +def _check_insert_data(data: Union[List[List], pd.DataFrame]): + if not isinstance(data, (pd.DataFrame, list)): + raise DataTypeNotSupportException( + message="The type of data should be list or pandas.DataFrame" + ) + is_dataframe = isinstance(data, pd.DataFrame) + for col in data: + if not is_dataframe and not is_list_like(col): + raise DataTypeNotSupportException(message="data should be a list of list") + + +def _check_data_schema_cnt(schema: CollectionSchema, data: Union[List[List], pd.DataFrame]): + tmp_fields = copy.deepcopy(schema.fields) + for i, field in enumerate(tmp_fields): + if field.is_primary and field.auto_id: + tmp_fields.pop(i) + + field_cnt = len(tmp_fields) + is_dataframe = isinstance(data, pd.DataFrame) + data_cnt = len(data.columns) if is_dataframe else len(data) + if field_cnt != data_cnt: + message = ( + f"The data don't match with schema fields, expect {field_cnt} list, got {len(data)}" + ) + if is_dataframe: + i_name = [f.name for f in tmp_fields] + t_name = list(data.columns) + message = f"The fields don't match with schema fields, expected: {i_name}, got {t_name}" + + raise DataNotMatchException(message=message) + + if is_dataframe: + for x, y in zip(list(data.columns), tmp_fields): + if x != y.name: + raise DataNotMatchException( + message=f"The name of field don't match, expected: {y.name}, got {x}" + ) + + def check_insert_schema(schema: CollectionSchema, data: Union[List[List], pd.DataFrame]): if schema is None: raise SchemaNotReadyException(message="Schema shouldn't be None") @@ -410,10 +450,12 @@ def check_insert_schema(schema: CollectionSchema, data: Union[List[List], pd.Dat if not data[schema.primary_field.name].isnull().all(): msg = f"Expect no data for auto_id primary field: {schema.primary_field.name}" raise DataNotMatchException(message=msg) - data = data.drop(schema.primary_field.name, axis=1) + columns = list(data.columns) + columns.remove(schema.primary_field) + data = data[[columns]] - infer_fields, tmp_fields, is_data_frame = parse_fields_from_data(schema, data) - check_infer_fields_valid(infer_fields, tmp_fields, is_data_frame) + _check_data_schema_cnt(schema, data) + _check_insert_data(data) def check_upsert_schema(schema: CollectionSchema, data: Union[List[List], pd.DataFrame]): @@ -422,78 +464,8 @@ def check_upsert_schema(schema: CollectionSchema, data: Union[List[List], pd.Dat if schema.auto_id: raise UpsertAutoIDTrueException(message=ExceptionsMessage.UpsertAutoIDTrue) - infer_fields, tmp_fields, is_data_frame = parse_fields_from_data(schema, data) - check_infer_fields_valid(infer_fields, tmp_fields, is_data_frame) - - -def parse_fields_from_data(schema: CollectionSchema, data: Union[List[List], pd.DataFrame]): - if not isinstance(data, (pd.DataFrame, list)): - raise DataTypeNotSupportException( - message="The type of data should be list or pandas.DataFrame" - ) - - if isinstance(data, pd.DataFrame): - return parse_fields_from_dataframe(schema, data) - - tmp_fields = copy.deepcopy(schema.fields) - for i, field in enumerate(tmp_fields): - if field.is_primary and field.auto_id: - tmp_fields.pop(i) - - infer_fields = [] - for i, field in enumerate(tmp_fields): - try: - d = data[i] - if not is_list_like(d): - raise DataTypeNotSupportException(message="data should be a list of list") - try: - elem = d[0] - infer_fields.append(FieldSchema("", infer_dtype_bydata(elem))) - # if pass in [] or None, considering to be passed in order according to the schema - except IndexError: - infer_fields.append(FieldSchema("", field.dtype)) - # the last missing part of data is also completed in order according to the schema - except IndexError: - infer_fields.append(FieldSchema("", field.dtype)) - - index = len(tmp_fields) - while index < len(data): - fields = FieldSchema("", infer_dtype_bydata(data[index][0])) - infer_fields.append(fields) - index = index + 1 - - return infer_fields, tmp_fields, False - - -def parse_fields_from_dataframe(schema: CollectionSchema, df: pd.DataFrame): - col_names, data_types, column_params_map = prepare_fields_from_dataframe(df) - tmp_fields = copy.deepcopy(schema.fields) - for i, field in enumerate(schema.fields): - if field.is_primary and field.auto_id: - tmp_fields.pop(i) - infer_fields = [] - for field in tmp_fields: - # if no data pass in, considering to be passed in order according to the schema - if field.name not in col_names: - field_schema = FieldSchema(field.name, field.dtype) - col_names.append(field.name) - data_types.append(field.dtype) - infer_fields.append(field_schema) - else: - type_params = column_params_map.get(field.name, {}) - field_schema = FieldSchema( - field.name, data_types[col_names.index(field.name)], **type_params - ) - infer_fields.append(field_schema) - - infer_name = [f.name for f in infer_fields] - for name, dtype in zip(col_names, data_types): - if name not in infer_name: - type_params = column_params_map.get(name, {}) - field_schema = FieldSchema(name, dtype, **type_params) - infer_fields.append(field_schema) - - return infer_fields, tmp_fields, True + _check_data_schema_cnt(schema, data) + _check_insert_data(data) def construct_fields_from_dataframe(df: pd.DataFrame) -> List[FieldSchema]: @@ -536,31 +508,6 @@ def prepare_fields_from_dataframe(df: pd.DataFrame): return col_names, data_types, column_params_map -def check_infer_fields_valid( - infer_fields: List[FieldSchema], - tmp_fields: List, - is_data_frame: bool, -): - if len(infer_fields) != len(tmp_fields): - i_name = [f.name for f in infer_fields] - t_name = [f.name for f in tmp_fields] - raise DataNotMatchException( - message=f"The fields don't match with schema fields, expected: {t_name}, got {i_name}" - ) - - for x, y in zip(infer_fields, tmp_fields): - if is_data_frame and x.name != y.name: - raise DataNotMatchException( - message=f"The name of field don't match, expected: {y.name}, got {x.name}" - ) - if x.dtype != y.dtype: - msg = ( - f"The data type of field {y.name} doesn't match, " - f"expected: {y.dtype.name}, got {x.dtype.name}" - ) - raise DataNotMatchException(message=msg) - - def check_schema(schema: CollectionSchema): if schema is None: raise SchemaNotReadyException(message=ExceptionsMessage.NoSchema)
[FEATURE]: Support new DataType: Array ### Is there an existing issue for this? - [X] I have searched the existing issues ### Is your feature request related to a problem? Please describe. _No response_ ### Describe the solution you'd like _No response_ ### Describe alternatives you've considered _No response_ ### Anything else? Support Array DataType for milvus. 1. There is an `element_type` field to represent the type of the actual element. 2. There is an upper limit on the number of elements `max_capacity`. If element type is VARCHAR, it must contain `max_length`. pymilvus example: ``` pk_field = FieldSchema(name="id", dtype=DataType.INT64, is_primary=True, auto_id=False) int_array_field = FieldSchema(name="int_array", dtype=DataType.ARRAY, element_type=DataType.INT64, max_capacity=100) str_array_field = FieldSchema(name="string_array", dtype=DataType.ARRAY, element_type=DataType.VARCHAR, max_capacity=100, max_length=100) float_vector = FieldSchema(name="float_vector", dtype=DataType.FLOAT_VECTOR, dim=dim) schema = CollectionSchema(fields=[pk_field, int_array_field, str_array_field, float_vector], enable_dynamic_field=True) ```
/assign @xiaocai2333
2023-10-18T07:05:36
0.0
[]
[]
milvus-io/pymilvus
milvus-io__pymilvus-1624
8f3ab0c3aead97b4aa6a34244f82990cb95e7d68
diff --git a/pymilvus/client/prepare.py b/pymilvus/client/prepare.py index f6b4ca22a..6e034617c 100644 --- a/pymilvus/client/prepare.py +++ b/pymilvus/client/prepare.py @@ -234,7 +234,7 @@ def alter_collection_request( collection_name: str, properties: Dict, ) -> milvus_types.AlterCollectionRequest: - kvs = [common_types.KeyDataPair(key=k, value=str(v)) for k, v in properties.items()] + kvs = [common_types.KeyValuePair(key=k, value=str(v)) for k, v in properties.items()] return milvus_types.AlterCollectionRequest(collection_name=collection_name, properties=kvs)
AlterCollection use KeyValuePair. Fixes #1617 ps: need to cherry-pick to master. [Bug]: It seems pymilvus==2.2.14 have bug with alter_collection ### Is there an existing issue for this? - [X] I have searched the existing issues ### Describe the bug See: https://github.com/matrixji/milvus-lite/actions/runs/5653197188/job/15314820137 ``` collection created: demo Traceback (most recent call last): File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line 123, in handler return func(*args, **kwargs) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line 162, in handler return func(self, *args, **kwargs) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line [104](https://github.com/matrixji/milvus-lite/actions/runs/5653197188/job/15314820137#step:6:105), in handler raise e from e File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line 68, in handler return func(*args, **kwargs) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/client/grpc_handler.py", line 308, in alter_collection request = Prepare.alter_collection_request(collection_name, properties) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/client/prepare.py", line 236, in alter_collection_request kvs = [common_types.KeyDataPair(key=k, value=str(v)) for k, v in properties.items()] File "/github/home/.local/lib/python3.10/site-packages/pymilvus/client/prepare.py", line 236, in <listcomp> kvs = [common_types.KeyDataPair(key=k, value=str(v)) for k, v in properties.items()] ValueError: Protocol message KeyDataPair has no "value" field. The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/__w/milvus-lite/milvus-lite/examples/example.py", line 188, in <module> main() File "/__w/milvus-lite/milvus-lite/examples/example.py", line 156, in main set_properties(collection) File "/__w/milvus-lite/milvus-lite/examples/example.py", line 141, in set_properties collection.set_properties(properties={"collection.ttl.seconds": 1800}) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/orm/collection.py", line 358, in set_properties conn.alter_collection( File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line 145, in handler raise MilvusException(message=f"Unexpected error, message=<{e!s}>") from e pymilvus.exceptions.MilvusException: <MilvusException: (code=1, message=Unexpected error, message=<Protocol message KeyDataPair has no "value" field.>)> Error: Process completed with exit code 1. ``` the root cause is KeyDataPair only have `data` field but not the `value` ### Expected Behavior Hope could run example.py from pymilvus. ### Steps/Code To Reproduce behavior ```markdown See above ``` ### Environment details ```markdown - Hardware/Softward conditions (OS, CPU, GPU, Memory): N/A - Method of installation (Docker, or from source): pip - Milvus version (v0.3.1, or v0.4.0): 2.2.12 - Milvus configuration (Settings you made in `server_config.yaml`): N/A ``` ### Anything else? _No response_
/lgtm /approve [APPROVALNOTIFIER] This PR is **APPROVED** This pull-request has been approved by: *<a href="https://github.com/milvus-io/pymilvus/pull/1618#" title="Author self-approved">matrixji</a>*, *<a href="https://github.com/milvus-io/pymilvus/pull/1618#issuecomment-1651567833" title="Approved">XuanYang-cn</a>* The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=milvus-io%2Fpymilvus). The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process) <details > Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/milvus-io/pymilvus/blob/2.2/OWNERS)~~ [XuanYang-cn] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment </details> <!-- META={"approvers":[]} --> @matrixji are you interested in fixing this? > @matrixji are you interested in fixing this? Sure, I could provide the PR.
2023-07-27T07:24:04
0.0
[]
[]
milvus-io/pymilvus
milvus-io__pymilvus-1618
c28ceb17e023463472ce6bc0f96dea48967711d9
diff --git a/pymilvus/client/prepare.py b/pymilvus/client/prepare.py index 039426ae6..83f34b91f 100644 --- a/pymilvus/client/prepare.py +++ b/pymilvus/client/prepare.py @@ -233,7 +233,7 @@ def alter_collection_request( collection_name: str, properties: Dict, ) -> milvus_types.AlterCollectionRequest: - kvs = [common_types.KeyDataPair(key=k, value=str(v)) for k, v in properties.items()] + kvs = [common_types.KeyValuePair(key=k, value=str(v)) for k, v in properties.items()] return milvus_types.AlterCollectionRequest(collection_name=collection_name, properties=kvs)
[Bug]: It seems pymilvus==2.2.14 have bug with alter_collection ### Is there an existing issue for this? - [X] I have searched the existing issues ### Describe the bug See: https://github.com/matrixji/milvus-lite/actions/runs/5653197188/job/15314820137 ``` collection created: demo Traceback (most recent call last): File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line 123, in handler return func(*args, **kwargs) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line 162, in handler return func(self, *args, **kwargs) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line [104](https://github.com/matrixji/milvus-lite/actions/runs/5653197188/job/15314820137#step:6:105), in handler raise e from e File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line 68, in handler return func(*args, **kwargs) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/client/grpc_handler.py", line 308, in alter_collection request = Prepare.alter_collection_request(collection_name, properties) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/client/prepare.py", line 236, in alter_collection_request kvs = [common_types.KeyDataPair(key=k, value=str(v)) for k, v in properties.items()] File "/github/home/.local/lib/python3.10/site-packages/pymilvus/client/prepare.py", line 236, in <listcomp> kvs = [common_types.KeyDataPair(key=k, value=str(v)) for k, v in properties.items()] ValueError: Protocol message KeyDataPair has no "value" field. The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/__w/milvus-lite/milvus-lite/examples/example.py", line 188, in <module> main() File "/__w/milvus-lite/milvus-lite/examples/example.py", line 156, in main set_properties(collection) File "/__w/milvus-lite/milvus-lite/examples/example.py", line 141, in set_properties collection.set_properties(properties={"collection.ttl.seconds": 1800}) File "/github/home/.local/lib/python3.10/site-packages/pymilvus/orm/collection.py", line 358, in set_properties conn.alter_collection( File "/github/home/.local/lib/python3.10/site-packages/pymilvus/decorators.py", line 145, in handler raise MilvusException(message=f"Unexpected error, message=<{e!s}>") from e pymilvus.exceptions.MilvusException: <MilvusException: (code=1, message=Unexpected error, message=<Protocol message KeyDataPair has no "value" field.>)> Error: Process completed with exit code 1. ``` the root cause is KeyDataPair only have `data` field but not the `value` ### Expected Behavior Hope could run example.py from pymilvus. ### Steps/Code To Reproduce behavior ```markdown See above ``` ### Environment details ```markdown - Hardware/Softward conditions (OS, CPU, GPU, Memory): N/A - Method of installation (Docker, or from source): pip - Milvus version (v0.3.1, or v0.4.0): 2.2.12 - Milvus configuration (Settings you made in `server_config.yaml`): N/A ``` ### Anything else? _No response_
@matrixji are you interested in fixing this? > @matrixji are you interested in fixing this? Sure, I could provide the PR.
2023-07-25T08:59:27
0.0
[]
[]
milvus-io/pymilvus
milvus-io__pymilvus-1493
b44a40511adaafe69cfee0d2e615364087192029
diff --git a/pymilvus/client/abstract.py b/pymilvus/client/abstract.py index 27f270100..b943a71c4 100644 --- a/pymilvus/client/abstract.py +++ b/pymilvus/client/abstract.py @@ -266,10 +266,9 @@ def score(self): class Hits(LoopBase): - def __init__(self, raw, auto_id, round_decimal=-1): + def __init__(self, raw, round_decimal=-1): super().__init__() self._raw = raw - self._auto_id = auto_id if round_decimal != -1: self._distances = [round(x, round_decimal) for x in self._raw.scores] else: @@ -392,10 +391,9 @@ def _pack(self, raw): class QueryResult(LoopBase): - def __init__(self, raw, auto_id=True): + def __init__(self, raw): super().__init__() self._raw = raw - self._auto_id = auto_id self._pack(raw.hits) def __len__(self): @@ -451,14 +449,13 @@ def _pack(self, raw): offset += raw.results.topks[i] def get__item(self, item): - return Hits(self._hits[item], self._auto_id) + return Hits(self._hits[item]) class ChunkedQueryResult(LoopBase): - def __init__(self, raw_list, auto_id=True, round_decimal=-1): + def __init__(self, raw_list, round_decimal=-1): super().__init__() self._raw_list = raw_list - self._auto_id = auto_id self._nq = 0 self.round_decimal = round_decimal @@ -521,7 +518,7 @@ def _pack(self, raw_list): offset += raw.results.topks[i] def get__item(self, item): - return Hits(self._hits[item], self._auto_id, self.round_decimal) + return Hits(self._hits[item], self.round_decimal) def _abstract(): diff --git a/pymilvus/client/asynch.py b/pymilvus/client/asynch.py index 5d74fc100..6dbe756e5 100644 --- a/pymilvus/client/asynch.py +++ b/pymilvus/client/asynch.py @@ -156,13 +156,9 @@ def exception(self): class SearchFuture(Future): - def __init__(self, future, done_callback=None, auto_id=True, pre_exception=None): - super().__init__(future, done_callback, pre_exception) - self._auto_id = auto_id - def on_response(self, response): if response.status.error_code == 0: - return QueryResult(response, self._auto_id) + return QueryResult(response) status = response.status raise MilvusException(status.error_code, status.reason) @@ -171,9 +167,8 @@ def on_response(self, response): # TODO: if ChunkedFuture is more common later, consider using ChunkedFuture as Base Class, # then Future(future, done_cb, pre_exception) equal to ChunkedFuture([future], done_cb, pre_exception) class ChunkedSearchFuture(Future): - def __init__(self, future_list, done_callback=None, auto_id=True, pre_exception=None): + def __init__(self, future_list, done_callback=None, pre_exception=None): super().__init__(None, done_callback, pre_exception) - self._auto_id = auto_id self._future_list = future_list self._response = [] @@ -244,7 +239,7 @@ def on_response(self, response): if raw.status.error_code != 0: raise MilvusException(raw.status.error_code, raw.status.reason) - return ChunkedQueryResult(response, self._auto_id) + return ChunkedQueryResult(response) class MutationFuture(Future): diff --git a/pymilvus/client/check.py b/pymilvus/client/check.py index 1c9add466..a97c32d5d 100644 --- a/pymilvus/client/check.py +++ b/pymilvus/client/check.py @@ -168,10 +168,8 @@ def is_legal_partition_name(tag: Any) -> bool: def is_legal_limit(limit: Any) -> bool: return isinstance(limit, int) and limit > 0 - def is_legal_anns_field(field: Any) -> bool: - return field and isinstance(field, str) - + return field is None or isinstance(field, str) def is_legal_search_data(data: Any) -> bool: import numpy as np @@ -262,8 +260,7 @@ def is_legal_travel_timestamp(ts: Any) -> bool: def is_legal_guarantee_timestamp(ts: Any) -> bool: - return isinstance(ts, int) and ts >= 0 - + return ts is None or isinstance(ts, int) and ts >= 0 def is_legal_user(user) -> bool: return isinstance(user, str) diff --git a/pymilvus/client/grpc_handler.py b/pymilvus/client/grpc_handler.py index d9be96a59..c1eef5d6d 100644 --- a/pymilvus/client/grpc_handler.py +++ b/pymilvus/client/grpc_handler.py @@ -28,7 +28,6 @@ State, CompactionPlans, Plan, - get_consistency_level, Replica, Shard, Group, GrantInfo, UserInfo, RoleInfo, BulkInsertState, @@ -498,8 +497,6 @@ def delete(self, collection_name, expression, partition_name=None, timeout=None, raise err def _execute_search_requests(self, requests, timeout=None, **kwargs): - auto_id = kwargs.get("auto_id", True) - try: if kwargs.get("_async", False): futures = [] @@ -507,7 +504,7 @@ def _execute_search_requests(self, requests, timeout=None, **kwargs): ft = self._stub.Search.future(request, timeout=timeout) futures.append(ft) func = kwargs.get("_callback", None) - return ChunkedSearchFuture(futures, func, auto_id) + return ChunkedSearchFuture(futures, func) raws = [] for request in requests: @@ -518,17 +515,17 @@ def _execute_search_requests(self, requests, timeout=None, **kwargs): raws.append(response) round_decimal = kwargs.get("round_decimal", -1) - return ChunkedQueryResult(raws, auto_id, round_decimal) + return ChunkedQueryResult(raws, round_decimal) except Exception as pre_err: if kwargs.get("_async", False): - return SearchFuture(None, None, True, pre_err) + return SearchFuture(None, None, pre_err) raise pre_err @retry_on_rpc_failure(retry_on_deadline=False) def search(self, collection_name, data, anns_field, param, limit, expression=None, partition_names=None, output_fields=None, - round_decimal=-1, timeout=None, schema=None, **kwargs): + round_decimal=-1, timeout=None, **kwargs): check_pass_param( limit=limit, round_decimal=round_decimal, @@ -537,24 +534,13 @@ def search(self, collection_name, data, anns_field, param, limit, partition_name_array=partition_names, output_fields=output_fields, travel_timestamp=kwargs.get("travel_timestamp", 0), - guarantee_timestamp=kwargs.get("guarantee_timestamp", 0) + guarantee_timestamp=kwargs.get("guarantee_timestamp", None) ) - if schema is None: - schema = self.describe_collection(collection_name, timeout=timeout, **kwargs) - - consistency_level = schema["consistency_level"] - # overwrite the consistency level defined when user created the collection - consistency_level = get_consistency_level(kwargs.get("consistency_level", consistency_level)) - - ts_utils.construct_guarantee_ts(consistency_level, collection_name, kwargs) - - requests = Prepare.search_requests_with_expr(collection_name, data, anns_field, param, limit, schema, + requests = Prepare.search_requests_with_expr(collection_name, data, anns_field, param, limit, expression, partition_names, output_fields, round_decimal, **kwargs) - - auto_id = schema["auto_id"] - return self._execute_search_requests(requests, timeout, round_decimal=round_decimal, auto_id=auto_id, **kwargs) + return self._execute_search_requests(requests, timeout, round_decimal=round_decimal, **kwargs) @retry_on_rpc_failure() def get_query_segment_info(self, collection_name, timeout=30, **kwargs): @@ -990,14 +976,6 @@ def get(self, collection_name, ids, output_fields=None, partition_names=None, ti def query(self, collection_name, expr, output_fields=None, partition_names=None, timeout=None, **kwargs): if output_fields is not None and not isinstance(output_fields, (list,)): raise ParamError(message="Invalid query format. 'output_fields' must be a list") - collection_schema = kwargs.get("schema", None) - if not collection_schema: - collection_schema = self.describe_collection(collection_name, timeout) - consistency_level = collection_schema["consistency_level"] - # overwrite the consistency level defined when user created the collection - consistency_level = get_consistency_level(kwargs.get("consistency_level", consistency_level)) - - ts_utils.construct_guarantee_ts(consistency_level, collection_name, kwargs) request = Prepare.query_request(collection_name, expr, output_fields, partition_names, **kwargs) future = self._stub.Query.future(request, timeout=timeout) diff --git a/pymilvus/client/prepare.py b/pymilvus/client/prepare.py index a34f6dac8..267646321 100644 --- a/pymilvus/client/prepare.py +++ b/pymilvus/client/prepare.py @@ -1,4 +1,3 @@ -import copy import base64 import datetime from typing import Dict, Iterable, Union @@ -7,6 +6,7 @@ from . import blob from . import entity_helper +from . import ts_utils from .check import check_pass_param, is_legal_collection_properties from .types import DataType, PlaceholderType, get_consistency_level from .utils import traverse_rows_info @@ -449,113 +449,19 @@ def check_str(instr, prefix): return request @classmethod - def _prepare_placeholders(cls, vectors, nq, tag, pl_type, is_binary, dimension=0): + def _prepare_placeholders(cls, vectors, nq, tag, pl_type, is_binary): pl = common_types.PlaceholderValue(tag=tag) pl.type = pl_type for i in range(0, nq): if is_binary: - if len(vectors[i]) * 8 != dimension: - raise ParamError( - message=f"The dimension of query entities[{vectors[i] * 8}] is different from schema [{dimension}]") pl.values.append(blob.vectorBinaryToBytes(vectors[i])) else: - if len(vectors[i]) != dimension: - raise ParamError( - message=f"The dimension of query entities[{vectors[i]}] is different from schema [{dimension}]") pl.values.append(blob.vectorFloatToBytes(vectors[i])) return pl @classmethod - def search_request(cls, collection_name, query_entities, partition_names=None, fields=None, round_decimal=-1, - **kwargs): - schema = kwargs.get("schema", None) - fields_schema = schema.get("fields", None) # list - fields_name_locs = {fields_schema[loc]["name"]: loc - for loc in range(len(fields_schema))} - - if not isinstance(query_entities, (dict,)): - raise ParamError(message="Invalid query format. 'query_entities' must be a dict") - - if fields is not None and not isinstance(fields, (list,)): - raise ParamError(message="Invalid query format. 'fields' must be a list") - - request = milvus_types.SearchRequest( - collection_name=collection_name, - partition_names=partition_names, - output_fields=fields, - guarantee_timestamp=kwargs.get("guarantee_timestamp", 0), - ) - - duplicated_entities = copy.deepcopy(query_entities) - vector_placeholders = {} - vector_names = {} - - def extract_vectors_param(param, placeholders, names, round_decimal): - if not isinstance(param, (dict, list)): - return - - if isinstance(param, dict): - if "vector" in param: - # TODO: Here may not replace ph - ph = "$" + str(len(placeholders)) - - for pk, pv in param["vector"].items(): - if "query" not in pv: - raise ParamError(message="param vector must contain 'query'") - placeholders[ph] = pv["query"] - names[ph] = pk - param["vector"][pk]["query"] = ph - param["vector"][pk]["round_decimal"] = round_decimal - return - - for _, v in param.items(): - extract_vectors_param(v, placeholders, names, round_decimal) - - if isinstance(param, list): - for item in param: - extract_vectors_param(item, placeholders, names, round_decimal) - - extract_vectors_param(duplicated_entities, vector_placeholders, vector_names, round_decimal) - request.dsl = ujson.dumps(duplicated_entities) - - plg = common_types.PlaceholderGroup() - for tag, vectors in vector_placeholders.items(): - if len(vectors) <= 0: - continue - pl = common_types.PlaceholderValue(tag=tag) - - fname = vector_names[tag] - if fname not in fields_name_locs: - raise ParamError(message=f"Field {fname} doesn't exist in schema") - dimension = int(fields_schema[fields_name_locs[fname]]["params"].get("dim", 0)) - - if isinstance(vectors[0], bytes): - pl.type = PlaceholderType.BinaryVector - for vector in vectors: - if dimension != len(vector) * 8: - raise ParamError(message="The dimension of query vector is different from schema") - pl.values.append(blob.vectorBinaryToBytes(vector)) - else: - pl.type = PlaceholderType.FloatVector - for vector in vectors: - if dimension != len(vector): - raise ParamError(message="The dimension of query vector is different from schema") - pl.values.append(blob.vectorFloatToBytes(vector)) - # vector_values_bytes = service_msg_types.VectorValues.SerializeToString(vector_values) - - plg.placeholders.append(pl) - plg_str = common_types.PlaceholderGroup.SerializeToString(plg) - request.placeholder_group = plg_str - - return request - - @classmethod - def search_requests_with_expr(cls, collection_name, data, anns_field, param, limit, schema, expr=None, + def search_requests_with_expr(cls, collection_name, data, anns_field, param, limit, expr=None, partition_names=None, output_fields=None, round_decimal=-1, **kwargs): - # TODO Move this impl into server side - fields_schema = schema.get("fields", None) # list - fields_name_locs = {fields_schema[loc]["name"]: loc for loc in range(len(fields_schema))} - requests = [] if len(data) <= 0: return requests @@ -567,16 +473,14 @@ def search_requests_with_expr(cls, collection_name, data, anns_field, param, lim is_binary = False pl_type = PlaceholderType.FloatVector - if anns_field not in fields_name_locs: - raise ParamError(message=f"Field {anns_field} doesn't exist in schema") - dimension = int(fields_schema[fields_name_locs[anns_field]]["params"].get("dim", 0)) + + use_default_consistency = ts_utils.construct_guarantee_ts(collection_name, kwargs) ignore_growing = param.get("ignore_growing", False) or kwargs.get("ignore_growing", False) params = param.get("params", {}) if not isinstance(params, dict): raise ParamError(message=f"Search params must be a dict, got {type(params)}") search_params = { - "anns_field": anns_field, "topk": limit, "metric_type": param.get("metric_type", "L2"), "params": params, @@ -585,6 +489,9 @@ def search_requests_with_expr(cls, collection_name, data, anns_field, param, lim "ignore_growing": ignore_growing, } + if anns_field: + search_params["anns_field"] = anns_field + def dump(v): if isinstance(v, dict): return ujson.dumps(v) @@ -592,7 +499,7 @@ def dump(v): nq = len(data) tag = "$0" - pl = cls._prepare_placeholders(data, nq, tag, pl_type, is_binary, dimension) + pl = cls._prepare_placeholders(data, nq, tag, pl_type, is_binary) plg = common_types.PlaceholderGroup() plg.placeholders.append(pl) plg_str = common_types.PlaceholderGroup.SerializeToString(plg) @@ -602,6 +509,8 @@ def dump(v): output_fields=output_fields, guarantee_timestamp=kwargs.get("guarantee_timestamp", 0), travel_timestamp=kwargs.get("travel_timestamp", 0), + use_default_consistency=use_default_consistency, + consistency_level=kwargs.get("consistency_level", 0), nq=nq, ) request.placeholder_group = plg_str @@ -730,6 +639,8 @@ def retrieve_request(cls, collection_name, ids, output_fields, partition_names): @classmethod def query_request(cls, collection_name, expr, output_fields, partition_names, **kwargs): + + use_default_consistency = ts_utils.construct_guarantee_ts(collection_name, kwargs) req = milvus_types.QueryRequest(db_name="", collection_name=collection_name, expr=expr, @@ -737,6 +648,8 @@ def query_request(cls, collection_name, expr, output_fields, partition_names, ** partition_names=partition_names, guarantee_timestamp=kwargs.get("guarantee_timestamp", 0), travel_timestamp=kwargs.get("travel_timestamp", 0), + use_default_consistency=use_default_consistency, + consistency_level=kwargs.get("consistency_level", 0) ) limit = kwargs.get("limit", None) diff --git a/pymilvus/client/ts_utils.py b/pymilvus/client/ts_utils.py index 142a217d3..071f08849 100644 --- a/pymilvus/client/ts_utils.py +++ b/pymilvus/client/ts_utils.py @@ -3,13 +3,13 @@ from .singleton_utils import Singleton from .utils import hybridts_to_unixtime +from .types import get_consistency_level from .constants import EVENTUALLY_TS, BOUNDED_TS from ..grpc_gen import common_pb2 ConsistencyLevel = common_pb2.ConsistencyLevel - class GTsDict(metaclass=Singleton): def __init__(self): # collection id -> last write ts @@ -72,7 +72,16 @@ def get_bounded_ts(): return BOUNDED_TS -def construct_guarantee_ts(consistency_level, collection_name, kwargs): +def construct_guarantee_ts(collection_name, kwargs): + consistency_level = kwargs.get("consistency_level", None) + use_default = consistency_level is None + if use_default: + # in case of the default consistency is Customized or Session, + # we set guarantee_timestamp to the cached mutation ts or 1 + kwargs["guarantee_timestamp"] = get_collection_ts(collection_name) or get_eventually_ts() + return True + consistency_level = get_consistency_level(consistency_level) + kwargs["consistency_level"] = consistency_level if consistency_level == ConsistencyLevel.Strong: # Milvus will assign a newest ts. kwargs["guarantee_timestamp"] = 0 @@ -83,9 +92,7 @@ def construct_guarantee_ts(consistency_level, collection_name, kwargs): elif consistency_level == ConsistencyLevel.Bounded: # Milvus will assign ts according to the server timestamp and a configured time interval kwargs["guarantee_timestamp"] = get_bounded_ts() - elif consistency_level == ConsistencyLevel.Eventually: - # Using a very small timestamp. - kwargs["guarantee_timestamp"] = get_eventually_ts() else: # Users customize the consistency level, no modification on `guarantee_timestamp`. - pass + kwargs.setdefault("guarantee_timestamp", get_eventually_ts()) + return use_default diff --git a/pymilvus/grpc_gen/common_pb2.py b/pymilvus/grpc_gen/common_pb2.py index abef94ff3..4360bb41d 100644 --- a/pymilvus/grpc_gen/common_pb2.py +++ b/pymilvus/grpc_gen/common_pb2.py @@ -14,7 +14,7 @@ from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63ommon.proto\x12\x13milvus.proto.common\x1a google/protobuf/descriptor.proto\"L\n\x06Status\x12\x32\n\nerror_code\x18\x01 \x01(\x0e\x32\x1e.milvus.proto.common.ErrorCode\x12\x0e\n\x06reason\x18\x02 \x01(\t\"*\n\x0cKeyValuePair\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"(\n\x0bKeyDataPair\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"\x15\n\x04\x42lob\x12\r\n\x05value\x18\x01 \x01(\x0c\"c\n\x10PlaceholderValue\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32$.milvus.proto.common.PlaceholderType\x12\x0e\n\x06values\x18\x03 \x03(\x0c\"O\n\x10PlaceholderGroup\x12;\n\x0cplaceholders\x18\x01 \x03(\x0b\x32%.milvus.proto.common.PlaceholderValue\"#\n\x07\x41\x64\x64ress\x12\n\n\x02ip\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x03\"\x7f\n\x07MsgBase\x12.\n\x08msg_type\x18\x01 \x01(\x0e\x32\x1c.milvus.proto.common.MsgType\x12\r\n\x05msgID\x18\x02 \x01(\x03\x12\x11\n\ttimestamp\x18\x03 \x01(\x04\x12\x10\n\x08sourceID\x18\x04 \x01(\x03\x12\x10\n\x08targetID\x18\x05 \x01(\x03\"7\n\tMsgHeader\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\"M\n\x0c\x44MLMsgHeader\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\tshardName\x18\x02 \x01(\t\"\xbb\x01\n\x0cPrivilegeExt\x12\x34\n\x0bobject_type\x18\x01 \x01(\x0e\x32\x1f.milvus.proto.common.ObjectType\x12>\n\x10object_privilege\x18\x02 \x01(\x0e\x32$.milvus.proto.common.ObjectPrivilege\x12\x19\n\x11object_name_index\x18\x03 \x01(\x05\x12\x1a\n\x12object_name_indexs\x18\x04 \x01(\x05\"\xd5\x01\n\nClientInfo\x12\x10\n\x08sdk_type\x18\x01 \x01(\t\x12\x13\n\x0bsdk_version\x18\x02 \x01(\t\x12\x12\n\nlocal_time\x18\x03 \x01(\t\x12\x0c\n\x04user\x18\x04 \x01(\t\x12\x0c\n\x04host\x18\x05 \x01(\t\x12?\n\x08reserved\x18\x06 \x03(\x0b\x32-.milvus.proto.common.ClientInfo.ReservedEntry\x1a/\n\rReservedEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xe3\x01\n\nServerInfo\x12\x12\n\nbuild_tags\x18\x01 \x01(\t\x12\x12\n\nbuild_time\x18\x02 \x01(\t\x12\x12\n\ngit_commit\x18\x03 \x01(\t\x12\x12\n\ngo_version\x18\x04 \x01(\t\x12\x13\n\x0b\x64\x65ploy_mode\x18\x05 \x01(\t\x12?\n\x08reserved\x18\x06 \x03(\x0b\x32-.milvus.proto.common.ServerInfo.ReservedEntry\x1a/\n\rReservedEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01*\xd7\n\n\tErrorCode\x12\x0b\n\x07Success\x10\x00\x12\x13\n\x0fUnexpectedError\x10\x01\x12\x11\n\rConnectFailed\x10\x02\x12\x14\n\x10PermissionDenied\x10\x03\x12\x17\n\x13\x43ollectionNotExists\x10\x04\x12\x13\n\x0fIllegalArgument\x10\x05\x12\x14\n\x10IllegalDimension\x10\x07\x12\x14\n\x10IllegalIndexType\x10\x08\x12\x19\n\x15IllegalCollectionName\x10\t\x12\x0f\n\x0bIllegalTOPK\x10\n\x12\x14\n\x10IllegalRowRecord\x10\x0b\x12\x13\n\x0fIllegalVectorID\x10\x0c\x12\x17\n\x13IllegalSearchResult\x10\r\x12\x10\n\x0c\x46ileNotFound\x10\x0e\x12\x0e\n\nMetaFailed\x10\x0f\x12\x0f\n\x0b\x43\x61\x63heFailed\x10\x10\x12\x16\n\x12\x43\x61nnotCreateFolder\x10\x11\x12\x14\n\x10\x43\x61nnotCreateFile\x10\x12\x12\x16\n\x12\x43\x61nnotDeleteFolder\x10\x13\x12\x14\n\x10\x43\x61nnotDeleteFile\x10\x14\x12\x13\n\x0f\x42uildIndexError\x10\x15\x12\x10\n\x0cIllegalNLIST\x10\x16\x12\x15\n\x11IllegalMetricType\x10\x17\x12\x0f\n\x0bOutOfMemory\x10\x18\x12\x11\n\rIndexNotExist\x10\x19\x12\x13\n\x0f\x45mptyCollection\x10\x1a\x12\x1b\n\x17UpdateImportTaskFailure\x10\x1b\x12\x1a\n\x16\x43ollectionNameNotFound\x10\x1c\x12\x1b\n\x17\x43reateCredentialFailure\x10\x1d\x12\x1b\n\x17UpdateCredentialFailure\x10\x1e\x12\x1b\n\x17\x44\x65leteCredentialFailure\x10\x1f\x12\x18\n\x14GetCredentialFailure\x10 \x12\x18\n\x14ListCredUsersFailure\x10!\x12\x12\n\x0eGetUserFailure\x10\"\x12\x15\n\x11\x43reateRoleFailure\x10#\x12\x13\n\x0f\x44ropRoleFailure\x10$\x12\x1a\n\x16OperateUserRoleFailure\x10%\x12\x15\n\x11SelectRoleFailure\x10&\x12\x15\n\x11SelectUserFailure\x10\'\x12\x19\n\x15SelectResourceFailure\x10(\x12\x1b\n\x17OperatePrivilegeFailure\x10)\x12\x16\n\x12SelectGrantFailure\x10*\x12!\n\x1dRefreshPolicyInfoCacheFailure\x10+\x12\x15\n\x11ListPolicyFailure\x10,\x12\x12\n\x0eNotShardLeader\x10-\x12\x16\n\x12NoReplicaAvailable\x10.\x12\x13\n\x0fSegmentNotFound\x10/\x12\r\n\tForceDeny\x10\x30\x12\r\n\tRateLimit\x10\x31\x12\x12\n\x0eNodeIDNotMatch\x10\x32\x12\x14\n\x10UpsertAutoIDTrue\x10\x33\x12\x1c\n\x18InsufficientMemoryToLoad\x10\x34\x12\x18\n\x14MemoryQuotaExhausted\x10\x35\x12\x16\n\x12\x44iskQuotaExhausted\x10\x36\x12\x15\n\x11TimeTickLongDelay\x10\x37\x12\x11\n\rNotReadyServe\x10\x38\x12\x1b\n\x17NotReadyCoordActivating\x10\x39\x12\x12\n\x0eNotFoundTSafer\x10:\x12\x0f\n\x0b\x44\x61taCoordNA\x10\x64\x12\x12\n\rDDRequestRace\x10\xe8\x07*c\n\nIndexState\x12\x12\n\x0eIndexStateNone\x10\x00\x12\x0c\n\x08Unissued\x10\x01\x12\x0e\n\nInProgress\x10\x02\x12\x0c\n\x08\x46inished\x10\x03\x12\n\n\x06\x46\x61iled\x10\x04\x12\t\n\x05Retry\x10\x05*\x82\x01\n\x0cSegmentState\x12\x14\n\x10SegmentStateNone\x10\x00\x12\x0c\n\x08NotExist\x10\x01\x12\x0b\n\x07Growing\x10\x02\x12\n\n\x06Sealed\x10\x03\x12\x0b\n\x07\x46lushed\x10\x04\x12\x0c\n\x08\x46lushing\x10\x05\x12\x0b\n\x07\x44ropped\x10\x06\x12\r\n\tImporting\x10\x07*>\n\x0fPlaceholderType\x12\x08\n\x04None\x10\x00\x12\x10\n\x0c\x42inaryVector\x10\x64\x12\x0f\n\x0b\x46loatVector\x10\x65*\x93\x0f\n\x07MsgType\x12\r\n\tUndefined\x10\x00\x12\x14\n\x10\x43reateCollection\x10\x64\x12\x12\n\x0e\x44ropCollection\x10\x65\x12\x11\n\rHasCollection\x10\x66\x12\x16\n\x12\x44\x65scribeCollection\x10g\x12\x13\n\x0fShowCollections\x10h\x12\x14\n\x10GetSystemConfigs\x10i\x12\x12\n\x0eLoadCollection\x10j\x12\x15\n\x11ReleaseCollection\x10k\x12\x0f\n\x0b\x43reateAlias\x10l\x12\r\n\tDropAlias\x10m\x12\x0e\n\nAlterAlias\x10n\x12\x13\n\x0f\x41lterCollection\x10o\x12\x14\n\x10RenameCollection\x10p\x12\x14\n\x0f\x43reatePartition\x10\xc8\x01\x12\x12\n\rDropPartition\x10\xc9\x01\x12\x11\n\x0cHasPartition\x10\xca\x01\x12\x16\n\x11\x44\x65scribePartition\x10\xcb\x01\x12\x13\n\x0eShowPartitions\x10\xcc\x01\x12\x13\n\x0eLoadPartitions\x10\xcd\x01\x12\x16\n\x11ReleasePartitions\x10\xce\x01\x12\x11\n\x0cShowSegments\x10\xfa\x01\x12\x14\n\x0f\x44\x65scribeSegment\x10\xfb\x01\x12\x11\n\x0cLoadSegments\x10\xfc\x01\x12\x14\n\x0fReleaseSegments\x10\xfd\x01\x12\x14\n\x0fHandoffSegments\x10\xfe\x01\x12\x18\n\x13LoadBalanceSegments\x10\xff\x01\x12\x15\n\x10\x44\x65scribeSegments\x10\x80\x02\x12\x10\n\x0b\x43reateIndex\x10\xac\x02\x12\x12\n\rDescribeIndex\x10\xad\x02\x12\x0e\n\tDropIndex\x10\xae\x02\x12\x0b\n\x06Insert\x10\x90\x03\x12\x0b\n\x06\x44\x65lete\x10\x91\x03\x12\n\n\x05\x46lush\x10\x92\x03\x12\x17\n\x12ResendSegmentStats\x10\x93\x03\x12\x0b\n\x06Search\x10\xf4\x03\x12\x11\n\x0cSearchResult\x10\xf5\x03\x12\x12\n\rGetIndexState\x10\xf6\x03\x12\x1a\n\x15GetIndexBuildProgress\x10\xf7\x03\x12\x1c\n\x17GetCollectionStatistics\x10\xf8\x03\x12\x1b\n\x16GetPartitionStatistics\x10\xf9\x03\x12\r\n\x08Retrieve\x10\xfa\x03\x12\x13\n\x0eRetrieveResult\x10\xfb\x03\x12\x14\n\x0fWatchDmChannels\x10\xfc\x03\x12\x15\n\x10RemoveDmChannels\x10\xfd\x03\x12\x17\n\x12WatchQueryChannels\x10\xfe\x03\x12\x18\n\x13RemoveQueryChannels\x10\xff\x03\x12\x1d\n\x18SealedSegmentsChangeInfo\x10\x80\x04\x12\x17\n\x12WatchDeltaChannels\x10\x81\x04\x12\x14\n\x0fGetShardLeaders\x10\x82\x04\x12\x10\n\x0bGetReplicas\x10\x83\x04\x12\x13\n\x0eUnsubDmChannel\x10\x84\x04\x12\x14\n\x0fGetDistribution\x10\x85\x04\x12\x15\n\x10SyncDistribution\x10\x86\x04\x12\x10\n\x0bSegmentInfo\x10\xd8\x04\x12\x0f\n\nSystemInfo\x10\xd9\x04\x12\x14\n\x0fGetRecoveryInfo\x10\xda\x04\x12\x14\n\x0fGetSegmentState\x10\xdb\x04\x12\r\n\x08TimeTick\x10\xb0\t\x12\x13\n\x0eQueryNodeStats\x10\xb1\t\x12\x0e\n\tLoadIndex\x10\xb2\t\x12\x0e\n\tRequestID\x10\xb3\t\x12\x0f\n\nRequestTSO\x10\xb4\t\x12\x14\n\x0f\x41llocateSegment\x10\xb5\t\x12\x16\n\x11SegmentStatistics\x10\xb6\t\x12\x15\n\x10SegmentFlushDone\x10\xb7\t\x12\x0f\n\nDataNodeTt\x10\xb8\t\x12\x0c\n\x07\x43onnect\x10\xb9\t\x12\x14\n\x0fListClientInfos\x10\xba\t\x12\x15\n\x10\x43reateCredential\x10\xdc\x0b\x12\x12\n\rGetCredential\x10\xdd\x0b\x12\x15\n\x10\x44\x65leteCredential\x10\xde\x0b\x12\x15\n\x10UpdateCredential\x10\xdf\x0b\x12\x16\n\x11ListCredUsernames\x10\xe0\x0b\x12\x0f\n\nCreateRole\x10\xc0\x0c\x12\r\n\x08\x44ropRole\x10\xc1\x0c\x12\x14\n\x0fOperateUserRole\x10\xc2\x0c\x12\x0f\n\nSelectRole\x10\xc3\x0c\x12\x0f\n\nSelectUser\x10\xc4\x0c\x12\x13\n\x0eSelectResource\x10\xc5\x0c\x12\x15\n\x10OperatePrivilege\x10\xc6\x0c\x12\x10\n\x0bSelectGrant\x10\xc7\x0c\x12\x1b\n\x16RefreshPolicyInfoCache\x10\xc8\x0c\x12\x0f\n\nListPolicy\x10\xc9\x0c\x12\x18\n\x13\x43reateResourceGroup\x10\xa4\r\x12\x16\n\x11\x44ropResourceGroup\x10\xa5\r\x12\x17\n\x12ListResourceGroups\x10\xa6\r\x12\x1a\n\x15\x44\x65scribeResourceGroup\x10\xa7\r\x12\x11\n\x0cTransferNode\x10\xa8\r\x12\x14\n\x0fTransferReplica\x10\xa9\r\x12\x13\n\x0e\x43reateDatabase\x10\x89\x0e\x12\x11\n\x0c\x44ropDatabase\x10\x8a\x0e\x12\x12\n\rListDatabases\x10\x8b\x0e*\"\n\x07\x44slType\x12\x07\n\x03\x44sl\x10\x00\x12\x0e\n\nBoolExprV1\x10\x01*B\n\x0f\x43ompactionState\x12\x11\n\rUndefiedState\x10\x00\x12\r\n\tExecuting\x10\x01\x12\r\n\tCompleted\x10\x02*X\n\x10\x43onsistencyLevel\x12\n\n\x06Strong\x10\x00\x12\x0b\n\x07Session\x10\x01\x12\x0b\n\x07\x42ounded\x10\x02\x12\x0e\n\nEventually\x10\x03\x12\x0e\n\nCustomized\x10\x04*\x8b\x01\n\x0bImportState\x12\x11\n\rImportPending\x10\x00\x12\x10\n\x0cImportFailed\x10\x01\x12\x11\n\rImportStarted\x10\x02\x12\x13\n\x0fImportPersisted\x10\x05\x12\x13\n\x0fImportCompleted\x10\x06\x12\x1a\n\x16ImportFailedAndCleaned\x10\x07*2\n\nObjectType\x12\x0e\n\nCollection\x10\x00\x12\n\n\x06Global\x10\x01\x12\x08\n\x04User\x10\x02*\xf5\x07\n\x0fObjectPrivilege\x12\x10\n\x0cPrivilegeAll\x10\x00\x12\x1d\n\x19PrivilegeCreateCollection\x10\x01\x12\x1b\n\x17PrivilegeDropCollection\x10\x02\x12\x1f\n\x1bPrivilegeDescribeCollection\x10\x03\x12\x1c\n\x18PrivilegeShowCollections\x10\x04\x12\x11\n\rPrivilegeLoad\x10\x05\x12\x14\n\x10PrivilegeRelease\x10\x06\x12\x17\n\x13PrivilegeCompaction\x10\x07\x12\x13\n\x0fPrivilegeInsert\x10\x08\x12\x13\n\x0fPrivilegeDelete\x10\t\x12\x1a\n\x16PrivilegeGetStatistics\x10\n\x12\x18\n\x14PrivilegeCreateIndex\x10\x0b\x12\x18\n\x14PrivilegeIndexDetail\x10\x0c\x12\x16\n\x12PrivilegeDropIndex\x10\r\x12\x13\n\x0fPrivilegeSearch\x10\x0e\x12\x12\n\x0ePrivilegeFlush\x10\x0f\x12\x12\n\x0ePrivilegeQuery\x10\x10\x12\x18\n\x14PrivilegeLoadBalance\x10\x11\x12\x13\n\x0fPrivilegeImport\x10\x12\x12\x1c\n\x18PrivilegeCreateOwnership\x10\x13\x12\x17\n\x13PrivilegeUpdateUser\x10\x14\x12\x1a\n\x16PrivilegeDropOwnership\x10\x15\x12\x1c\n\x18PrivilegeSelectOwnership\x10\x16\x12\x1c\n\x18PrivilegeManageOwnership\x10\x17\x12\x17\n\x13PrivilegeSelectUser\x10\x18\x12 \n\x1cPrivilegeCreateResourceGroup\x10\x1a\x12\x1e\n\x1aPrivilegeDropResourceGroup\x10\x1b\x12\"\n\x1ePrivilegeDescribeResourceGroup\x10\x1c\x12\x1f\n\x1bPrivilegeListResourceGroups\x10\x1d\x12\x19\n\x15PrivilegeTransferNode\x10\x1e\x12\x1c\n\x18PrivilegeTransferReplica\x10\x1f\x12\x1f\n\x1bPrivilegeGetLoadingProgress\x10 \x12\x19\n\x15PrivilegeGetLoadState\x10!\x12\x1d\n\x19PrivilegeRenameCollection\x10\"\x12\x1b\n\x17PrivilegeCreateDatabase\x10#\x12\x19\n\x15PrivilegeDropDatabase\x10$\x12\x1a\n\x16PrivilegeListDatabases\x10%*S\n\tStateCode\x12\x10\n\x0cInitializing\x10\x00\x12\x0b\n\x07Healthy\x10\x01\x12\x0c\n\x08\x41\x62normal\x10\x02\x12\x0b\n\x07StandBy\x10\x03\x12\x0c\n\x08Stopping\x10\x04*c\n\tLoadState\x12\x15\n\x11LoadStateNotExist\x10\x00\x12\x14\n\x10LoadStateNotLoad\x10\x01\x12\x14\n\x10LoadStateLoading\x10\x02\x12\x13\n\x0fLoadStateLoaded\x10\x03:^\n\x11privilege_ext_obj\x12\x1f.google.protobuf.MessageOptions\x18\xe9\x07 \x01(\x0b\x32!.milvus.proto.common.PrivilegeExtBf\n\x0eio.milvus.grpcB\x0b\x43ommonProtoP\x01Z1github.com/milvus-io/milvus-proto/go-api/commonpb\xa0\x01\x01\xaa\x02\x0eIO.Milvus.Grpcb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63ommon.proto\x12\x13milvus.proto.common\x1a google/protobuf/descriptor.proto\"L\n\x06Status\x12\x32\n\nerror_code\x18\x01 \x01(\x0e\x32\x1e.milvus.proto.common.ErrorCode\x12\x0e\n\x06reason\x18\x02 \x01(\t\"*\n\x0cKeyValuePair\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"(\n\x0bKeyDataPair\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"\x15\n\x04\x42lob\x12\r\n\x05value\x18\x01 \x01(\x0c\"c\n\x10PlaceholderValue\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32$.milvus.proto.common.PlaceholderType\x12\x0e\n\x06values\x18\x03 \x03(\x0c\"O\n\x10PlaceholderGroup\x12;\n\x0cplaceholders\x18\x01 \x03(\x0b\x32%.milvus.proto.common.PlaceholderValue\"#\n\x07\x41\x64\x64ress\x12\n\n\x02ip\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x03\"\x7f\n\x07MsgBase\x12.\n\x08msg_type\x18\x01 \x01(\x0e\x32\x1c.milvus.proto.common.MsgType\x12\r\n\x05msgID\x18\x02 \x01(\x03\x12\x11\n\ttimestamp\x18\x03 \x01(\x04\x12\x10\n\x08sourceID\x18\x04 \x01(\x03\x12\x10\n\x08targetID\x18\x05 \x01(\x03\"7\n\tMsgHeader\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\"M\n\x0c\x44MLMsgHeader\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\tshardName\x18\x02 \x01(\t\"\xbb\x01\n\x0cPrivilegeExt\x12\x34\n\x0bobject_type\x18\x01 \x01(\x0e\x32\x1f.milvus.proto.common.ObjectType\x12>\n\x10object_privilege\x18\x02 \x01(\x0e\x32$.milvus.proto.common.ObjectPrivilege\x12\x19\n\x11object_name_index\x18\x03 \x01(\x05\x12\x1a\n\x12object_name_indexs\x18\x04 \x01(\x05\"\xd5\x01\n\nClientInfo\x12\x10\n\x08sdk_type\x18\x01 \x01(\t\x12\x13\n\x0bsdk_version\x18\x02 \x01(\t\x12\x12\n\nlocal_time\x18\x03 \x01(\t\x12\x0c\n\x04user\x18\x04 \x01(\t\x12\x0c\n\x04host\x18\x05 \x01(\t\x12?\n\x08reserved\x18\x06 \x03(\x0b\x32-.milvus.proto.common.ClientInfo.ReservedEntry\x1a/\n\rReservedEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xe3\x01\n\nServerInfo\x12\x12\n\nbuild_tags\x18\x01 \x01(\t\x12\x12\n\nbuild_time\x18\x02 \x01(\t\x12\x12\n\ngit_commit\x18\x03 \x01(\t\x12\x12\n\ngo_version\x18\x04 \x01(\t\x12\x13\n\x0b\x64\x65ploy_mode\x18\x05 \x01(\t\x12?\n\x08reserved\x18\x06 \x03(\x0b\x32-.milvus.proto.common.ServerInfo.ReservedEntry\x1a/\n\rReservedEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01*\xd7\n\n\tErrorCode\x12\x0b\n\x07Success\x10\x00\x12\x13\n\x0fUnexpectedError\x10\x01\x12\x11\n\rConnectFailed\x10\x02\x12\x14\n\x10PermissionDenied\x10\x03\x12\x17\n\x13\x43ollectionNotExists\x10\x04\x12\x13\n\x0fIllegalArgument\x10\x05\x12\x14\n\x10IllegalDimension\x10\x07\x12\x14\n\x10IllegalIndexType\x10\x08\x12\x19\n\x15IllegalCollectionName\x10\t\x12\x0f\n\x0bIllegalTOPK\x10\n\x12\x14\n\x10IllegalRowRecord\x10\x0b\x12\x13\n\x0fIllegalVectorID\x10\x0c\x12\x17\n\x13IllegalSearchResult\x10\r\x12\x10\n\x0c\x46ileNotFound\x10\x0e\x12\x0e\n\nMetaFailed\x10\x0f\x12\x0f\n\x0b\x43\x61\x63heFailed\x10\x10\x12\x16\n\x12\x43\x61nnotCreateFolder\x10\x11\x12\x14\n\x10\x43\x61nnotCreateFile\x10\x12\x12\x16\n\x12\x43\x61nnotDeleteFolder\x10\x13\x12\x14\n\x10\x43\x61nnotDeleteFile\x10\x14\x12\x13\n\x0f\x42uildIndexError\x10\x15\x12\x10\n\x0cIllegalNLIST\x10\x16\x12\x15\n\x11IllegalMetricType\x10\x17\x12\x0f\n\x0bOutOfMemory\x10\x18\x12\x11\n\rIndexNotExist\x10\x19\x12\x13\n\x0f\x45mptyCollection\x10\x1a\x12\x1b\n\x17UpdateImportTaskFailure\x10\x1b\x12\x1a\n\x16\x43ollectionNameNotFound\x10\x1c\x12\x1b\n\x17\x43reateCredentialFailure\x10\x1d\x12\x1b\n\x17UpdateCredentialFailure\x10\x1e\x12\x1b\n\x17\x44\x65leteCredentialFailure\x10\x1f\x12\x18\n\x14GetCredentialFailure\x10 \x12\x18\n\x14ListCredUsersFailure\x10!\x12\x12\n\x0eGetUserFailure\x10\"\x12\x15\n\x11\x43reateRoleFailure\x10#\x12\x13\n\x0f\x44ropRoleFailure\x10$\x12\x1a\n\x16OperateUserRoleFailure\x10%\x12\x15\n\x11SelectRoleFailure\x10&\x12\x15\n\x11SelectUserFailure\x10\'\x12\x19\n\x15SelectResourceFailure\x10(\x12\x1b\n\x17OperatePrivilegeFailure\x10)\x12\x16\n\x12SelectGrantFailure\x10*\x12!\n\x1dRefreshPolicyInfoCacheFailure\x10+\x12\x15\n\x11ListPolicyFailure\x10,\x12\x12\n\x0eNotShardLeader\x10-\x12\x16\n\x12NoReplicaAvailable\x10.\x12\x13\n\x0fSegmentNotFound\x10/\x12\r\n\tForceDeny\x10\x30\x12\r\n\tRateLimit\x10\x31\x12\x12\n\x0eNodeIDNotMatch\x10\x32\x12\x14\n\x10UpsertAutoIDTrue\x10\x33\x12\x1c\n\x18InsufficientMemoryToLoad\x10\x34\x12\x18\n\x14MemoryQuotaExhausted\x10\x35\x12\x16\n\x12\x44iskQuotaExhausted\x10\x36\x12\x15\n\x11TimeTickLongDelay\x10\x37\x12\x11\n\rNotReadyServe\x10\x38\x12\x1b\n\x17NotReadyCoordActivating\x10\x39\x12\x12\n\x0eNotFoundTSafer\x10:\x12\x0f\n\x0b\x44\x61taCoordNA\x10\x64\x12\x12\n\rDDRequestRace\x10\xe8\x07*c\n\nIndexState\x12\x12\n\x0eIndexStateNone\x10\x00\x12\x0c\n\x08Unissued\x10\x01\x12\x0e\n\nInProgress\x10\x02\x12\x0c\n\x08\x46inished\x10\x03\x12\n\n\x06\x46\x61iled\x10\x04\x12\t\n\x05Retry\x10\x05*\x82\x01\n\x0cSegmentState\x12\x14\n\x10SegmentStateNone\x10\x00\x12\x0c\n\x08NotExist\x10\x01\x12\x0b\n\x07Growing\x10\x02\x12\n\n\x06Sealed\x10\x03\x12\x0b\n\x07\x46lushed\x10\x04\x12\x0c\n\x08\x46lushing\x10\x05\x12\x0b\n\x07\x44ropped\x10\x06\x12\r\n\tImporting\x10\x07*>\n\x0fPlaceholderType\x12\x08\n\x04None\x10\x00\x12\x10\n\x0c\x42inaryVector\x10\x64\x12\x0f\n\x0b\x46loatVector\x10\x65*\xac\x0f\n\x07MsgType\x12\r\n\tUndefined\x10\x00\x12\x14\n\x10\x43reateCollection\x10\x64\x12\x12\n\x0e\x44ropCollection\x10\x65\x12\x11\n\rHasCollection\x10\x66\x12\x16\n\x12\x44\x65scribeCollection\x10g\x12\x13\n\x0fShowCollections\x10h\x12\x14\n\x10GetSystemConfigs\x10i\x12\x12\n\x0eLoadCollection\x10j\x12\x15\n\x11ReleaseCollection\x10k\x12\x0f\n\x0b\x43reateAlias\x10l\x12\r\n\tDropAlias\x10m\x12\x0e\n\nAlterAlias\x10n\x12\x13\n\x0f\x41lterCollection\x10o\x12\x14\n\x10RenameCollection\x10p\x12\x14\n\x0f\x43reatePartition\x10\xc8\x01\x12\x12\n\rDropPartition\x10\xc9\x01\x12\x11\n\x0cHasPartition\x10\xca\x01\x12\x16\n\x11\x44\x65scribePartition\x10\xcb\x01\x12\x13\n\x0eShowPartitions\x10\xcc\x01\x12\x13\n\x0eLoadPartitions\x10\xcd\x01\x12\x16\n\x11ReleasePartitions\x10\xce\x01\x12\x11\n\x0cShowSegments\x10\xfa\x01\x12\x14\n\x0f\x44\x65scribeSegment\x10\xfb\x01\x12\x11\n\x0cLoadSegments\x10\xfc\x01\x12\x14\n\x0fReleaseSegments\x10\xfd\x01\x12\x14\n\x0fHandoffSegments\x10\xfe\x01\x12\x18\n\x13LoadBalanceSegments\x10\xff\x01\x12\x15\n\x10\x44\x65scribeSegments\x10\x80\x02\x12\x10\n\x0b\x43reateIndex\x10\xac\x02\x12\x12\n\rDescribeIndex\x10\xad\x02\x12\x0e\n\tDropIndex\x10\xae\x02\x12\x17\n\x12GetIndexStatistics\x10\xaf\x02\x12\x0b\n\x06Insert\x10\x90\x03\x12\x0b\n\x06\x44\x65lete\x10\x91\x03\x12\n\n\x05\x46lush\x10\x92\x03\x12\x17\n\x12ResendSegmentStats\x10\x93\x03\x12\x0b\n\x06Search\x10\xf4\x03\x12\x11\n\x0cSearchResult\x10\xf5\x03\x12\x12\n\rGetIndexState\x10\xf6\x03\x12\x1a\n\x15GetIndexBuildProgress\x10\xf7\x03\x12\x1c\n\x17GetCollectionStatistics\x10\xf8\x03\x12\x1b\n\x16GetPartitionStatistics\x10\xf9\x03\x12\r\n\x08Retrieve\x10\xfa\x03\x12\x13\n\x0eRetrieveResult\x10\xfb\x03\x12\x14\n\x0fWatchDmChannels\x10\xfc\x03\x12\x15\n\x10RemoveDmChannels\x10\xfd\x03\x12\x17\n\x12WatchQueryChannels\x10\xfe\x03\x12\x18\n\x13RemoveQueryChannels\x10\xff\x03\x12\x1d\n\x18SealedSegmentsChangeInfo\x10\x80\x04\x12\x17\n\x12WatchDeltaChannels\x10\x81\x04\x12\x14\n\x0fGetShardLeaders\x10\x82\x04\x12\x10\n\x0bGetReplicas\x10\x83\x04\x12\x13\n\x0eUnsubDmChannel\x10\x84\x04\x12\x14\n\x0fGetDistribution\x10\x85\x04\x12\x15\n\x10SyncDistribution\x10\x86\x04\x12\x10\n\x0bSegmentInfo\x10\xd8\x04\x12\x0f\n\nSystemInfo\x10\xd9\x04\x12\x14\n\x0fGetRecoveryInfo\x10\xda\x04\x12\x14\n\x0fGetSegmentState\x10\xdb\x04\x12\r\n\x08TimeTick\x10\xb0\t\x12\x13\n\x0eQueryNodeStats\x10\xb1\t\x12\x0e\n\tLoadIndex\x10\xb2\t\x12\x0e\n\tRequestID\x10\xb3\t\x12\x0f\n\nRequestTSO\x10\xb4\t\x12\x14\n\x0f\x41llocateSegment\x10\xb5\t\x12\x16\n\x11SegmentStatistics\x10\xb6\t\x12\x15\n\x10SegmentFlushDone\x10\xb7\t\x12\x0f\n\nDataNodeTt\x10\xb8\t\x12\x0c\n\x07\x43onnect\x10\xb9\t\x12\x14\n\x0fListClientInfos\x10\xba\t\x12\x15\n\x10\x43reateCredential\x10\xdc\x0b\x12\x12\n\rGetCredential\x10\xdd\x0b\x12\x15\n\x10\x44\x65leteCredential\x10\xde\x0b\x12\x15\n\x10UpdateCredential\x10\xdf\x0b\x12\x16\n\x11ListCredUsernames\x10\xe0\x0b\x12\x0f\n\nCreateRole\x10\xc0\x0c\x12\r\n\x08\x44ropRole\x10\xc1\x0c\x12\x14\n\x0fOperateUserRole\x10\xc2\x0c\x12\x0f\n\nSelectRole\x10\xc3\x0c\x12\x0f\n\nSelectUser\x10\xc4\x0c\x12\x13\n\x0eSelectResource\x10\xc5\x0c\x12\x15\n\x10OperatePrivilege\x10\xc6\x0c\x12\x10\n\x0bSelectGrant\x10\xc7\x0c\x12\x1b\n\x16RefreshPolicyInfoCache\x10\xc8\x0c\x12\x0f\n\nListPolicy\x10\xc9\x0c\x12\x18\n\x13\x43reateResourceGroup\x10\xa4\r\x12\x16\n\x11\x44ropResourceGroup\x10\xa5\r\x12\x17\n\x12ListResourceGroups\x10\xa6\r\x12\x1a\n\x15\x44\x65scribeResourceGroup\x10\xa7\r\x12\x11\n\x0cTransferNode\x10\xa8\r\x12\x14\n\x0fTransferReplica\x10\xa9\r\x12\x13\n\x0e\x43reateDatabase\x10\x89\x0e\x12\x11\n\x0c\x44ropDatabase\x10\x8a\x0e\x12\x12\n\rListDatabases\x10\x8b\x0e*\"\n\x07\x44slType\x12\x07\n\x03\x44sl\x10\x00\x12\x0e\n\nBoolExprV1\x10\x01*B\n\x0f\x43ompactionState\x12\x11\n\rUndefiedState\x10\x00\x12\r\n\tExecuting\x10\x01\x12\r\n\tCompleted\x10\x02*X\n\x10\x43onsistencyLevel\x12\n\n\x06Strong\x10\x00\x12\x0b\n\x07Session\x10\x01\x12\x0b\n\x07\x42ounded\x10\x02\x12\x0e\n\nEventually\x10\x03\x12\x0e\n\nCustomized\x10\x04*\x8b\x01\n\x0bImportState\x12\x11\n\rImportPending\x10\x00\x12\x10\n\x0cImportFailed\x10\x01\x12\x11\n\rImportStarted\x10\x02\x12\x13\n\x0fImportPersisted\x10\x05\x12\x13\n\x0fImportCompleted\x10\x06\x12\x1a\n\x16ImportFailedAndCleaned\x10\x07*2\n\nObjectType\x12\x0e\n\nCollection\x10\x00\x12\n\n\x06Global\x10\x01\x12\x08\n\x04User\x10\x02*\xf5\x07\n\x0fObjectPrivilege\x12\x10\n\x0cPrivilegeAll\x10\x00\x12\x1d\n\x19PrivilegeCreateCollection\x10\x01\x12\x1b\n\x17PrivilegeDropCollection\x10\x02\x12\x1f\n\x1bPrivilegeDescribeCollection\x10\x03\x12\x1c\n\x18PrivilegeShowCollections\x10\x04\x12\x11\n\rPrivilegeLoad\x10\x05\x12\x14\n\x10PrivilegeRelease\x10\x06\x12\x17\n\x13PrivilegeCompaction\x10\x07\x12\x13\n\x0fPrivilegeInsert\x10\x08\x12\x13\n\x0fPrivilegeDelete\x10\t\x12\x1a\n\x16PrivilegeGetStatistics\x10\n\x12\x18\n\x14PrivilegeCreateIndex\x10\x0b\x12\x18\n\x14PrivilegeIndexDetail\x10\x0c\x12\x16\n\x12PrivilegeDropIndex\x10\r\x12\x13\n\x0fPrivilegeSearch\x10\x0e\x12\x12\n\x0ePrivilegeFlush\x10\x0f\x12\x12\n\x0ePrivilegeQuery\x10\x10\x12\x18\n\x14PrivilegeLoadBalance\x10\x11\x12\x13\n\x0fPrivilegeImport\x10\x12\x12\x1c\n\x18PrivilegeCreateOwnership\x10\x13\x12\x17\n\x13PrivilegeUpdateUser\x10\x14\x12\x1a\n\x16PrivilegeDropOwnership\x10\x15\x12\x1c\n\x18PrivilegeSelectOwnership\x10\x16\x12\x1c\n\x18PrivilegeManageOwnership\x10\x17\x12\x17\n\x13PrivilegeSelectUser\x10\x18\x12 \n\x1cPrivilegeCreateResourceGroup\x10\x1a\x12\x1e\n\x1aPrivilegeDropResourceGroup\x10\x1b\x12\"\n\x1ePrivilegeDescribeResourceGroup\x10\x1c\x12\x1f\n\x1bPrivilegeListResourceGroups\x10\x1d\x12\x19\n\x15PrivilegeTransferNode\x10\x1e\x12\x1c\n\x18PrivilegeTransferReplica\x10\x1f\x12\x1f\n\x1bPrivilegeGetLoadingProgress\x10 \x12\x19\n\x15PrivilegeGetLoadState\x10!\x12\x1d\n\x19PrivilegeRenameCollection\x10\"\x12\x1b\n\x17PrivilegeCreateDatabase\x10#\x12\x19\n\x15PrivilegeDropDatabase\x10$\x12\x1a\n\x16PrivilegeListDatabases\x10%*S\n\tStateCode\x12\x10\n\x0cInitializing\x10\x00\x12\x0b\n\x07Healthy\x10\x01\x12\x0c\n\x08\x41\x62normal\x10\x02\x12\x0b\n\x07StandBy\x10\x03\x12\x0c\n\x08Stopping\x10\x04*c\n\tLoadState\x12\x15\n\x11LoadStateNotExist\x10\x00\x12\x14\n\x10LoadStateNotLoad\x10\x01\x12\x14\n\x10LoadStateLoading\x10\x02\x12\x13\n\x0fLoadStateLoaded\x10\x03:^\n\x11privilege_ext_obj\x12\x1f.google.protobuf.MessageOptions\x18\xe9\x07 \x01(\x0b\x32!.milvus.proto.common.PrivilegeExtBf\n\x0eio.milvus.grpcB\x0b\x43ommonProtoP\x01Z1github.com/milvus-io/milvus-proto/go-api/commonpb\xa0\x01\x01\xaa\x02\x0eIO.Milvus.Grpcb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'common_pb2', globals()) @@ -36,23 +36,23 @@ _PLACEHOLDERTYPE._serialized_start=2982 _PLACEHOLDERTYPE._serialized_end=3044 _MSGTYPE._serialized_start=3047 - _MSGTYPE._serialized_end=4986 - _DSLTYPE._serialized_start=4988 - _DSLTYPE._serialized_end=5022 - _COMPACTIONSTATE._serialized_start=5024 - _COMPACTIONSTATE._serialized_end=5090 - _CONSISTENCYLEVEL._serialized_start=5092 - _CONSISTENCYLEVEL._serialized_end=5180 - _IMPORTSTATE._serialized_start=5183 - _IMPORTSTATE._serialized_end=5322 - _OBJECTTYPE._serialized_start=5324 - _OBJECTTYPE._serialized_end=5374 - _OBJECTPRIVILEGE._serialized_start=5377 - _OBJECTPRIVILEGE._serialized_end=6390 - _STATECODE._serialized_start=6392 - _STATECODE._serialized_end=6475 - _LOADSTATE._serialized_start=6477 - _LOADSTATE._serialized_end=6576 + _MSGTYPE._serialized_end=5011 + _DSLTYPE._serialized_start=5013 + _DSLTYPE._serialized_end=5047 + _COMPACTIONSTATE._serialized_start=5049 + _COMPACTIONSTATE._serialized_end=5115 + _CONSISTENCYLEVEL._serialized_start=5117 + _CONSISTENCYLEVEL._serialized_end=5205 + _IMPORTSTATE._serialized_start=5208 + _IMPORTSTATE._serialized_end=5347 + _OBJECTTYPE._serialized_start=5349 + _OBJECTTYPE._serialized_end=5399 + _OBJECTPRIVILEGE._serialized_start=5402 + _OBJECTPRIVILEGE._serialized_end=6415 + _STATECODE._serialized_start=6417 + _STATECODE._serialized_end=6500 + _LOADSTATE._serialized_start=6502 + _LOADSTATE._serialized_end=6601 _STATUS._serialized_start=71 _STATUS._serialized_end=147 _KEYVALUEPAIR._serialized_start=149 diff --git a/pymilvus/grpc_gen/common_pb2.pyi b/pymilvus/grpc_gen/common_pb2.pyi index ec12657f1..8c317908b 100644 --- a/pymilvus/grpc_gen/common_pb2.pyi +++ b/pymilvus/grpc_gen/common_pb2.pyi @@ -76,6 +76,7 @@ GetCredentialFailure: ErrorCode GetDistribution: MsgType GetIndexBuildProgress: MsgType GetIndexState: MsgType +GetIndexStatistics: MsgType GetPartitionStatistics: MsgType GetRecoveryInfo: MsgType GetReplicas: MsgType diff --git a/pymilvus/grpc_gen/milvus-proto b/pymilvus/grpc_gen/milvus-proto index 2975bfe7a..00da05d31 160000 --- a/pymilvus/grpc_gen/milvus-proto +++ b/pymilvus/grpc_gen/milvus-proto @@ -1,1 +1,1 @@ -Subproject commit 2975bfe7a190d38d1d44d9f1379483e93b1fbb4a +Subproject commit 00da05d318d165fbd375cd81a526704c2287e3aa diff --git a/pymilvus/grpc_gen/milvus_pb2.py b/pymilvus/grpc_gen/milvus_pb2.py index 96e7990c3..6457026a3 100644 --- a/pymilvus/grpc_gen/milvus_pb2.py +++ b/pymilvus/grpc_gen/milvus_pb2.py @@ -16,7 +16,7 @@ from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cmilvus.proto\x12\x13milvus.proto.milvus\x1a\x0c\x63ommon.proto\x1a\x0cschema.proto\x1a google/protobuf/descriptor.proto\"y\n\x12\x43reateAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"^\n\x10\x44ropAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\"x\n\x11\x41lterAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"\xb8\x02\n\x17\x43reateCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0e\n\x06schema\x18\x04 \x01(\x0c\x12\x12\n\nshards_num\x18\x05 \x01(\x05\x12@\n\x11\x63onsistency_level\x18\x06 \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x35\n\nproperties\x18\x07 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x16\n\x0enum_partitions\x18\x08 \x01(\x03:\x12\xca>\x0f\x08\x01\x10\x01\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x81\x01\n\x15\x44ropCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x02\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xcf\x01\n\x16\x41lterCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x35\n\nproperties\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair:\x12\xca>\x0f\x08\x01\x10\x01\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x80\x01\n\x14HasCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\ntime_stamp\x18\x04 \x01(\x04\"J\n\x0c\x42oolResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\x08\"L\n\x0eStringResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\t\"\xaf\x01\n\x19\x44\x65scribeCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x12\n\ntime_stamp\x18\x05 \x01(\x04:\x12\xca>\x0f\x08\x01\x10\x03\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xaa\x04\n\x1a\x44\x65scribeCollectionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x35\n\x06schema\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.CollectionSchema\x12\x14\n\x0c\x63ollectionID\x18\x03 \x01(\x03\x12\x1d\n\x15virtual_channel_names\x18\x04 \x03(\t\x12\x1e\n\x16physical_channel_names\x18\x05 \x03(\t\x12\x19\n\x11\x63reated_timestamp\x18\x06 \x01(\x04\x12\x1d\n\x15\x63reated_utc_timestamp\x18\x07 \x01(\x04\x12\x12\n\nshards_num\x18\x08 \x01(\x05\x12\x0f\n\x07\x61liases\x18\t \x03(\t\x12\x39\n\x0fstart_positions\x18\n \x03(\x0b\x32 .milvus.proto.common.KeyDataPair\x12@\n\x11\x63onsistency_level\x18\x0b \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x17\n\x0f\x63ollection_name\x18\x0c \x01(\t\x12\x35\n\nproperties\x18\r \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x0f\n\x07\x64\x62_name\x18\x0e \x01(\t\x12\x16\n\x0enum_partitions\x18\x0f \x01(\x03\"\xb8\x01\n\x15LoadCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0ereplica_number\x18\x04 \x01(\x05\x12\x17\n\x0fresource_groups\x18\x05 \x03(\t\x12\x0f\n\x07refresh\x18\x06 \x01(\x08:\x07\xca>\x04\x10\x05\x18\x03\"y\n\x18ReleaseCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x06\x18\x03\"\xab\x01\n\x14GetStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x1b\n\x13guarantee_timestamp\x18\x05 \x01(\x04:\x07\xca>\x04\x10\n\x18\x03\"v\n\x15GetStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\x7f\n\x1eGetCollectionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\n\x18\x03\"\x80\x01\n\x1fGetCollectionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc4\x01\n\x16ShowCollectionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x12\n\ntime_stamp\x18\x03 \x01(\x04\x12+\n\x04type\x18\x04 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\x12\x18\n\x10\x63ollection_names\x18\x05 \x03(\t:\x12\xca>\x0f\x08\x01\x10\x04\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xf3\x01\n\x17ShowCollectionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x18\n\x10\x63ollection_names\x18\x02 \x03(\t\x12\x16\n\x0e\x63ollection_ids\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\x12\x1f\n\x17query_service_available\x18\x07 \x03(\x08\"\x86\x01\n\x16\x43reatePartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x84\x01\n\x14\x44ropPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x83\x01\n\x13HasPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\xc8\x01\n\x15LoadPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x16\n\x0ereplica_number\x18\x05 \x01(\x05\x12\x17\n\x0fresource_groups\x18\x06 \x03(\t\x12\x0f\n\x07refresh\x18\x07 \x01(\x08\"\x89\x01\n\x18ReleasePartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x8d\x01\n\x1dGetPartitionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x7f\n\x1eGetPartitionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc9\x01\n\x15ShowPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x17\n\x0fpartition_names\x18\x05 \x03(\t\x12+\n\x04type\x18\x06 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\"\xce\x01\n\x16ShowPartitionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fpartition_names\x18\x02 \x03(\t\x12\x14\n\x0cpartitionIDs\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\"m\n\x16\x44\x65scribeSegmentRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x11\n\tsegmentID\x18\x03 \x01(\x03\"\x8f\x01\n\x17\x44\x65scribeSegmentResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x0f\n\x07\x62uildID\x18\x03 \x01(\x03\x12\x14\n\x0c\x65nable_index\x18\x04 \x01(\x08\x12\x0f\n\x07\x66ieldID\x18\x05 \x01(\x03\"l\n\x13ShowSegmentsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\"W\n\x14ShowSegmentsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x12\n\nsegmentIDs\x18\x02 \x03(\x03\"\xd4\x01\n\x12\x43reateIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x37\n\x0c\x65xtra_params\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nindex_name\x18\x06 \x01(\t:\x07\xca>\x04\x10\x0b\x18\x03\"\x9d\x01\n\x14\x44\x65scribeIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\xf9\x01\n\x10IndexDescription\x12\x12\n\nindex_name\x18\x01 \x01(\t\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x31\n\x06params\x18\x03 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x14\n\x0cindexed_rows\x18\x05 \x01(\x03\x12\x12\n\ntotal_rows\x18\x06 \x01(\x03\x12.\n\x05state\x18\x07 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x1f\n\x17index_state_fail_reason\x18\x08 \x01(\t\"\x87\x01\n\x15\x44\x65scribeIndexResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"\xa5\x01\n\x1cGetIndexBuildProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"v\n\x1dGetIndexBuildProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0cindexed_rows\x18\x02 \x01(\x03\x12\x12\n\ntotal_rows\x18\x03 \x01(\x03\"\x9d\x01\n\x14GetIndexStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\x89\x01\n\x15GetIndexStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12.\n\x05state\x18\x02 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x13\n\x0b\x66\x61il_reason\x18\x03 \x01(\t\"\x99\x01\n\x10\x44ropIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\r\x18\x03\"\xe0\x01\n\rInsertRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x33\n\x0b\x66ields_data\x18\x05 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x11\n\thash_keys\x18\x06 \x03(\r\x12\x10\n\x08num_rows\x18\x07 \x01(\r:\x07\xca>\x04\x10\x08\x18\x03\"\xf0\x01\n\x0eMutationResult\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12%\n\x03IDs\x18\x02 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x12\n\nsucc_index\x18\x03 \x03(\r\x12\x11\n\terr_index\x18\x04 \x03(\r\x12\x14\n\x0c\x61\x63knowledged\x18\x05 \x01(\x08\x12\x12\n\ninsert_cnt\x18\x06 \x01(\x03\x12\x12\n\ndelete_cnt\x18\x07 \x01(\x03\x12\x12\n\nupsert_cnt\x18\x08 \x01(\x03\x12\x11\n\ttimestamp\x18\t \x01(\x04\"\xa7\x01\n\rDeleteRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x05 \x01(\t\x12\x11\n\thash_keys\x18\x06 \x03(\r:\x07\xca>\x04\x10\t\x18\x03\"\x90\x03\n\rSearchRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x0b\n\x03\x64sl\x18\x05 \x01(\t\x12\x19\n\x11placeholder_group\x18\x06 \x01(\x0c\x12.\n\x08\x64sl_type\x18\x07 \x01(\x0e\x32\x1c.milvus.proto.common.DslType\x12\x15\n\routput_fields\x18\x08 \x03(\t\x12\x38\n\rsearch_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x18\n\x10travel_timestamp\x18\n \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x0b \x01(\x04\x12\n\n\x02nq\x18\x0c \x01(\x03\x12\x1b\n\x13not_return_all_meta\x18\r \x01(\x08:\x07\xca>\x04\x10\x0e\x18\x03\"5\n\x04Hits\x12\x0b\n\x03IDs\x18\x01 \x03(\x03\x12\x10\n\x08row_data\x18\x02 \x03(\x0c\x12\x0e\n\x06scores\x18\x03 \x03(\x02\"\x8d\x01\n\rSearchResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x36\n\x07results\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.SearchResultData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"n\n\x0c\x46lushRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x18\n\x10\x63ollection_names\x18\x03 \x03(\t:\x07\xca>\x04\x10\x0f \x03\"\x9b\x04\n\rFlushResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12G\n\x0b\x63oll_segIDs\x18\x03 \x03(\x0b\x32\x32.milvus.proto.milvus.FlushResponse.CollSegIDsEntry\x12R\n\x11\x66lush_coll_segIDs\x18\x04 \x03(\x0b\x32\x37.milvus.proto.milvus.FlushResponse.FlushCollSegIDsEntry\x12N\n\x0f\x63oll_seal_times\x18\x05 \x03(\x0b\x32\x35.milvus.proto.milvus.FlushResponse.CollSealTimesEntry\x1aQ\n\x0f\x43ollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\x1aV\n\x14\x46lushCollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\x1a\x34\n\x12\x43ollSealTimesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\"\xb8\x02\n\x0cQueryRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x04 \x01(\t\x12\x15\n\routput_fields\x18\x05 \x03(\t\x12\x17\n\x0fpartition_names\x18\x06 \x03(\t\x12\x18\n\x10travel_timestamp\x18\x07 \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x08 \x01(\x04\x12\x37\n\x0cquery_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x1b\n\x13not_return_all_meta\x18\n \x01(\x08:\x07\xca>\x04\x10\x10\x18\x03\"\xa0\x01\n\x0cQueryResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x0b\x66ields_data\x18\x02 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x15\n\routput_fields\x18\x04 \x03(\t\"}\n\tVectorIDs\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12*\n\x08id_array\x18\x03 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x83\x01\n\x0cVectorsArray\x12\x32\n\x08id_array\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.milvus.VectorIDsH\x00\x12\x36\n\ndata_array\x18\x02 \x01(\x0b\x32 .milvus.proto.schema.VectorFieldH\x00\x42\x07\n\x05\x61rray\"\xdd\x01\n\x13\x43\x61lcDistanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x32\n\x07op_left\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x33\n\x08op_right\x18\x03 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x31\n\x06params\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb5\x01\n\x13\x43\x61lcDistanceResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x31\n\x08int_dist\x18\x02 \x01(\x0b\x32\x1d.milvus.proto.schema.IntArrayH\x00\x12\x35\n\nfloat_dist\x18\x03 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x42\x07\n\x05\x61rray\"\x11\n\x0f\x46lushAllRequest\"U\n\x10\x46lushAllResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x66lush_all_ts\x18\x02 \x01(\x04\"\x99\x01\n\x15PersistentSegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08num_rows\x18\x04 \x01(\x03\x12\x30\n\x05state\x18\x05 \x01(\x0e\x32!.milvus.proto.common.SegmentState\"u\n\x1fGetPersistentSegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x8a\x01\n GetPersistentSegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x39\n\x05infos\x18\x02 \x03(\x0b\x32*.milvus.proto.milvus.PersistentSegmentInfo\"\xec\x01\n\x10QuerySegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08mem_size\x18\x04 \x01(\x03\x12\x10\n\x08num_rows\x18\x05 \x01(\x03\x12\x12\n\nindex_name\x18\x06 \x01(\t\x12\x0f\n\x07indexID\x18\x07 \x01(\x03\x12\x0e\n\x06nodeID\x18\x08 \x01(\x03\x12\x30\n\x05state\x18\t \x01(\x0e\x32!.milvus.proto.common.SegmentState\x12\x0f\n\x07nodeIds\x18\n \x03(\x03\"p\n\x1aGetQuerySegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x80\x01\n\x1bGetQuerySegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x05infos\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.QuerySegmentInfo\"$\n\x0c\x44ummyRequest\x12\x14\n\x0crequest_type\x18\x01 \x01(\t\"!\n\rDummyResponse\x12\x10\n\x08response\x18\x01 \x01(\t\"\x15\n\x13RegisterLinkRequest\"r\n\x14RegisterLinkResponse\x12-\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.Address\x12+\n\x06status\x18\x02 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"P\n\x11GetMetricsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07request\x18\x02 \x01(\t\"k\n\x12GetMetricsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08response\x18\x02 \x01(\t\x12\x16\n\x0e\x63omponent_name\x18\x03 \x01(\t\"\x98\x01\n\rComponentInfo\x12\x0e\n\x06nodeID\x18\x01 \x01(\x03\x12\x0c\n\x04role\x18\x02 \x01(\t\x12\x32\n\nstate_code\x18\x03 \x01(\x0e\x32\x1e.milvus.proto.common.StateCode\x12\x35\n\nextra_info\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb2\x01\n\x0f\x43omponentStates\x12\x31\n\x05state\x18\x01 \x01(\x0b\x32\".milvus.proto.milvus.ComponentInfo\x12?\n\x13subcomponent_states\x18\x02 \x03(\x0b\x32\".milvus.proto.milvus.ComponentInfo\x12+\n\x06status\x18\x03 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"\x1b\n\x19GetComponentStatesRequest\"\xb6\x01\n\x12LoadBalanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x12\n\nsrc_nodeID\x18\x02 \x01(\x03\x12\x13\n\x0b\x64st_nodeIDs\x18\x03 \x03(\x03\x12\x19\n\x11sealed_segmentIDs\x18\x04 \x03(\x03\x12\x16\n\x0e\x63ollectionName\x18\x05 \x01(\t\x12\x0f\n\x07\x64\x62_name\x18\x06 \x01(\t:\x07\xca>\x04\x10\x11\x18\x05\"L\n\x17ManualCompactionRequest\x12\x14\n\x0c\x63ollectionID\x18\x01 \x01(\x03\x12\x12\n\ntimetravel\x18\x02 \x01(\x04:\x07\xca>\x04\x10\x07\x18\x01\"]\n\x18ManualCompactionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x63ompactionID\x18\x02 \x01(\x03\"1\n\x19GetCompactionStateRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xdd\x01\n\x1aGetCompactionStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12\x17\n\x0f\x65xecutingPlanNo\x18\x03 \x01(\x03\x12\x15\n\rtimeoutPlanNo\x18\x04 \x01(\x03\x12\x17\n\x0f\x63ompletedPlanNo\x18\x05 \x01(\x03\x12\x14\n\x0c\x66\x61iledPlanNo\x18\x06 \x01(\x03\"1\n\x19GetCompactionPlansRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xbc\x01\n\x1aGetCompactionPlansResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12<\n\nmergeInfos\x18\x03 \x03(\x0b\x32(.milvus.proto.milvus.CompactionMergeInfo\"6\n\x13\x43ompactionMergeInfo\x12\x0f\n\x07sources\x18\x01 \x03(\x03\x12\x0e\n\x06target\x18\x02 \x01(\x03\"*\n\x14GetFlushStateRequest\x12\x12\n\nsegmentIDs\x18\x01 \x03(\x03\"U\n\x15GetFlushStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"[\n\x17GetFlushAllStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x66lush_all_ts\x18\x02 \x01(\x04\"X\n\x18GetFlushAllStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"\xc7\x01\n\rImportRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x16\n\x0epartition_name\x18\x02 \x01(\t\x12\x15\n\rchannel_names\x18\x03 \x03(\t\x12\x11\n\trow_based\x18\x04 \x01(\x08\x12\r\n\x05\x66iles\x18\x05 \x03(\t\x12\x32\n\x07options\x18\x06 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x0f\n\x07\x64\x62_name\x18\x07 \x01(\t:\x07\xca>\x04\x10\x12\x18\x01\"L\n\x0eImportResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05tasks\x18\x02 \x03(\x03\"%\n\x15GetImportStateRequest\x12\x0c\n\x04task\x18\x01 \x01(\x03\"\x97\x02\n\x16GetImportStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12/\n\x05state\x18\x02 \x01(\x0e\x32 .milvus.proto.common.ImportState\x12\x11\n\trow_count\x18\x03 \x01(\x03\x12\x0f\n\x07id_list\x18\x04 \x03(\x03\x12\x30\n\x05infos\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\n\n\x02id\x18\x06 \x01(\x03\x12\x15\n\rcollection_id\x18\x07 \x01(\x03\x12\x13\n\x0bsegment_ids\x18\x08 \x03(\x03\x12\x11\n\tcreate_ts\x18\t \x01(\x03\"Q\n\x16ListImportTasksRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\r\n\x05limit\x18\x02 \x01(\x03\x12\x0f\n\x07\x64\x62_name\x18\x03 \x01(\t\"\x82\x01\n\x17ListImportTasksResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x05tasks\x18\x02 \x03(\x0b\x32+.milvus.proto.milvus.GetImportStateResponse\"\x9a\x01\n\x12GetReplicasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x18\n\x10with_shard_nodes\x18\x03 \x01(\x08\x12\x17\n\x0f\x63ollection_name\x18\x04 \x01(\t\x12\x0f\n\x07\x64\x62_name\x18\x05 \x01(\t\"v\n\x13GetReplicasResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08replicas\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.ReplicaInfo\"\xc1\x02\n\x0bReplicaInfo\x12\x11\n\treplicaID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x15\n\rpartition_ids\x18\x03 \x03(\x03\x12\x39\n\x0eshard_replicas\x18\x04 \x03(\x0b\x32!.milvus.proto.milvus.ShardReplica\x12\x10\n\x08node_ids\x18\x05 \x03(\x03\x12\x1b\n\x13resource_group_name\x18\x06 \x01(\t\x12P\n\x11num_outbound_node\x18\x07 \x03(\x0b\x32\x35.milvus.proto.milvus.ReplicaInfo.NumOutboundNodeEntry\x1a\x36\n\x14NumOutboundNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"`\n\x0cShardReplica\x12\x10\n\x08leaderID\x18\x01 \x01(\x03\x12\x13\n\x0bleader_addr\x18\x02 \x01(\t\x12\x17\n\x0f\x64m_channel_name\x18\x03 \x01(\t\x12\x10\n\x08node_ids\x18\x04 \x03(\x03\"\xbe\x01\n\x17\x43reateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x10\n\x08password\x18\x03 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x04 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x05 \x01(\x04:\x12\xca>\x0f\x08\x01\x10\x13\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xcd\x01\n\x17UpdateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boldPassword\x18\x03 \x01(\t\x12\x13\n\x0bnewPassword\x18\x04 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x06 \x01(\x04:\t\xca>\x06\x08\x02\x10\x14\x18\x02\"k\n\x17\x44\x65leteCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x15\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"W\n\x15ListCredUsersResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tusernames\x18\x02 \x03(\t\"V\n\x14ListCredUsersRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x1a\n\nRoleEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1a\n\nUserEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x84\x01\n\x11\x43reateRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12/\n\x06\x65ntity\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity:\x12\xca>\x0f\x08\x01\x10\x13\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"d\n\x0f\x44ropRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\trole_name\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x15\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xb5\x01\n\x16OperateUserRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x11\n\trole_name\x18\x03 \x01(\t\x12\x36\n\x04type\x18\x04 \x01(\x0e\x32(.milvus.proto.milvus.OperateUserRoleType:\x12\xca>\x0f\x08\x01\x10\x17\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x9d\x01\n\x11SelectRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04role\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x19\n\x11include_user_info\x18\x03 \x01(\x08:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"k\n\nRoleResult\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12.\n\x05users\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\"s\n\x12SelectRoleResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleResult\"\x94\x01\n\x11SelectUserRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04user\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x19\n\x11include_role_info\x18\x03 \x01(\x08:\t\xca>\x06\x08\x02\x10\x18\x18\x02\"k\n\nUserResult\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12.\n\x05roles\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\"s\n\x12SelectUserResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserResult\"\x1c\n\x0cObjectEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1f\n\x0fPrivilegeEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"w\n\rGrantorEntity\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x37\n\tprivilege\x18\x02 \x01(\x0b\x32$.milvus.proto.milvus.PrivilegeEntity\"L\n\x14GrantPrivilegeEntity\x12\x34\n\x08\x65ntities\x18\x01 \x03(\x0b\x32\".milvus.proto.milvus.GrantorEntity\"\xca\x01\n\x0bGrantEntity\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x31\n\x06object\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.ObjectEntity\x12\x13\n\x0bobject_name\x18\x03 \x01(\t\x12\x33\n\x07grantor\x18\x04 \x01(\x0b\x32\".milvus.proto.milvus.GrantorEntity\x12\x0f\n\x07\x64\x62_name\x18\x05 \x01(\t\"\x86\x01\n\x12SelectGrantRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"v\n\x13SelectGrantResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08\x65ntities\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.GrantEntity\"\xc4\x01\n\x17OperatePrivilegeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity\x12\x37\n\x04type\x18\x03 \x01(\x0e\x32).milvus.proto.milvus.OperatePrivilegeType:\x12\xca>\x0f\x08\x01\x10\x17\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x93\x01\n\x19GetLoadingProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x17\n\x0f\x63ollection_name\x18\x02 \x01(\t\x12\x17\n\x0fpartition_names\x18\x03 \x03(\t\x12\x0f\n\x07\x64\x62_name\x18\x04 \x01(\t:\x07\xca>\x04\x10 \x18\x02\"[\n\x1aGetLoadingProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08progress\x18\x02 \x01(\x03\"\x8d\x01\n\x13GetLoadStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x17\n\x0f\x63ollection_name\x18\x02 \x01(\t\x12\x17\n\x0fpartition_names\x18\x03 \x03(\t\x12\x0f\n\x07\x64\x62_name\x18\x04 \x01(\t:\x07\xca>\x04\x10!\x18\x02\"r\n\x14GetLoadStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12-\n\x05state\x18\x02 \x01(\x0e\x32\x1e.milvus.proto.common.LoadState\"\x1c\n\tMilvusExt\x12\x0f\n\x07version\x18\x01 \x01(\t\"\x13\n\x11GetVersionRequest\"R\n\x12GetVersionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07version\x18\x02 \x01(\t\"\x14\n\x12\x43heckHealthRequest\"\x9d\x01\n\x13\x43heckHealthResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tisHealthy\x18\x02 \x01(\x08\x12\x0f\n\x07reasons\x18\x03 \x03(\t\x12\x35\n\x0cquota_states\x18\x04 \x03(\x0e\x32\x1f.milvus.proto.milvus.QuotaState\"t\n\x1a\x43reateResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1a\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"r\n\x18\x44ropResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1b\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xa5\x01\n\x13TransferNodeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x1d\n\x15source_resource_group\x18\x02 \x01(\t\x12\x1d\n\x15target_resource_group\x18\x03 \x01(\t\x12\x10\n\x08num_node\x18\x04 \x01(\x05:\x12\xca>\x0f\x08\x01\x10\x1e\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xd5\x01\n\x16TransferReplicaRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x1d\n\x15source_resource_group\x18\x02 \x01(\t\x12\x1d\n\x15target_resource_group\x18\x03 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x04 \x01(\t\x12\x13\n\x0bnum_replica\x18\x05 \x01(\x03\x12\x0f\n\x07\x64\x62_name\x18\x06 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1f\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"[\n\x19ListResourceGroupsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10\x1d\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"b\n\x1aListResourceGroupsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fresource_groups\x18\x02 \x03(\t\"v\n\x1c\x44\x65scribeResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1c\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x88\x01\n\x1d\x44\x65scribeResourceGroupResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x0eresource_group\x18\x02 \x01(\x0b\x32\".milvus.proto.milvus.ResourceGroup\"\xf2\x03\n\rResourceGroup\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x63\x61pacity\x18\x02 \x01(\x05\x12\x1a\n\x12num_available_node\x18\x03 \x01(\x05\x12T\n\x12num_loaded_replica\x18\x04 \x03(\x0b\x32\x38.milvus.proto.milvus.ResourceGroup.NumLoadedReplicaEntry\x12R\n\x11num_outgoing_node\x18\x05 \x03(\x0b\x32\x37.milvus.proto.milvus.ResourceGroup.NumOutgoingNodeEntry\x12R\n\x11num_incoming_node\x18\x06 \x03(\x0b\x32\x37.milvus.proto.milvus.ResourceGroup.NumIncomingNodeEntry\x1a\x37\n\x15NumLoadedReplicaEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x36\n\x14NumOutgoingNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x36\n\x14NumIncomingNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"\x8c\x01\n\x17RenameCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x0f\n\x07oldName\x18\x03 \x01(\t\x12\x0f\n\x07newName\x18\x04 \x01(\t:\x12\xca>\x0f\x08\x01\x10\"\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"h\n\x15\x43reateDatabaseRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10#\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"f\n\x13\x44ropDatabaseRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10$\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"V\n\x14ListDatabasesRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10%\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"j\n\x15ListDatabasesResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08\x64\x62_names\x18\x02 \x03(\t:\x12\xca>\x0f\x08\x01\x10\x04\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"r\n\x0e\x43onnectRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x34\n\x0b\x63lient_info\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.common.ClientInfo\"\x88\x01\n\x0f\x43onnectResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x0bserver_info\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.common.ServerInfo\x12\x12\n\nidentifier\x18\x03 \x01(\x03*!\n\x08ShowType\x12\x07\n\x03\x41ll\x10\x00\x12\x0c\n\x08InMemory\x10\x01*@\n\x13OperateUserRoleType\x12\x11\n\rAddUserToRole\x10\x00\x12\x16\n\x12RemoveUserFromRole\x10\x01*-\n\x14OperatePrivilegeType\x12\t\n\x05Grant\x10\x00\x12\n\n\x06Revoke\x10\x01*]\n\nQuotaState\x12\x0b\n\x07Unknown\x10\x00\x12\x0f\n\x0bReadLimited\x10\x02\x12\x10\n\x0cWriteLimited\x10\x03\x12\x0e\n\nDenyToRead\x10\x04\x12\x0f\n\x0b\x44\x65nyToWrite\x10\x05\x32\xcb\x39\n\rMilvusService\x12_\n\x10\x43reateCollection\x12,.milvus.proto.milvus.CreateCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12[\n\x0e\x44ropCollection\x12*.milvus.proto.milvus.DropCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\rHasCollection\x12).milvus.proto.milvus.HasCollectionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadCollection\x12*.milvus.proto.milvus.LoadCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleaseCollection\x12-.milvus.proto.milvus.ReleaseCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12\x44\x65scribeCollection\x12..milvus.proto.milvus.DescribeCollectionRequest\x1a/.milvus.proto.milvus.DescribeCollectionResponse\"\x00\x12\x86\x01\n\x17GetCollectionStatistics\x12\x33.milvus.proto.milvus.GetCollectionStatisticsRequest\x1a\x34.milvus.proto.milvus.GetCollectionStatisticsResponse\"\x00\x12n\n\x0fShowCollections\x12+.milvus.proto.milvus.ShowCollectionsRequest\x1a,.milvus.proto.milvus.ShowCollectionsResponse\"\x00\x12]\n\x0f\x41lterCollection\x12+.milvus.proto.milvus.AlterCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0f\x43reatePartition\x12+.milvus.proto.milvus.CreatePartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Y\n\rDropPartition\x12).milvus.proto.milvus.DropPartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0cHasPartition\x12(.milvus.proto.milvus.HasPartitionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadPartitions\x12*.milvus.proto.milvus.LoadPartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleasePartitions\x12-.milvus.proto.milvus.ReleasePartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x83\x01\n\x16GetPartitionStatistics\x12\x32.milvus.proto.milvus.GetPartitionStatisticsRequest\x1a\x33.milvus.proto.milvus.GetPartitionStatisticsResponse\"\x00\x12k\n\x0eShowPartitions\x12*.milvus.proto.milvus.ShowPartitionsRequest\x1a+.milvus.proto.milvus.ShowPartitionsResponse\"\x00\x12w\n\x12GetLoadingProgress\x12..milvus.proto.milvus.GetLoadingProgressRequest\x1a/.milvus.proto.milvus.GetLoadingProgressResponse\"\x00\x12\x65\n\x0cGetLoadState\x12(.milvus.proto.milvus.GetLoadStateRequest\x1a).milvus.proto.milvus.GetLoadStateResponse\"\x00\x12U\n\x0b\x43reateAlias\x12\'.milvus.proto.milvus.CreateAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Q\n\tDropAlias\x12%.milvus.proto.milvus.DropAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\nAlterAlias\x12&.milvus.proto.milvus.AlterAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12U\n\x0b\x43reateIndex\x12\'.milvus.proto.milvus.CreateIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rDescribeIndex\x12).milvus.proto.milvus.DescribeIndexRequest\x1a*.milvus.proto.milvus.DescribeIndexResponse\"\x00\x12h\n\rGetIndexState\x12).milvus.proto.milvus.GetIndexStateRequest\x1a*.milvus.proto.milvus.GetIndexStateResponse\"\x00\x12\x80\x01\n\x15GetIndexBuildProgress\x12\x31.milvus.proto.milvus.GetIndexBuildProgressRequest\x1a\x32.milvus.proto.milvus.GetIndexBuildProgressResponse\"\x00\x12Q\n\tDropIndex\x12%.milvus.proto.milvus.DropIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\x06Insert\x12\".milvus.proto.milvus.InsertRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12S\n\x06\x44\x65lete\x12\".milvus.proto.milvus.DeleteRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12R\n\x06Search\x12\".milvus.proto.milvus.SearchRequest\x1a\".milvus.proto.milvus.SearchResults\"\x00\x12P\n\x05\x46lush\x12!.milvus.proto.milvus.FlushRequest\x1a\".milvus.proto.milvus.FlushResponse\"\x00\x12O\n\x05Query\x12!.milvus.proto.milvus.QueryRequest\x1a!.milvus.proto.milvus.QueryResults\"\x00\x12\x64\n\x0c\x43\x61lcDistance\x12(.milvus.proto.milvus.CalcDistanceRequest\x1a(.milvus.proto.milvus.CalcDistanceResults\"\x00\x12Y\n\x08\x46lushAll\x12$.milvus.proto.milvus.FlushAllRequest\x1a%.milvus.proto.milvus.FlushAllResponse\"\x00\x12h\n\rGetFlushState\x12).milvus.proto.milvus.GetFlushStateRequest\x1a*.milvus.proto.milvus.GetFlushStateResponse\"\x00\x12q\n\x10GetFlushAllState\x12,.milvus.proto.milvus.GetFlushAllStateRequest\x1a-.milvus.proto.milvus.GetFlushAllStateResponse\"\x00\x12\x89\x01\n\x18GetPersistentSegmentInfo\x12\x34.milvus.proto.milvus.GetPersistentSegmentInfoRequest\x1a\x35.milvus.proto.milvus.GetPersistentSegmentInfoResponse\"\x00\x12z\n\x13GetQuerySegmentInfo\x12/.milvus.proto.milvus.GetQuerySegmentInfoRequest\x1a\x30.milvus.proto.milvus.GetQuerySegmentInfoResponse\"\x00\x12\x62\n\x0bGetReplicas\x12\'.milvus.proto.milvus.GetReplicasRequest\x1a(.milvus.proto.milvus.GetReplicasResponse\"\x00\x12P\n\x05\x44ummy\x12!.milvus.proto.milvus.DummyRequest\x1a\".milvus.proto.milvus.DummyResponse\"\x00\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00\x12_\n\nGetMetrics\x12&.milvus.proto.milvus.GetMetricsRequest\x1a\'.milvus.proto.milvus.GetMetricsResponse\"\x00\x12l\n\x12GetComponentStates\x12..milvus.proto.milvus.GetComponentStatesRequest\x1a$.milvus.proto.milvus.ComponentStates\"\x00\x12U\n\x0bLoadBalance\x12\'.milvus.proto.milvus.LoadBalanceRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12GetCompactionState\x12..milvus.proto.milvus.GetCompactionStateRequest\x1a/.milvus.proto.milvus.GetCompactionStateResponse\"\x00\x12q\n\x10ManualCompaction\x12,.milvus.proto.milvus.ManualCompactionRequest\x1a-.milvus.proto.milvus.ManualCompactionResponse\"\x00\x12\x80\x01\n\x1bGetCompactionStateWithPlans\x12..milvus.proto.milvus.GetCompactionPlansRequest\x1a/.milvus.proto.milvus.GetCompactionPlansResponse\"\x00\x12S\n\x06Import\x12\".milvus.proto.milvus.ImportRequest\x1a#.milvus.proto.milvus.ImportResponse\"\x00\x12k\n\x0eGetImportState\x12*.milvus.proto.milvus.GetImportStateRequest\x1a+.milvus.proto.milvus.GetImportStateResponse\"\x00\x12n\n\x0fListImportTasks\x12+.milvus.proto.milvus.ListImportTasksRequest\x1a,.milvus.proto.milvus.ListImportTasksResponse\"\x00\x12_\n\x10\x43reateCredential\x12,.milvus.proto.milvus.CreateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10UpdateCredential\x12,.milvus.proto.milvus.UpdateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10\x44\x65leteCredential\x12,.milvus.proto.milvus.DeleteCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rListCredUsers\x12).milvus.proto.milvus.ListCredUsersRequest\x1a*.milvus.proto.milvus.ListCredUsersResponse\"\x00\x12S\n\nCreateRole\x12&.milvus.proto.milvus.CreateRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12O\n\x08\x44ropRole\x12$.milvus.proto.milvus.DropRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fOperateUserRole\x12+.milvus.proto.milvus.OperateUserRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\nSelectRole\x12&.milvus.proto.milvus.SelectRoleRequest\x1a\'.milvus.proto.milvus.SelectRoleResponse\"\x00\x12_\n\nSelectUser\x12&.milvus.proto.milvus.SelectUserRequest\x1a\'.milvus.proto.milvus.SelectUserResponse\"\x00\x12_\n\x10OperatePrivilege\x12,.milvus.proto.milvus.OperatePrivilegeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x62\n\x0bSelectGrant\x12\'.milvus.proto.milvus.SelectGrantRequest\x1a(.milvus.proto.milvus.SelectGrantResponse\"\x00\x12_\n\nGetVersion\x12&.milvus.proto.milvus.GetVersionRequest\x1a\'.milvus.proto.milvus.GetVersionResponse\"\x00\x12\x62\n\x0b\x43heckHealth\x12\'.milvus.proto.milvus.CheckHealthRequest\x1a(.milvus.proto.milvus.CheckHealthResponse\"\x00\x12\x65\n\x13\x43reateResourceGroup\x12/.milvus.proto.milvus.CreateResourceGroupRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11\x44ropResourceGroup\x12-.milvus.proto.milvus.DropResourceGroupRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12W\n\x0cTransferNode\x12(.milvus.proto.milvus.TransferNodeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fTransferReplica\x12+.milvus.proto.milvus.TransferReplicaRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12ListResourceGroups\x12..milvus.proto.milvus.ListResourceGroupsRequest\x1a/.milvus.proto.milvus.ListResourceGroupsResponse\"\x00\x12\x80\x01\n\x15\x44\x65scribeResourceGroup\x12\x31.milvus.proto.milvus.DescribeResourceGroupRequest\x1a\x32.milvus.proto.milvus.DescribeResourceGroupResponse\"\x00\x12_\n\x10RenameCollection\x12,.milvus.proto.milvus.RenameCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12[\n\x0e\x43reateDatabase\x12*.milvus.proto.milvus.CreateDatabaseRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12W\n\x0c\x44ropDatabase\x12(.milvus.proto.milvus.DropDatabaseRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rListDatabases\x12).milvus.proto.milvus.ListDatabasesRequest\x1a*.milvus.proto.milvus.ListDatabasesResponse\"\x00\x12V\n\x07\x43onnect\x12#.milvus.proto.milvus.ConnectRequest\x1a$.milvus.proto.milvus.ConnectResponse\"\x00\x32u\n\x0cProxyService\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00:U\n\x0emilvus_ext_obj\x12\x1c.google.protobuf.FileOptions\x18\xe9\x07 \x01(\x0b\x32\x1e.milvus.proto.milvus.MilvusExtBf\n\x0eio.milvus.grpcB\x0bMilvusProtoP\x01Z1github.com/milvus-io/milvus-proto/go-api/milvuspb\xa0\x01\x01\xaa\x02\x0eIO.Milvus.Grpcb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cmilvus.proto\x12\x13milvus.proto.milvus\x1a\x0c\x63ommon.proto\x1a\x0cschema.proto\x1a google/protobuf/descriptor.proto\"y\n\x12\x43reateAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"^\n\x10\x44ropAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\"x\n\x11\x41lterAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"\xb8\x02\n\x17\x43reateCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0e\n\x06schema\x18\x04 \x01(\x0c\x12\x12\n\nshards_num\x18\x05 \x01(\x05\x12@\n\x11\x63onsistency_level\x18\x06 \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x35\n\nproperties\x18\x07 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x16\n\x0enum_partitions\x18\x08 \x01(\x03:\x12\xca>\x0f\x08\x01\x10\x01\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x81\x01\n\x15\x44ropCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x02\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xcf\x01\n\x16\x41lterCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x35\n\nproperties\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair:\x12\xca>\x0f\x08\x01\x10\x01\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x80\x01\n\x14HasCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\ntime_stamp\x18\x04 \x01(\x04\"J\n\x0c\x42oolResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\x08\"L\n\x0eStringResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\t\"\xaf\x01\n\x19\x44\x65scribeCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x12\n\ntime_stamp\x18\x05 \x01(\x04:\x12\xca>\x0f\x08\x01\x10\x03\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xaa\x04\n\x1a\x44\x65scribeCollectionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x35\n\x06schema\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.CollectionSchema\x12\x14\n\x0c\x63ollectionID\x18\x03 \x01(\x03\x12\x1d\n\x15virtual_channel_names\x18\x04 \x03(\t\x12\x1e\n\x16physical_channel_names\x18\x05 \x03(\t\x12\x19\n\x11\x63reated_timestamp\x18\x06 \x01(\x04\x12\x1d\n\x15\x63reated_utc_timestamp\x18\x07 \x01(\x04\x12\x12\n\nshards_num\x18\x08 \x01(\x05\x12\x0f\n\x07\x61liases\x18\t \x03(\t\x12\x39\n\x0fstart_positions\x18\n \x03(\x0b\x32 .milvus.proto.common.KeyDataPair\x12@\n\x11\x63onsistency_level\x18\x0b \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x17\n\x0f\x63ollection_name\x18\x0c \x01(\t\x12\x35\n\nproperties\x18\r \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x0f\n\x07\x64\x62_name\x18\x0e \x01(\t\x12\x16\n\x0enum_partitions\x18\x0f \x01(\x03\"\xb8\x01\n\x15LoadCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0ereplica_number\x18\x04 \x01(\x05\x12\x17\n\x0fresource_groups\x18\x05 \x03(\t\x12\x0f\n\x07refresh\x18\x06 \x01(\x08:\x07\xca>\x04\x10\x05\x18\x03\"y\n\x18ReleaseCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x06\x18\x03\"\xab\x01\n\x14GetStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x1b\n\x13guarantee_timestamp\x18\x05 \x01(\x04:\x07\xca>\x04\x10\n\x18\x03\"v\n\x15GetStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\x7f\n\x1eGetCollectionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\n\x18\x03\"\x80\x01\n\x1fGetCollectionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc4\x01\n\x16ShowCollectionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x12\n\ntime_stamp\x18\x03 \x01(\x04\x12+\n\x04type\x18\x04 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\x12\x18\n\x10\x63ollection_names\x18\x05 \x03(\t:\x12\xca>\x0f\x08\x01\x10\x04\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xf3\x01\n\x17ShowCollectionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x18\n\x10\x63ollection_names\x18\x02 \x03(\t\x12\x16\n\x0e\x63ollection_ids\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\x12\x1f\n\x17query_service_available\x18\x07 \x03(\x08\"\x86\x01\n\x16\x43reatePartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x84\x01\n\x14\x44ropPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x83\x01\n\x13HasPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\xc8\x01\n\x15LoadPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x16\n\x0ereplica_number\x18\x05 \x01(\x05\x12\x17\n\x0fresource_groups\x18\x06 \x03(\t\x12\x0f\n\x07refresh\x18\x07 \x01(\x08\"\x89\x01\n\x18ReleasePartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x8d\x01\n\x1dGetPartitionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x7f\n\x1eGetPartitionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc9\x01\n\x15ShowPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x17\n\x0fpartition_names\x18\x05 \x03(\t\x12+\n\x04type\x18\x06 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\"\xce\x01\n\x16ShowPartitionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fpartition_names\x18\x02 \x03(\t\x12\x14\n\x0cpartitionIDs\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\"m\n\x16\x44\x65scribeSegmentRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x11\n\tsegmentID\x18\x03 \x01(\x03\"\x8f\x01\n\x17\x44\x65scribeSegmentResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x0f\n\x07\x62uildID\x18\x03 \x01(\x03\x12\x14\n\x0c\x65nable_index\x18\x04 \x01(\x08\x12\x0f\n\x07\x66ieldID\x18\x05 \x01(\x03\"l\n\x13ShowSegmentsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\"W\n\x14ShowSegmentsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x12\n\nsegmentIDs\x18\x02 \x03(\x03\"\xd4\x01\n\x12\x43reateIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x37\n\x0c\x65xtra_params\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nindex_name\x18\x06 \x01(\t:\x07\xca>\x04\x10\x0b\x18\x03\"\x9d\x01\n\x14\x44\x65scribeIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\xf9\x01\n\x10IndexDescription\x12\x12\n\nindex_name\x18\x01 \x01(\t\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x31\n\x06params\x18\x03 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x14\n\x0cindexed_rows\x18\x05 \x01(\x03\x12\x12\n\ntotal_rows\x18\x06 \x01(\x03\x12.\n\x05state\x18\x07 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x1f\n\x17index_state_fail_reason\x18\x08 \x01(\t\"\x87\x01\n\x15\x44\x65scribeIndexResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"\xa5\x01\n\x1cGetIndexBuildProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"v\n\x1dGetIndexBuildProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0cindexed_rows\x18\x02 \x01(\x03\x12\x12\n\ntotal_rows\x18\x03 \x01(\x03\"\x9d\x01\n\x14GetIndexStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\x89\x01\n\x15GetIndexStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12.\n\x05state\x18\x02 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x13\n\x0b\x66\x61il_reason\x18\x03 \x01(\t\"\x99\x01\n\x10\x44ropIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\r\x18\x03\"\xe0\x01\n\rInsertRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x33\n\x0b\x66ields_data\x18\x05 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x11\n\thash_keys\x18\x06 \x03(\r\x12\x10\n\x08num_rows\x18\x07 \x01(\r:\x07\xca>\x04\x10\x08\x18\x03\"\xf0\x01\n\x0eMutationResult\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12%\n\x03IDs\x18\x02 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x12\n\nsucc_index\x18\x03 \x03(\r\x12\x11\n\terr_index\x18\x04 \x03(\r\x12\x14\n\x0c\x61\x63knowledged\x18\x05 \x01(\x08\x12\x12\n\ninsert_cnt\x18\x06 \x01(\x03\x12\x12\n\ndelete_cnt\x18\x07 \x01(\x03\x12\x12\n\nupsert_cnt\x18\x08 \x01(\x03\x12\x11\n\ttimestamp\x18\t \x01(\x04\"\xa7\x01\n\rDeleteRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x05 \x01(\t\x12\x11\n\thash_keys\x18\x06 \x03(\r:\x07\xca>\x04\x10\t\x18\x03\"\xf3\x03\n\rSearchRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x0b\n\x03\x64sl\x18\x05 \x01(\t\x12\x19\n\x11placeholder_group\x18\x06 \x01(\x0c\x12.\n\x08\x64sl_type\x18\x07 \x01(\x0e\x32\x1c.milvus.proto.common.DslType\x12\x15\n\routput_fields\x18\x08 \x03(\t\x12\x38\n\rsearch_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x18\n\x10travel_timestamp\x18\n \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x0b \x01(\x04\x12\n\n\x02nq\x18\x0c \x01(\x03\x12\x1b\n\x13not_return_all_meta\x18\r \x01(\x08\x12@\n\x11\x63onsistency_level\x18\x0e \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x1f\n\x17use_default_consistency\x18\x0f \x01(\x08:\x07\xca>\x04\x10\x0e\x18\x03\"5\n\x04Hits\x12\x0b\n\x03IDs\x18\x01 \x03(\x03\x12\x10\n\x08row_data\x18\x02 \x03(\x0c\x12\x0e\n\x06scores\x18\x03 \x03(\x02\"\x8d\x01\n\rSearchResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x36\n\x07results\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.SearchResultData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"n\n\x0c\x46lushRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x18\n\x10\x63ollection_names\x18\x03 \x03(\t:\x07\xca>\x04\x10\x0f \x03\"\x9b\x04\n\rFlushResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12G\n\x0b\x63oll_segIDs\x18\x03 \x03(\x0b\x32\x32.milvus.proto.milvus.FlushResponse.CollSegIDsEntry\x12R\n\x11\x66lush_coll_segIDs\x18\x04 \x03(\x0b\x32\x37.milvus.proto.milvus.FlushResponse.FlushCollSegIDsEntry\x12N\n\x0f\x63oll_seal_times\x18\x05 \x03(\x0b\x32\x35.milvus.proto.milvus.FlushResponse.CollSealTimesEntry\x1aQ\n\x0f\x43ollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\x1aV\n\x14\x46lushCollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\x1a\x34\n\x12\x43ollSealTimesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\"\x9b\x03\n\x0cQueryRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x04 \x01(\t\x12\x15\n\routput_fields\x18\x05 \x03(\t\x12\x17\n\x0fpartition_names\x18\x06 \x03(\t\x12\x18\n\x10travel_timestamp\x18\x07 \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x08 \x01(\x04\x12\x37\n\x0cquery_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x1b\n\x13not_return_all_meta\x18\n \x01(\x08\x12@\n\x11\x63onsistency_level\x18\x0b \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x1f\n\x17use_default_consistency\x18\x0c \x01(\x08:\x07\xca>\x04\x10\x10\x18\x03\"\xa0\x01\n\x0cQueryResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x0b\x66ields_data\x18\x02 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x15\n\routput_fields\x18\x04 \x03(\t\"}\n\tVectorIDs\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12*\n\x08id_array\x18\x03 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x83\x01\n\x0cVectorsArray\x12\x32\n\x08id_array\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.milvus.VectorIDsH\x00\x12\x36\n\ndata_array\x18\x02 \x01(\x0b\x32 .milvus.proto.schema.VectorFieldH\x00\x42\x07\n\x05\x61rray\"\xdd\x01\n\x13\x43\x61lcDistanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x32\n\x07op_left\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x33\n\x08op_right\x18\x03 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x31\n\x06params\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb5\x01\n\x13\x43\x61lcDistanceResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x31\n\x08int_dist\x18\x02 \x01(\x0b\x32\x1d.milvus.proto.schema.IntArrayH\x00\x12\x35\n\nfloat_dist\x18\x03 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x42\x07\n\x05\x61rray\"\x11\n\x0f\x46lushAllRequest\"U\n\x10\x46lushAllResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x66lush_all_ts\x18\x02 \x01(\x04\"\x99\x01\n\x15PersistentSegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08num_rows\x18\x04 \x01(\x03\x12\x30\n\x05state\x18\x05 \x01(\x0e\x32!.milvus.proto.common.SegmentState\"u\n\x1fGetPersistentSegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x8a\x01\n GetPersistentSegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x39\n\x05infos\x18\x02 \x03(\x0b\x32*.milvus.proto.milvus.PersistentSegmentInfo\"\xec\x01\n\x10QuerySegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08mem_size\x18\x04 \x01(\x03\x12\x10\n\x08num_rows\x18\x05 \x01(\x03\x12\x12\n\nindex_name\x18\x06 \x01(\t\x12\x0f\n\x07indexID\x18\x07 \x01(\x03\x12\x0e\n\x06nodeID\x18\x08 \x01(\x03\x12\x30\n\x05state\x18\t \x01(\x0e\x32!.milvus.proto.common.SegmentState\x12\x0f\n\x07nodeIds\x18\n \x03(\x03\"p\n\x1aGetQuerySegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x80\x01\n\x1bGetQuerySegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x05infos\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.QuerySegmentInfo\"$\n\x0c\x44ummyRequest\x12\x14\n\x0crequest_type\x18\x01 \x01(\t\"!\n\rDummyResponse\x12\x10\n\x08response\x18\x01 \x01(\t\"\x15\n\x13RegisterLinkRequest\"r\n\x14RegisterLinkResponse\x12-\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.Address\x12+\n\x06status\x18\x02 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"P\n\x11GetMetricsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07request\x18\x02 \x01(\t\"k\n\x12GetMetricsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08response\x18\x02 \x01(\t\x12\x16\n\x0e\x63omponent_name\x18\x03 \x01(\t\"\x98\x01\n\rComponentInfo\x12\x0e\n\x06nodeID\x18\x01 \x01(\x03\x12\x0c\n\x04role\x18\x02 \x01(\t\x12\x32\n\nstate_code\x18\x03 \x01(\x0e\x32\x1e.milvus.proto.common.StateCode\x12\x35\n\nextra_info\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb2\x01\n\x0f\x43omponentStates\x12\x31\n\x05state\x18\x01 \x01(\x0b\x32\".milvus.proto.milvus.ComponentInfo\x12?\n\x13subcomponent_states\x18\x02 \x03(\x0b\x32\".milvus.proto.milvus.ComponentInfo\x12+\n\x06status\x18\x03 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"\x1b\n\x19GetComponentStatesRequest\"\xb6\x01\n\x12LoadBalanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x12\n\nsrc_nodeID\x18\x02 \x01(\x03\x12\x13\n\x0b\x64st_nodeIDs\x18\x03 \x03(\x03\x12\x19\n\x11sealed_segmentIDs\x18\x04 \x03(\x03\x12\x16\n\x0e\x63ollectionName\x18\x05 \x01(\t\x12\x0f\n\x07\x64\x62_name\x18\x06 \x01(\t:\x07\xca>\x04\x10\x11\x18\x05\"L\n\x17ManualCompactionRequest\x12\x14\n\x0c\x63ollectionID\x18\x01 \x01(\x03\x12\x12\n\ntimetravel\x18\x02 \x01(\x04:\x07\xca>\x04\x10\x07\x18\x01\"]\n\x18ManualCompactionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x63ompactionID\x18\x02 \x01(\x03\"1\n\x19GetCompactionStateRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xdd\x01\n\x1aGetCompactionStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12\x17\n\x0f\x65xecutingPlanNo\x18\x03 \x01(\x03\x12\x15\n\rtimeoutPlanNo\x18\x04 \x01(\x03\x12\x17\n\x0f\x63ompletedPlanNo\x18\x05 \x01(\x03\x12\x14\n\x0c\x66\x61iledPlanNo\x18\x06 \x01(\x03\"1\n\x19GetCompactionPlansRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xbc\x01\n\x1aGetCompactionPlansResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12<\n\nmergeInfos\x18\x03 \x03(\x0b\x32(.milvus.proto.milvus.CompactionMergeInfo\"6\n\x13\x43ompactionMergeInfo\x12\x0f\n\x07sources\x18\x01 \x03(\x03\x12\x0e\n\x06target\x18\x02 \x01(\x03\"*\n\x14GetFlushStateRequest\x12\x12\n\nsegmentIDs\x18\x01 \x03(\x03\"U\n\x15GetFlushStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"[\n\x17GetFlushAllStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x66lush_all_ts\x18\x02 \x01(\x04\"X\n\x18GetFlushAllStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"\xc7\x01\n\rImportRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x16\n\x0epartition_name\x18\x02 \x01(\t\x12\x15\n\rchannel_names\x18\x03 \x03(\t\x12\x11\n\trow_based\x18\x04 \x01(\x08\x12\r\n\x05\x66iles\x18\x05 \x03(\t\x12\x32\n\x07options\x18\x06 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x0f\n\x07\x64\x62_name\x18\x07 \x01(\t:\x07\xca>\x04\x10\x12\x18\x01\"L\n\x0eImportResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05tasks\x18\x02 \x03(\x03\"%\n\x15GetImportStateRequest\x12\x0c\n\x04task\x18\x01 \x01(\x03\"\x97\x02\n\x16GetImportStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12/\n\x05state\x18\x02 \x01(\x0e\x32 .milvus.proto.common.ImportState\x12\x11\n\trow_count\x18\x03 \x01(\x03\x12\x0f\n\x07id_list\x18\x04 \x03(\x03\x12\x30\n\x05infos\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\n\n\x02id\x18\x06 \x01(\x03\x12\x15\n\rcollection_id\x18\x07 \x01(\x03\x12\x13\n\x0bsegment_ids\x18\x08 \x03(\x03\x12\x11\n\tcreate_ts\x18\t \x01(\x03\"Q\n\x16ListImportTasksRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\r\n\x05limit\x18\x02 \x01(\x03\x12\x0f\n\x07\x64\x62_name\x18\x03 \x01(\t\"\x82\x01\n\x17ListImportTasksResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x05tasks\x18\x02 \x03(\x0b\x32+.milvus.proto.milvus.GetImportStateResponse\"\x9a\x01\n\x12GetReplicasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x18\n\x10with_shard_nodes\x18\x03 \x01(\x08\x12\x17\n\x0f\x63ollection_name\x18\x04 \x01(\t\x12\x0f\n\x07\x64\x62_name\x18\x05 \x01(\t\"v\n\x13GetReplicasResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08replicas\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.ReplicaInfo\"\xc1\x02\n\x0bReplicaInfo\x12\x11\n\treplicaID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x15\n\rpartition_ids\x18\x03 \x03(\x03\x12\x39\n\x0eshard_replicas\x18\x04 \x03(\x0b\x32!.milvus.proto.milvus.ShardReplica\x12\x10\n\x08node_ids\x18\x05 \x03(\x03\x12\x1b\n\x13resource_group_name\x18\x06 \x01(\t\x12P\n\x11num_outbound_node\x18\x07 \x03(\x0b\x32\x35.milvus.proto.milvus.ReplicaInfo.NumOutboundNodeEntry\x1a\x36\n\x14NumOutboundNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"`\n\x0cShardReplica\x12\x10\n\x08leaderID\x18\x01 \x01(\x03\x12\x13\n\x0bleader_addr\x18\x02 \x01(\t\x12\x17\n\x0f\x64m_channel_name\x18\x03 \x01(\t\x12\x10\n\x08node_ids\x18\x04 \x03(\x03\"\xbe\x01\n\x17\x43reateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x10\n\x08password\x18\x03 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x04 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x05 \x01(\x04:\x12\xca>\x0f\x08\x01\x10\x13\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xcd\x01\n\x17UpdateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boldPassword\x18\x03 \x01(\t\x12\x13\n\x0bnewPassword\x18\x04 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x06 \x01(\x04:\t\xca>\x06\x08\x02\x10\x14\x18\x02\"k\n\x17\x44\x65leteCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x15\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"W\n\x15ListCredUsersResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tusernames\x18\x02 \x03(\t\"V\n\x14ListCredUsersRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x1a\n\nRoleEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1a\n\nUserEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x84\x01\n\x11\x43reateRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12/\n\x06\x65ntity\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity:\x12\xca>\x0f\x08\x01\x10\x13\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"d\n\x0f\x44ropRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\trole_name\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x15\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xb5\x01\n\x16OperateUserRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x11\n\trole_name\x18\x03 \x01(\t\x12\x36\n\x04type\x18\x04 \x01(\x0e\x32(.milvus.proto.milvus.OperateUserRoleType:\x12\xca>\x0f\x08\x01\x10\x17\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x9d\x01\n\x11SelectRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04role\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x19\n\x11include_user_info\x18\x03 \x01(\x08:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"k\n\nRoleResult\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12.\n\x05users\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\"s\n\x12SelectRoleResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleResult\"\x94\x01\n\x11SelectUserRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04user\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x19\n\x11include_role_info\x18\x03 \x01(\x08:\t\xca>\x06\x08\x02\x10\x18\x18\x02\"k\n\nUserResult\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12.\n\x05roles\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\"s\n\x12SelectUserResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserResult\"\x1c\n\x0cObjectEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1f\n\x0fPrivilegeEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"w\n\rGrantorEntity\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x37\n\tprivilege\x18\x02 \x01(\x0b\x32$.milvus.proto.milvus.PrivilegeEntity\"L\n\x14GrantPrivilegeEntity\x12\x34\n\x08\x65ntities\x18\x01 \x03(\x0b\x32\".milvus.proto.milvus.GrantorEntity\"\xca\x01\n\x0bGrantEntity\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x31\n\x06object\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.ObjectEntity\x12\x13\n\x0bobject_name\x18\x03 \x01(\t\x12\x33\n\x07grantor\x18\x04 \x01(\x0b\x32\".milvus.proto.milvus.GrantorEntity\x12\x0f\n\x07\x64\x62_name\x18\x05 \x01(\t\"\x86\x01\n\x12SelectGrantRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"v\n\x13SelectGrantResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08\x65ntities\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.GrantEntity\"\xc4\x01\n\x17OperatePrivilegeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity\x12\x37\n\x04type\x18\x03 \x01(\x0e\x32).milvus.proto.milvus.OperatePrivilegeType:\x12\xca>\x0f\x08\x01\x10\x17\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x93\x01\n\x19GetLoadingProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x17\n\x0f\x63ollection_name\x18\x02 \x01(\t\x12\x17\n\x0fpartition_names\x18\x03 \x03(\t\x12\x0f\n\x07\x64\x62_name\x18\x04 \x01(\t:\x07\xca>\x04\x10 \x18\x02\"[\n\x1aGetLoadingProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08progress\x18\x02 \x01(\x03\"\x8d\x01\n\x13GetLoadStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x17\n\x0f\x63ollection_name\x18\x02 \x01(\t\x12\x17\n\x0fpartition_names\x18\x03 \x03(\t\x12\x0f\n\x07\x64\x62_name\x18\x04 \x01(\t:\x07\xca>\x04\x10!\x18\x02\"r\n\x14GetLoadStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12-\n\x05state\x18\x02 \x01(\x0e\x32\x1e.milvus.proto.common.LoadState\"\x1c\n\tMilvusExt\x12\x0f\n\x07version\x18\x01 \x01(\t\"\x13\n\x11GetVersionRequest\"R\n\x12GetVersionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07version\x18\x02 \x01(\t\"\x14\n\x12\x43heckHealthRequest\"\x9d\x01\n\x13\x43heckHealthResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tisHealthy\x18\x02 \x01(\x08\x12\x0f\n\x07reasons\x18\x03 \x03(\t\x12\x35\n\x0cquota_states\x18\x04 \x03(\x0e\x32\x1f.milvus.proto.milvus.QuotaState\"t\n\x1a\x43reateResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1a\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"r\n\x18\x44ropResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1b\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xa5\x01\n\x13TransferNodeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x1d\n\x15source_resource_group\x18\x02 \x01(\t\x12\x1d\n\x15target_resource_group\x18\x03 \x01(\t\x12\x10\n\x08num_node\x18\x04 \x01(\x05:\x12\xca>\x0f\x08\x01\x10\x1e\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xd5\x01\n\x16TransferReplicaRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x1d\n\x15source_resource_group\x18\x02 \x01(\t\x12\x1d\n\x15target_resource_group\x18\x03 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x04 \x01(\t\x12\x13\n\x0bnum_replica\x18\x05 \x01(\x03\x12\x0f\n\x07\x64\x62_name\x18\x06 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1f\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"[\n\x19ListResourceGroupsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10\x1d\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"b\n\x1aListResourceGroupsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fresource_groups\x18\x02 \x03(\t\"v\n\x1c\x44\x65scribeResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1c\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x88\x01\n\x1d\x44\x65scribeResourceGroupResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x0eresource_group\x18\x02 \x01(\x0b\x32\".milvus.proto.milvus.ResourceGroup\"\xf2\x03\n\rResourceGroup\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x63\x61pacity\x18\x02 \x01(\x05\x12\x1a\n\x12num_available_node\x18\x03 \x01(\x05\x12T\n\x12num_loaded_replica\x18\x04 \x03(\x0b\x32\x38.milvus.proto.milvus.ResourceGroup.NumLoadedReplicaEntry\x12R\n\x11num_outgoing_node\x18\x05 \x03(\x0b\x32\x37.milvus.proto.milvus.ResourceGroup.NumOutgoingNodeEntry\x12R\n\x11num_incoming_node\x18\x06 \x03(\x0b\x32\x37.milvus.proto.milvus.ResourceGroup.NumIncomingNodeEntry\x1a\x37\n\x15NumLoadedReplicaEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x36\n\x14NumOutgoingNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x36\n\x14NumIncomingNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"\x8c\x01\n\x17RenameCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x0f\n\x07oldName\x18\x03 \x01(\t\x12\x0f\n\x07newName\x18\x04 \x01(\t:\x12\xca>\x0f\x08\x01\x10\"\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"h\n\x15\x43reateDatabaseRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10#\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"f\n\x13\x44ropDatabaseRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10$\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"V\n\x14ListDatabasesRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10%\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"j\n\x15ListDatabasesResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08\x64\x62_names\x18\x02 \x03(\t:\x12\xca>\x0f\x08\x01\x10\x04\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x8e\x01\n\x19GetIndexStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nindex_name\x18\x04 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\x8c\x01\n\x1aGetIndexStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"r\n\x0e\x43onnectRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x34\n\x0b\x63lient_info\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.common.ClientInfo\"\x88\x01\n\x0f\x43onnectResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x0bserver_info\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.common.ServerInfo\x12\x12\n\nidentifier\x18\x03 \x01(\x03*!\n\x08ShowType\x12\x07\n\x03\x41ll\x10\x00\x12\x0c\n\x08InMemory\x10\x01*@\n\x13OperateUserRoleType\x12\x11\n\rAddUserToRole\x10\x00\x12\x16\n\x12RemoveUserFromRole\x10\x01*-\n\x14OperatePrivilegeType\x12\t\n\x05Grant\x10\x00\x12\n\n\x06Revoke\x10\x01*]\n\nQuotaState\x12\x0b\n\x07Unknown\x10\x00\x12\x0f\n\x0bReadLimited\x10\x02\x12\x10\n\x0cWriteLimited\x10\x03\x12\x0e\n\nDenyToRead\x10\x04\x12\x0f\n\x0b\x44\x65nyToWrite\x10\x05\x32\xc4:\n\rMilvusService\x12_\n\x10\x43reateCollection\x12,.milvus.proto.milvus.CreateCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12[\n\x0e\x44ropCollection\x12*.milvus.proto.milvus.DropCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\rHasCollection\x12).milvus.proto.milvus.HasCollectionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadCollection\x12*.milvus.proto.milvus.LoadCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleaseCollection\x12-.milvus.proto.milvus.ReleaseCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12\x44\x65scribeCollection\x12..milvus.proto.milvus.DescribeCollectionRequest\x1a/.milvus.proto.milvus.DescribeCollectionResponse\"\x00\x12\x86\x01\n\x17GetCollectionStatistics\x12\x33.milvus.proto.milvus.GetCollectionStatisticsRequest\x1a\x34.milvus.proto.milvus.GetCollectionStatisticsResponse\"\x00\x12n\n\x0fShowCollections\x12+.milvus.proto.milvus.ShowCollectionsRequest\x1a,.milvus.proto.milvus.ShowCollectionsResponse\"\x00\x12]\n\x0f\x41lterCollection\x12+.milvus.proto.milvus.AlterCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0f\x43reatePartition\x12+.milvus.proto.milvus.CreatePartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Y\n\rDropPartition\x12).milvus.proto.milvus.DropPartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0cHasPartition\x12(.milvus.proto.milvus.HasPartitionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadPartitions\x12*.milvus.proto.milvus.LoadPartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleasePartitions\x12-.milvus.proto.milvus.ReleasePartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x83\x01\n\x16GetPartitionStatistics\x12\x32.milvus.proto.milvus.GetPartitionStatisticsRequest\x1a\x33.milvus.proto.milvus.GetPartitionStatisticsResponse\"\x00\x12k\n\x0eShowPartitions\x12*.milvus.proto.milvus.ShowPartitionsRequest\x1a+.milvus.proto.milvus.ShowPartitionsResponse\"\x00\x12w\n\x12GetLoadingProgress\x12..milvus.proto.milvus.GetLoadingProgressRequest\x1a/.milvus.proto.milvus.GetLoadingProgressResponse\"\x00\x12\x65\n\x0cGetLoadState\x12(.milvus.proto.milvus.GetLoadStateRequest\x1a).milvus.proto.milvus.GetLoadStateResponse\"\x00\x12U\n\x0b\x43reateAlias\x12\'.milvus.proto.milvus.CreateAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Q\n\tDropAlias\x12%.milvus.proto.milvus.DropAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\nAlterAlias\x12&.milvus.proto.milvus.AlterAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12U\n\x0b\x43reateIndex\x12\'.milvus.proto.milvus.CreateIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rDescribeIndex\x12).milvus.proto.milvus.DescribeIndexRequest\x1a*.milvus.proto.milvus.DescribeIndexResponse\"\x00\x12w\n\x12GetIndexStatistics\x12..milvus.proto.milvus.GetIndexStatisticsRequest\x1a/.milvus.proto.milvus.GetIndexStatisticsResponse\"\x00\x12h\n\rGetIndexState\x12).milvus.proto.milvus.GetIndexStateRequest\x1a*.milvus.proto.milvus.GetIndexStateResponse\"\x00\x12\x80\x01\n\x15GetIndexBuildProgress\x12\x31.milvus.proto.milvus.GetIndexBuildProgressRequest\x1a\x32.milvus.proto.milvus.GetIndexBuildProgressResponse\"\x00\x12Q\n\tDropIndex\x12%.milvus.proto.milvus.DropIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\x06Insert\x12\".milvus.proto.milvus.InsertRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12S\n\x06\x44\x65lete\x12\".milvus.proto.milvus.DeleteRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12R\n\x06Search\x12\".milvus.proto.milvus.SearchRequest\x1a\".milvus.proto.milvus.SearchResults\"\x00\x12P\n\x05\x46lush\x12!.milvus.proto.milvus.FlushRequest\x1a\".milvus.proto.milvus.FlushResponse\"\x00\x12O\n\x05Query\x12!.milvus.proto.milvus.QueryRequest\x1a!.milvus.proto.milvus.QueryResults\"\x00\x12\x64\n\x0c\x43\x61lcDistance\x12(.milvus.proto.milvus.CalcDistanceRequest\x1a(.milvus.proto.milvus.CalcDistanceResults\"\x00\x12Y\n\x08\x46lushAll\x12$.milvus.proto.milvus.FlushAllRequest\x1a%.milvus.proto.milvus.FlushAllResponse\"\x00\x12h\n\rGetFlushState\x12).milvus.proto.milvus.GetFlushStateRequest\x1a*.milvus.proto.milvus.GetFlushStateResponse\"\x00\x12q\n\x10GetFlushAllState\x12,.milvus.proto.milvus.GetFlushAllStateRequest\x1a-.milvus.proto.milvus.GetFlushAllStateResponse\"\x00\x12\x89\x01\n\x18GetPersistentSegmentInfo\x12\x34.milvus.proto.milvus.GetPersistentSegmentInfoRequest\x1a\x35.milvus.proto.milvus.GetPersistentSegmentInfoResponse\"\x00\x12z\n\x13GetQuerySegmentInfo\x12/.milvus.proto.milvus.GetQuerySegmentInfoRequest\x1a\x30.milvus.proto.milvus.GetQuerySegmentInfoResponse\"\x00\x12\x62\n\x0bGetReplicas\x12\'.milvus.proto.milvus.GetReplicasRequest\x1a(.milvus.proto.milvus.GetReplicasResponse\"\x00\x12P\n\x05\x44ummy\x12!.milvus.proto.milvus.DummyRequest\x1a\".milvus.proto.milvus.DummyResponse\"\x00\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00\x12_\n\nGetMetrics\x12&.milvus.proto.milvus.GetMetricsRequest\x1a\'.milvus.proto.milvus.GetMetricsResponse\"\x00\x12l\n\x12GetComponentStates\x12..milvus.proto.milvus.GetComponentStatesRequest\x1a$.milvus.proto.milvus.ComponentStates\"\x00\x12U\n\x0bLoadBalance\x12\'.milvus.proto.milvus.LoadBalanceRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12GetCompactionState\x12..milvus.proto.milvus.GetCompactionStateRequest\x1a/.milvus.proto.milvus.GetCompactionStateResponse\"\x00\x12q\n\x10ManualCompaction\x12,.milvus.proto.milvus.ManualCompactionRequest\x1a-.milvus.proto.milvus.ManualCompactionResponse\"\x00\x12\x80\x01\n\x1bGetCompactionStateWithPlans\x12..milvus.proto.milvus.GetCompactionPlansRequest\x1a/.milvus.proto.milvus.GetCompactionPlansResponse\"\x00\x12S\n\x06Import\x12\".milvus.proto.milvus.ImportRequest\x1a#.milvus.proto.milvus.ImportResponse\"\x00\x12k\n\x0eGetImportState\x12*.milvus.proto.milvus.GetImportStateRequest\x1a+.milvus.proto.milvus.GetImportStateResponse\"\x00\x12n\n\x0fListImportTasks\x12+.milvus.proto.milvus.ListImportTasksRequest\x1a,.milvus.proto.milvus.ListImportTasksResponse\"\x00\x12_\n\x10\x43reateCredential\x12,.milvus.proto.milvus.CreateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10UpdateCredential\x12,.milvus.proto.milvus.UpdateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10\x44\x65leteCredential\x12,.milvus.proto.milvus.DeleteCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rListCredUsers\x12).milvus.proto.milvus.ListCredUsersRequest\x1a*.milvus.proto.milvus.ListCredUsersResponse\"\x00\x12S\n\nCreateRole\x12&.milvus.proto.milvus.CreateRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12O\n\x08\x44ropRole\x12$.milvus.proto.milvus.DropRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fOperateUserRole\x12+.milvus.proto.milvus.OperateUserRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\nSelectRole\x12&.milvus.proto.milvus.SelectRoleRequest\x1a\'.milvus.proto.milvus.SelectRoleResponse\"\x00\x12_\n\nSelectUser\x12&.milvus.proto.milvus.SelectUserRequest\x1a\'.milvus.proto.milvus.SelectUserResponse\"\x00\x12_\n\x10OperatePrivilege\x12,.milvus.proto.milvus.OperatePrivilegeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x62\n\x0bSelectGrant\x12\'.milvus.proto.milvus.SelectGrantRequest\x1a(.milvus.proto.milvus.SelectGrantResponse\"\x00\x12_\n\nGetVersion\x12&.milvus.proto.milvus.GetVersionRequest\x1a\'.milvus.proto.milvus.GetVersionResponse\"\x00\x12\x62\n\x0b\x43heckHealth\x12\'.milvus.proto.milvus.CheckHealthRequest\x1a(.milvus.proto.milvus.CheckHealthResponse\"\x00\x12\x65\n\x13\x43reateResourceGroup\x12/.milvus.proto.milvus.CreateResourceGroupRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11\x44ropResourceGroup\x12-.milvus.proto.milvus.DropResourceGroupRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12W\n\x0cTransferNode\x12(.milvus.proto.milvus.TransferNodeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fTransferReplica\x12+.milvus.proto.milvus.TransferReplicaRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12ListResourceGroups\x12..milvus.proto.milvus.ListResourceGroupsRequest\x1a/.milvus.proto.milvus.ListResourceGroupsResponse\"\x00\x12\x80\x01\n\x15\x44\x65scribeResourceGroup\x12\x31.milvus.proto.milvus.DescribeResourceGroupRequest\x1a\x32.milvus.proto.milvus.DescribeResourceGroupResponse\"\x00\x12_\n\x10RenameCollection\x12,.milvus.proto.milvus.RenameCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12[\n\x0e\x43reateDatabase\x12*.milvus.proto.milvus.CreateDatabaseRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12W\n\x0c\x44ropDatabase\x12(.milvus.proto.milvus.DropDatabaseRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rListDatabases\x12).milvus.proto.milvus.ListDatabasesRequest\x1a*.milvus.proto.milvus.ListDatabasesResponse\"\x00\x12V\n\x07\x43onnect\x12#.milvus.proto.milvus.ConnectRequest\x1a$.milvus.proto.milvus.ConnectResponse\"\x00\x32u\n\x0cProxyService\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00:U\n\x0emilvus_ext_obj\x12\x1c.google.protobuf.FileOptions\x18\xe9\x07 \x01(\x0b\x32\x1e.milvus.proto.milvus.MilvusExtBf\n\x0eio.milvus.grpcB\x0bMilvusProtoP\x01Z1github.com/milvus-io/milvus-proto/go-api/milvuspb\xa0\x01\x01\xaa\x02\x0eIO.Milvus.Grpcb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'milvus_pb2', globals()) @@ -131,14 +131,16 @@ _LISTDATABASESREQUEST._serialized_options = b'\312>\017\010\001\020%\030\377\377\377\377\377\377\377\377\377\001' _LISTDATABASESRESPONSE._options = None _LISTDATABASESRESPONSE._serialized_options = b'\312>\017\010\001\020\004\030\377\377\377\377\377\377\377\377\377\001' - _SHOWTYPE._serialized_start=20449 - _SHOWTYPE._serialized_end=20482 - _OPERATEUSERROLETYPE._serialized_start=20484 - _OPERATEUSERROLETYPE._serialized_end=20548 - _OPERATEPRIVILEGETYPE._serialized_start=20550 - _OPERATEPRIVILEGETYPE._serialized_end=20595 - _QUOTASTATE._serialized_start=20597 - _QUOTASTATE._serialized_end=20690 + _GETINDEXSTATISTICSREQUEST._options = None + _GETINDEXSTATISTICSREQUEST._serialized_options = b'\312>\004\020\014\030\003' + _SHOWTYPE._serialized_start=20935 + _SHOWTYPE._serialized_end=20968 + _OPERATEUSERROLETYPE._serialized_start=20970 + _OPERATEUSERROLETYPE._serialized_end=21034 + _OPERATEPRIVILEGETYPE._serialized_start=21036 + _OPERATEPRIVILEGETYPE._serialized_end=21081 + _QUOTASTATE._serialized_start=21083 + _QUOTASTATE._serialized_end=21176 _CREATEALIASREQUEST._serialized_start=99 _CREATEALIASREQUEST._serialized_end=220 _DROPALIASREQUEST._serialized_start=222 @@ -228,219 +230,223 @@ _DELETEREQUEST._serialized_start=7297 _DELETEREQUEST._serialized_end=7464 _SEARCHREQUEST._serialized_start=7467 - _SEARCHREQUEST._serialized_end=7867 - _HITS._serialized_start=7869 - _HITS._serialized_end=7922 - _SEARCHRESULTS._serialized_start=7925 - _SEARCHRESULTS._serialized_end=8066 - _FLUSHREQUEST._serialized_start=8068 - _FLUSHREQUEST._serialized_end=8178 - _FLUSHRESPONSE._serialized_start=8181 - _FLUSHRESPONSE._serialized_end=8720 - _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_start=8497 - _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_end=8578 - _FLUSHRESPONSE_FLUSHCOLLSEGIDSENTRY._serialized_start=8580 - _FLUSHRESPONSE_FLUSHCOLLSEGIDSENTRY._serialized_end=8666 - _FLUSHRESPONSE_COLLSEALTIMESENTRY._serialized_start=8668 - _FLUSHRESPONSE_COLLSEALTIMESENTRY._serialized_end=8720 - _QUERYREQUEST._serialized_start=8723 - _QUERYREQUEST._serialized_end=9035 - _QUERYRESULTS._serialized_start=9038 - _QUERYRESULTS._serialized_end=9198 - _VECTORIDS._serialized_start=9200 - _VECTORIDS._serialized_end=9325 - _VECTORSARRAY._serialized_start=9328 - _VECTORSARRAY._serialized_end=9459 - _CALCDISTANCEREQUEST._serialized_start=9462 - _CALCDISTANCEREQUEST._serialized_end=9683 - _CALCDISTANCERESULTS._serialized_start=9686 - _CALCDISTANCERESULTS._serialized_end=9867 - _FLUSHALLREQUEST._serialized_start=9869 - _FLUSHALLREQUEST._serialized_end=9886 - _FLUSHALLRESPONSE._serialized_start=9888 - _FLUSHALLRESPONSE._serialized_end=9973 - _PERSISTENTSEGMENTINFO._serialized_start=9976 - _PERSISTENTSEGMENTINFO._serialized_end=10129 - _GETPERSISTENTSEGMENTINFOREQUEST._serialized_start=10131 - _GETPERSISTENTSEGMENTINFOREQUEST._serialized_end=10248 - _GETPERSISTENTSEGMENTINFORESPONSE._serialized_start=10251 - _GETPERSISTENTSEGMENTINFORESPONSE._serialized_end=10389 - _QUERYSEGMENTINFO._serialized_start=10392 - _QUERYSEGMENTINFO._serialized_end=10628 - _GETQUERYSEGMENTINFOREQUEST._serialized_start=10630 - _GETQUERYSEGMENTINFOREQUEST._serialized_end=10742 - _GETQUERYSEGMENTINFORESPONSE._serialized_start=10745 - _GETQUERYSEGMENTINFORESPONSE._serialized_end=10873 - _DUMMYREQUEST._serialized_start=10875 - _DUMMYREQUEST._serialized_end=10911 - _DUMMYRESPONSE._serialized_start=10913 - _DUMMYRESPONSE._serialized_end=10946 - _REGISTERLINKREQUEST._serialized_start=10948 - _REGISTERLINKREQUEST._serialized_end=10969 - _REGISTERLINKRESPONSE._serialized_start=10971 - _REGISTERLINKRESPONSE._serialized_end=11085 - _GETMETRICSREQUEST._serialized_start=11087 - _GETMETRICSREQUEST._serialized_end=11167 - _GETMETRICSRESPONSE._serialized_start=11169 - _GETMETRICSRESPONSE._serialized_end=11276 - _COMPONENTINFO._serialized_start=11279 - _COMPONENTINFO._serialized_end=11431 - _COMPONENTSTATES._serialized_start=11434 - _COMPONENTSTATES._serialized_end=11612 - _GETCOMPONENTSTATESREQUEST._serialized_start=11614 - _GETCOMPONENTSTATESREQUEST._serialized_end=11641 - _LOADBALANCEREQUEST._serialized_start=11644 - _LOADBALANCEREQUEST._serialized_end=11826 - _MANUALCOMPACTIONREQUEST._serialized_start=11828 - _MANUALCOMPACTIONREQUEST._serialized_end=11904 - _MANUALCOMPACTIONRESPONSE._serialized_start=11906 - _MANUALCOMPACTIONRESPONSE._serialized_end=11999 - _GETCOMPACTIONSTATEREQUEST._serialized_start=12001 - _GETCOMPACTIONSTATEREQUEST._serialized_end=12050 - _GETCOMPACTIONSTATERESPONSE._serialized_start=12053 - _GETCOMPACTIONSTATERESPONSE._serialized_end=12274 - _GETCOMPACTIONPLANSREQUEST._serialized_start=12276 - _GETCOMPACTIONPLANSREQUEST._serialized_end=12325 - _GETCOMPACTIONPLANSRESPONSE._serialized_start=12328 - _GETCOMPACTIONPLANSRESPONSE._serialized_end=12516 - _COMPACTIONMERGEINFO._serialized_start=12518 - _COMPACTIONMERGEINFO._serialized_end=12572 - _GETFLUSHSTATEREQUEST._serialized_start=12574 - _GETFLUSHSTATEREQUEST._serialized_end=12616 - _GETFLUSHSTATERESPONSE._serialized_start=12618 - _GETFLUSHSTATERESPONSE._serialized_end=12703 - _GETFLUSHALLSTATEREQUEST._serialized_start=12705 - _GETFLUSHALLSTATEREQUEST._serialized_end=12796 - _GETFLUSHALLSTATERESPONSE._serialized_start=12798 - _GETFLUSHALLSTATERESPONSE._serialized_end=12886 - _IMPORTREQUEST._serialized_start=12889 - _IMPORTREQUEST._serialized_end=13088 - _IMPORTRESPONSE._serialized_start=13090 - _IMPORTRESPONSE._serialized_end=13166 - _GETIMPORTSTATEREQUEST._serialized_start=13168 - _GETIMPORTSTATEREQUEST._serialized_end=13205 - _GETIMPORTSTATERESPONSE._serialized_start=13208 - _GETIMPORTSTATERESPONSE._serialized_end=13487 - _LISTIMPORTTASKSREQUEST._serialized_start=13489 - _LISTIMPORTTASKSREQUEST._serialized_end=13570 - _LISTIMPORTTASKSRESPONSE._serialized_start=13573 - _LISTIMPORTTASKSRESPONSE._serialized_end=13703 - _GETREPLICASREQUEST._serialized_start=13706 - _GETREPLICASREQUEST._serialized_end=13860 - _GETREPLICASRESPONSE._serialized_start=13862 - _GETREPLICASRESPONSE._serialized_end=13980 - _REPLICAINFO._serialized_start=13983 - _REPLICAINFO._serialized_end=14304 - _REPLICAINFO_NUMOUTBOUNDNODEENTRY._serialized_start=14250 - _REPLICAINFO_NUMOUTBOUNDNODEENTRY._serialized_end=14304 - _SHARDREPLICA._serialized_start=14306 - _SHARDREPLICA._serialized_end=14402 - _CREATECREDENTIALREQUEST._serialized_start=14405 - _CREATECREDENTIALREQUEST._serialized_end=14595 - _UPDATECREDENTIALREQUEST._serialized_start=14598 - _UPDATECREDENTIALREQUEST._serialized_end=14803 - _DELETECREDENTIALREQUEST._serialized_start=14805 - _DELETECREDENTIALREQUEST._serialized_end=14912 - _LISTCREDUSERSRESPONSE._serialized_start=14914 - _LISTCREDUSERSRESPONSE._serialized_end=15001 - _LISTCREDUSERSREQUEST._serialized_start=15003 - _LISTCREDUSERSREQUEST._serialized_end=15089 - _ROLEENTITY._serialized_start=15091 - _ROLEENTITY._serialized_end=15117 - _USERENTITY._serialized_start=15119 - _USERENTITY._serialized_end=15145 - _CREATEROLEREQUEST._serialized_start=15148 - _CREATEROLEREQUEST._serialized_end=15280 - _DROPROLEREQUEST._serialized_start=15282 - _DROPROLEREQUEST._serialized_end=15382 - _OPERATEUSERROLEREQUEST._serialized_start=15385 - _OPERATEUSERROLEREQUEST._serialized_end=15566 - _SELECTROLEREQUEST._serialized_start=15569 - _SELECTROLEREQUEST._serialized_end=15726 - _ROLERESULT._serialized_start=15728 - _ROLERESULT._serialized_end=15835 - _SELECTROLERESPONSE._serialized_start=15837 - _SELECTROLERESPONSE._serialized_end=15952 - _SELECTUSERREQUEST._serialized_start=15955 - _SELECTUSERREQUEST._serialized_end=16103 - _USERRESULT._serialized_start=16105 - _USERRESULT._serialized_end=16212 - _SELECTUSERRESPONSE._serialized_start=16214 - _SELECTUSERRESPONSE._serialized_end=16329 - _OBJECTENTITY._serialized_start=16331 - _OBJECTENTITY._serialized_end=16359 - _PRIVILEGEENTITY._serialized_start=16361 - _PRIVILEGEENTITY._serialized_end=16392 - _GRANTORENTITY._serialized_start=16394 - _GRANTORENTITY._serialized_end=16513 - _GRANTPRIVILEGEENTITY._serialized_start=16515 - _GRANTPRIVILEGEENTITY._serialized_end=16591 - _GRANTENTITY._serialized_start=16594 - _GRANTENTITY._serialized_end=16796 - _SELECTGRANTREQUEST._serialized_start=16799 - _SELECTGRANTREQUEST._serialized_end=16933 - _SELECTGRANTRESPONSE._serialized_start=16935 - _SELECTGRANTRESPONSE._serialized_end=17053 - _OPERATEPRIVILEGEREQUEST._serialized_start=17056 - _OPERATEPRIVILEGEREQUEST._serialized_end=17252 - _GETLOADINGPROGRESSREQUEST._serialized_start=17255 - _GETLOADINGPROGRESSREQUEST._serialized_end=17402 - _GETLOADINGPROGRESSRESPONSE._serialized_start=17404 - _GETLOADINGPROGRESSRESPONSE._serialized_end=17495 - _GETLOADSTATEREQUEST._serialized_start=17498 - _GETLOADSTATEREQUEST._serialized_end=17639 - _GETLOADSTATERESPONSE._serialized_start=17641 - _GETLOADSTATERESPONSE._serialized_end=17755 - _MILVUSEXT._serialized_start=17757 - _MILVUSEXT._serialized_end=17785 - _GETVERSIONREQUEST._serialized_start=17787 - _GETVERSIONREQUEST._serialized_end=17806 - _GETVERSIONRESPONSE._serialized_start=17808 - _GETVERSIONRESPONSE._serialized_end=17890 - _CHECKHEALTHREQUEST._serialized_start=17892 - _CHECKHEALTHREQUEST._serialized_end=17912 - _CHECKHEALTHRESPONSE._serialized_start=17915 - _CHECKHEALTHRESPONSE._serialized_end=18072 - _CREATERESOURCEGROUPREQUEST._serialized_start=18074 - _CREATERESOURCEGROUPREQUEST._serialized_end=18190 - _DROPRESOURCEGROUPREQUEST._serialized_start=18192 - _DROPRESOURCEGROUPREQUEST._serialized_end=18306 - _TRANSFERNODEREQUEST._serialized_start=18309 - _TRANSFERNODEREQUEST._serialized_end=18474 - _TRANSFERREPLICAREQUEST._serialized_start=18477 - _TRANSFERREPLICAREQUEST._serialized_end=18690 - _LISTRESOURCEGROUPSREQUEST._serialized_start=18692 - _LISTRESOURCEGROUPSREQUEST._serialized_end=18783 - _LISTRESOURCEGROUPSRESPONSE._serialized_start=18785 - _LISTRESOURCEGROUPSRESPONSE._serialized_end=18883 - _DESCRIBERESOURCEGROUPREQUEST._serialized_start=18885 - _DESCRIBERESOURCEGROUPREQUEST._serialized_end=19003 - _DESCRIBERESOURCEGROUPRESPONSE._serialized_start=19006 - _DESCRIBERESOURCEGROUPRESPONSE._serialized_end=19142 - _RESOURCEGROUP._serialized_start=19145 - _RESOURCEGROUP._serialized_end=19643 - _RESOURCEGROUP_NUMLOADEDREPLICAENTRY._serialized_start=19476 - _RESOURCEGROUP_NUMLOADEDREPLICAENTRY._serialized_end=19531 - _RESOURCEGROUP_NUMOUTGOINGNODEENTRY._serialized_start=19533 - _RESOURCEGROUP_NUMOUTGOINGNODEENTRY._serialized_end=19587 - _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_start=19589 - _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_end=19643 - _RENAMECOLLECTIONREQUEST._serialized_start=19646 - _RENAMECOLLECTIONREQUEST._serialized_end=19786 - _CREATEDATABASEREQUEST._serialized_start=19788 - _CREATEDATABASEREQUEST._serialized_end=19892 - _DROPDATABASEREQUEST._serialized_start=19894 - _DROPDATABASEREQUEST._serialized_end=19996 - _LISTDATABASESREQUEST._serialized_start=19998 - _LISTDATABASESREQUEST._serialized_end=20084 - _LISTDATABASESRESPONSE._serialized_start=20086 - _LISTDATABASESRESPONSE._serialized_end=20192 - _CONNECTREQUEST._serialized_start=20194 - _CONNECTREQUEST._serialized_end=20308 - _CONNECTRESPONSE._serialized_start=20311 - _CONNECTRESPONSE._serialized_end=20447 - _MILVUSSERVICE._serialized_start=20693 - _MILVUSSERVICE._serialized_end=28064 - _PROXYSERVICE._serialized_start=28066 - _PROXYSERVICE._serialized_end=28183 + _SEARCHREQUEST._serialized_end=7966 + _HITS._serialized_start=7968 + _HITS._serialized_end=8021 + _SEARCHRESULTS._serialized_start=8024 + _SEARCHRESULTS._serialized_end=8165 + _FLUSHREQUEST._serialized_start=8167 + _FLUSHREQUEST._serialized_end=8277 + _FLUSHRESPONSE._serialized_start=8280 + _FLUSHRESPONSE._serialized_end=8819 + _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_start=8596 + _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_end=8677 + _FLUSHRESPONSE_FLUSHCOLLSEGIDSENTRY._serialized_start=8679 + _FLUSHRESPONSE_FLUSHCOLLSEGIDSENTRY._serialized_end=8765 + _FLUSHRESPONSE_COLLSEALTIMESENTRY._serialized_start=8767 + _FLUSHRESPONSE_COLLSEALTIMESENTRY._serialized_end=8819 + _QUERYREQUEST._serialized_start=8822 + _QUERYREQUEST._serialized_end=9233 + _QUERYRESULTS._serialized_start=9236 + _QUERYRESULTS._serialized_end=9396 + _VECTORIDS._serialized_start=9398 + _VECTORIDS._serialized_end=9523 + _VECTORSARRAY._serialized_start=9526 + _VECTORSARRAY._serialized_end=9657 + _CALCDISTANCEREQUEST._serialized_start=9660 + _CALCDISTANCEREQUEST._serialized_end=9881 + _CALCDISTANCERESULTS._serialized_start=9884 + _CALCDISTANCERESULTS._serialized_end=10065 + _FLUSHALLREQUEST._serialized_start=10067 + _FLUSHALLREQUEST._serialized_end=10084 + _FLUSHALLRESPONSE._serialized_start=10086 + _FLUSHALLRESPONSE._serialized_end=10171 + _PERSISTENTSEGMENTINFO._serialized_start=10174 + _PERSISTENTSEGMENTINFO._serialized_end=10327 + _GETPERSISTENTSEGMENTINFOREQUEST._serialized_start=10329 + _GETPERSISTENTSEGMENTINFOREQUEST._serialized_end=10446 + _GETPERSISTENTSEGMENTINFORESPONSE._serialized_start=10449 + _GETPERSISTENTSEGMENTINFORESPONSE._serialized_end=10587 + _QUERYSEGMENTINFO._serialized_start=10590 + _QUERYSEGMENTINFO._serialized_end=10826 + _GETQUERYSEGMENTINFOREQUEST._serialized_start=10828 + _GETQUERYSEGMENTINFOREQUEST._serialized_end=10940 + _GETQUERYSEGMENTINFORESPONSE._serialized_start=10943 + _GETQUERYSEGMENTINFORESPONSE._serialized_end=11071 + _DUMMYREQUEST._serialized_start=11073 + _DUMMYREQUEST._serialized_end=11109 + _DUMMYRESPONSE._serialized_start=11111 + _DUMMYRESPONSE._serialized_end=11144 + _REGISTERLINKREQUEST._serialized_start=11146 + _REGISTERLINKREQUEST._serialized_end=11167 + _REGISTERLINKRESPONSE._serialized_start=11169 + _REGISTERLINKRESPONSE._serialized_end=11283 + _GETMETRICSREQUEST._serialized_start=11285 + _GETMETRICSREQUEST._serialized_end=11365 + _GETMETRICSRESPONSE._serialized_start=11367 + _GETMETRICSRESPONSE._serialized_end=11474 + _COMPONENTINFO._serialized_start=11477 + _COMPONENTINFO._serialized_end=11629 + _COMPONENTSTATES._serialized_start=11632 + _COMPONENTSTATES._serialized_end=11810 + _GETCOMPONENTSTATESREQUEST._serialized_start=11812 + _GETCOMPONENTSTATESREQUEST._serialized_end=11839 + _LOADBALANCEREQUEST._serialized_start=11842 + _LOADBALANCEREQUEST._serialized_end=12024 + _MANUALCOMPACTIONREQUEST._serialized_start=12026 + _MANUALCOMPACTIONREQUEST._serialized_end=12102 + _MANUALCOMPACTIONRESPONSE._serialized_start=12104 + _MANUALCOMPACTIONRESPONSE._serialized_end=12197 + _GETCOMPACTIONSTATEREQUEST._serialized_start=12199 + _GETCOMPACTIONSTATEREQUEST._serialized_end=12248 + _GETCOMPACTIONSTATERESPONSE._serialized_start=12251 + _GETCOMPACTIONSTATERESPONSE._serialized_end=12472 + _GETCOMPACTIONPLANSREQUEST._serialized_start=12474 + _GETCOMPACTIONPLANSREQUEST._serialized_end=12523 + _GETCOMPACTIONPLANSRESPONSE._serialized_start=12526 + _GETCOMPACTIONPLANSRESPONSE._serialized_end=12714 + _COMPACTIONMERGEINFO._serialized_start=12716 + _COMPACTIONMERGEINFO._serialized_end=12770 + _GETFLUSHSTATEREQUEST._serialized_start=12772 + _GETFLUSHSTATEREQUEST._serialized_end=12814 + _GETFLUSHSTATERESPONSE._serialized_start=12816 + _GETFLUSHSTATERESPONSE._serialized_end=12901 + _GETFLUSHALLSTATEREQUEST._serialized_start=12903 + _GETFLUSHALLSTATEREQUEST._serialized_end=12994 + _GETFLUSHALLSTATERESPONSE._serialized_start=12996 + _GETFLUSHALLSTATERESPONSE._serialized_end=13084 + _IMPORTREQUEST._serialized_start=13087 + _IMPORTREQUEST._serialized_end=13286 + _IMPORTRESPONSE._serialized_start=13288 + _IMPORTRESPONSE._serialized_end=13364 + _GETIMPORTSTATEREQUEST._serialized_start=13366 + _GETIMPORTSTATEREQUEST._serialized_end=13403 + _GETIMPORTSTATERESPONSE._serialized_start=13406 + _GETIMPORTSTATERESPONSE._serialized_end=13685 + _LISTIMPORTTASKSREQUEST._serialized_start=13687 + _LISTIMPORTTASKSREQUEST._serialized_end=13768 + _LISTIMPORTTASKSRESPONSE._serialized_start=13771 + _LISTIMPORTTASKSRESPONSE._serialized_end=13901 + _GETREPLICASREQUEST._serialized_start=13904 + _GETREPLICASREQUEST._serialized_end=14058 + _GETREPLICASRESPONSE._serialized_start=14060 + _GETREPLICASRESPONSE._serialized_end=14178 + _REPLICAINFO._serialized_start=14181 + _REPLICAINFO._serialized_end=14502 + _REPLICAINFO_NUMOUTBOUNDNODEENTRY._serialized_start=14448 + _REPLICAINFO_NUMOUTBOUNDNODEENTRY._serialized_end=14502 + _SHARDREPLICA._serialized_start=14504 + _SHARDREPLICA._serialized_end=14600 + _CREATECREDENTIALREQUEST._serialized_start=14603 + _CREATECREDENTIALREQUEST._serialized_end=14793 + _UPDATECREDENTIALREQUEST._serialized_start=14796 + _UPDATECREDENTIALREQUEST._serialized_end=15001 + _DELETECREDENTIALREQUEST._serialized_start=15003 + _DELETECREDENTIALREQUEST._serialized_end=15110 + _LISTCREDUSERSRESPONSE._serialized_start=15112 + _LISTCREDUSERSRESPONSE._serialized_end=15199 + _LISTCREDUSERSREQUEST._serialized_start=15201 + _LISTCREDUSERSREQUEST._serialized_end=15287 + _ROLEENTITY._serialized_start=15289 + _ROLEENTITY._serialized_end=15315 + _USERENTITY._serialized_start=15317 + _USERENTITY._serialized_end=15343 + _CREATEROLEREQUEST._serialized_start=15346 + _CREATEROLEREQUEST._serialized_end=15478 + _DROPROLEREQUEST._serialized_start=15480 + _DROPROLEREQUEST._serialized_end=15580 + _OPERATEUSERROLEREQUEST._serialized_start=15583 + _OPERATEUSERROLEREQUEST._serialized_end=15764 + _SELECTROLEREQUEST._serialized_start=15767 + _SELECTROLEREQUEST._serialized_end=15924 + _ROLERESULT._serialized_start=15926 + _ROLERESULT._serialized_end=16033 + _SELECTROLERESPONSE._serialized_start=16035 + _SELECTROLERESPONSE._serialized_end=16150 + _SELECTUSERREQUEST._serialized_start=16153 + _SELECTUSERREQUEST._serialized_end=16301 + _USERRESULT._serialized_start=16303 + _USERRESULT._serialized_end=16410 + _SELECTUSERRESPONSE._serialized_start=16412 + _SELECTUSERRESPONSE._serialized_end=16527 + _OBJECTENTITY._serialized_start=16529 + _OBJECTENTITY._serialized_end=16557 + _PRIVILEGEENTITY._serialized_start=16559 + _PRIVILEGEENTITY._serialized_end=16590 + _GRANTORENTITY._serialized_start=16592 + _GRANTORENTITY._serialized_end=16711 + _GRANTPRIVILEGEENTITY._serialized_start=16713 + _GRANTPRIVILEGEENTITY._serialized_end=16789 + _GRANTENTITY._serialized_start=16792 + _GRANTENTITY._serialized_end=16994 + _SELECTGRANTREQUEST._serialized_start=16997 + _SELECTGRANTREQUEST._serialized_end=17131 + _SELECTGRANTRESPONSE._serialized_start=17133 + _SELECTGRANTRESPONSE._serialized_end=17251 + _OPERATEPRIVILEGEREQUEST._serialized_start=17254 + _OPERATEPRIVILEGEREQUEST._serialized_end=17450 + _GETLOADINGPROGRESSREQUEST._serialized_start=17453 + _GETLOADINGPROGRESSREQUEST._serialized_end=17600 + _GETLOADINGPROGRESSRESPONSE._serialized_start=17602 + _GETLOADINGPROGRESSRESPONSE._serialized_end=17693 + _GETLOADSTATEREQUEST._serialized_start=17696 + _GETLOADSTATEREQUEST._serialized_end=17837 + _GETLOADSTATERESPONSE._serialized_start=17839 + _GETLOADSTATERESPONSE._serialized_end=17953 + _MILVUSEXT._serialized_start=17955 + _MILVUSEXT._serialized_end=17983 + _GETVERSIONREQUEST._serialized_start=17985 + _GETVERSIONREQUEST._serialized_end=18004 + _GETVERSIONRESPONSE._serialized_start=18006 + _GETVERSIONRESPONSE._serialized_end=18088 + _CHECKHEALTHREQUEST._serialized_start=18090 + _CHECKHEALTHREQUEST._serialized_end=18110 + _CHECKHEALTHRESPONSE._serialized_start=18113 + _CHECKHEALTHRESPONSE._serialized_end=18270 + _CREATERESOURCEGROUPREQUEST._serialized_start=18272 + _CREATERESOURCEGROUPREQUEST._serialized_end=18388 + _DROPRESOURCEGROUPREQUEST._serialized_start=18390 + _DROPRESOURCEGROUPREQUEST._serialized_end=18504 + _TRANSFERNODEREQUEST._serialized_start=18507 + _TRANSFERNODEREQUEST._serialized_end=18672 + _TRANSFERREPLICAREQUEST._serialized_start=18675 + _TRANSFERREPLICAREQUEST._serialized_end=18888 + _LISTRESOURCEGROUPSREQUEST._serialized_start=18890 + _LISTRESOURCEGROUPSREQUEST._serialized_end=18981 + _LISTRESOURCEGROUPSRESPONSE._serialized_start=18983 + _LISTRESOURCEGROUPSRESPONSE._serialized_end=19081 + _DESCRIBERESOURCEGROUPREQUEST._serialized_start=19083 + _DESCRIBERESOURCEGROUPREQUEST._serialized_end=19201 + _DESCRIBERESOURCEGROUPRESPONSE._serialized_start=19204 + _DESCRIBERESOURCEGROUPRESPONSE._serialized_end=19340 + _RESOURCEGROUP._serialized_start=19343 + _RESOURCEGROUP._serialized_end=19841 + _RESOURCEGROUP_NUMLOADEDREPLICAENTRY._serialized_start=19674 + _RESOURCEGROUP_NUMLOADEDREPLICAENTRY._serialized_end=19729 + _RESOURCEGROUP_NUMOUTGOINGNODEENTRY._serialized_start=19731 + _RESOURCEGROUP_NUMOUTGOINGNODEENTRY._serialized_end=19785 + _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_start=19787 + _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_end=19841 + _RENAMECOLLECTIONREQUEST._serialized_start=19844 + _RENAMECOLLECTIONREQUEST._serialized_end=19984 + _CREATEDATABASEREQUEST._serialized_start=19986 + _CREATEDATABASEREQUEST._serialized_end=20090 + _DROPDATABASEREQUEST._serialized_start=20092 + _DROPDATABASEREQUEST._serialized_end=20194 + _LISTDATABASESREQUEST._serialized_start=20196 + _LISTDATABASESREQUEST._serialized_end=20282 + _LISTDATABASESRESPONSE._serialized_start=20284 + _LISTDATABASESRESPONSE._serialized_end=20390 + _GETINDEXSTATISTICSREQUEST._serialized_start=20393 + _GETINDEXSTATISTICSREQUEST._serialized_end=20535 + _GETINDEXSTATISTICSRESPONSE._serialized_start=20538 + _GETINDEXSTATISTICSRESPONSE._serialized_end=20678 + _CONNECTREQUEST._serialized_start=20680 + _CONNECTREQUEST._serialized_end=20794 + _CONNECTRESPONSE._serialized_start=20797 + _CONNECTRESPONSE._serialized_end=20933 + _MILVUSSERVICE._serialized_start=21179 + _MILVUSSERVICE._serialized_end=28671 + _PROXYSERVICE._serialized_start=28673 + _PROXYSERVICE._serialized_end=28790 # @@protoc_insertion_point(module_scope) diff --git a/pymilvus/grpc_gen/milvus_pb2.pyi b/pymilvus/grpc_gen/milvus_pb2.pyi index 1db83a678..38216d0b3 100644 --- a/pymilvus/grpc_gen/milvus_pb2.pyi +++ b/pymilvus/grpc_gen/milvus_pb2.pyi @@ -679,6 +679,26 @@ class GetIndexStateResponse(_message.Message): status: _common_pb2.Status def __init__(self, status: _Optional[_Union[_common_pb2.Status, _Mapping]] = ..., state: _Optional[_Union[_common_pb2.IndexState, str]] = ..., fail_reason: _Optional[str] = ...) -> None: ... +class GetIndexStatisticsRequest(_message.Message): + __slots__ = ["base", "collection_name", "db_name", "index_name"] + BASE_FIELD_NUMBER: _ClassVar[int] + COLLECTION_NAME_FIELD_NUMBER: _ClassVar[int] + DB_NAME_FIELD_NUMBER: _ClassVar[int] + INDEX_NAME_FIELD_NUMBER: _ClassVar[int] + base: _common_pb2.MsgBase + collection_name: str + db_name: str + index_name: str + def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., index_name: _Optional[str] = ...) -> None: ... + +class GetIndexStatisticsResponse(_message.Message): + __slots__ = ["index_descriptions", "status"] + INDEX_DESCRIPTIONS_FIELD_NUMBER: _ClassVar[int] + STATUS_FIELD_NUMBER: _ClassVar[int] + index_descriptions: _containers.RepeatedCompositeFieldContainer[IndexDescription] + status: _common_pb2.Status + def __init__(self, status: _Optional[_Union[_common_pb2.Status, _Mapping]] = ..., index_descriptions: _Optional[_Iterable[_Union[IndexDescription, _Mapping]]] = ...) -> None: ... + class GetLoadStateRequest(_message.Message): __slots__ = ["base", "collection_name", "db_name", "partition_names"] BASE_FIELD_NUMBER: _ClassVar[int] @@ -1178,9 +1198,10 @@ class PrivilegeEntity(_message.Message): def __init__(self, name: _Optional[str] = ...) -> None: ... class QueryRequest(_message.Message): - __slots__ = ["base", "collection_name", "db_name", "expr", "guarantee_timestamp", "not_return_all_meta", "output_fields", "partition_names", "query_params", "travel_timestamp"] + __slots__ = ["base", "collection_name", "consistency_level", "db_name", "expr", "guarantee_timestamp", "not_return_all_meta", "output_fields", "partition_names", "query_params", "travel_timestamp", "use_default_consistency"] BASE_FIELD_NUMBER: _ClassVar[int] COLLECTION_NAME_FIELD_NUMBER: _ClassVar[int] + CONSISTENCY_LEVEL_FIELD_NUMBER: _ClassVar[int] DB_NAME_FIELD_NUMBER: _ClassVar[int] EXPR_FIELD_NUMBER: _ClassVar[int] GUARANTEE_TIMESTAMP_FIELD_NUMBER: _ClassVar[int] @@ -1189,8 +1210,10 @@ class QueryRequest(_message.Message): PARTITION_NAMES_FIELD_NUMBER: _ClassVar[int] QUERY_PARAMS_FIELD_NUMBER: _ClassVar[int] TRAVEL_TIMESTAMP_FIELD_NUMBER: _ClassVar[int] + USE_DEFAULT_CONSISTENCY_FIELD_NUMBER: _ClassVar[int] base: _common_pb2.MsgBase collection_name: str + consistency_level: _common_pb2.ConsistencyLevel db_name: str expr: str guarantee_timestamp: int @@ -1199,7 +1222,8 @@ class QueryRequest(_message.Message): partition_names: _containers.RepeatedScalarFieldContainer[str] query_params: _containers.RepeatedCompositeFieldContainer[_common_pb2.KeyValuePair] travel_timestamp: int - def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., expr: _Optional[str] = ..., output_fields: _Optional[_Iterable[str]] = ..., partition_names: _Optional[_Iterable[str]] = ..., travel_timestamp: _Optional[int] = ..., guarantee_timestamp: _Optional[int] = ..., query_params: _Optional[_Iterable[_Union[_common_pb2.KeyValuePair, _Mapping]]] = ..., not_return_all_meta: bool = ...) -> None: ... + use_default_consistency: bool + def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., expr: _Optional[str] = ..., output_fields: _Optional[_Iterable[str]] = ..., partition_names: _Optional[_Iterable[str]] = ..., travel_timestamp: _Optional[int] = ..., guarantee_timestamp: _Optional[int] = ..., query_params: _Optional[_Iterable[_Union[_common_pb2.KeyValuePair, _Mapping]]] = ..., not_return_all_meta: bool = ..., consistency_level: _Optional[_Union[_common_pb2.ConsistencyLevel, str]] = ..., use_default_consistency: bool = ...) -> None: ... class QueryResults(_message.Message): __slots__ = ["collection_name", "fields_data", "output_fields", "status"] @@ -1360,9 +1384,10 @@ class RoleResult(_message.Message): def __init__(self, role: _Optional[_Union[RoleEntity, _Mapping]] = ..., users: _Optional[_Iterable[_Union[UserEntity, _Mapping]]] = ...) -> None: ... class SearchRequest(_message.Message): - __slots__ = ["base", "collection_name", "db_name", "dsl", "dsl_type", "guarantee_timestamp", "not_return_all_meta", "nq", "output_fields", "partition_names", "placeholder_group", "search_params", "travel_timestamp"] + __slots__ = ["base", "collection_name", "consistency_level", "db_name", "dsl", "dsl_type", "guarantee_timestamp", "not_return_all_meta", "nq", "output_fields", "partition_names", "placeholder_group", "search_params", "travel_timestamp", "use_default_consistency"] BASE_FIELD_NUMBER: _ClassVar[int] COLLECTION_NAME_FIELD_NUMBER: _ClassVar[int] + CONSISTENCY_LEVEL_FIELD_NUMBER: _ClassVar[int] DB_NAME_FIELD_NUMBER: _ClassVar[int] DSL_FIELD_NUMBER: _ClassVar[int] DSL_TYPE_FIELD_NUMBER: _ClassVar[int] @@ -1374,8 +1399,10 @@ class SearchRequest(_message.Message): PLACEHOLDER_GROUP_FIELD_NUMBER: _ClassVar[int] SEARCH_PARAMS_FIELD_NUMBER: _ClassVar[int] TRAVEL_TIMESTAMP_FIELD_NUMBER: _ClassVar[int] + USE_DEFAULT_CONSISTENCY_FIELD_NUMBER: _ClassVar[int] base: _common_pb2.MsgBase collection_name: str + consistency_level: _common_pb2.ConsistencyLevel db_name: str dsl: str dsl_type: _common_pb2.DslType @@ -1387,7 +1414,8 @@ class SearchRequest(_message.Message): placeholder_group: bytes search_params: _containers.RepeatedCompositeFieldContainer[_common_pb2.KeyValuePair] travel_timestamp: int - def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., partition_names: _Optional[_Iterable[str]] = ..., dsl: _Optional[str] = ..., placeholder_group: _Optional[bytes] = ..., dsl_type: _Optional[_Union[_common_pb2.DslType, str]] = ..., output_fields: _Optional[_Iterable[str]] = ..., search_params: _Optional[_Iterable[_Union[_common_pb2.KeyValuePair, _Mapping]]] = ..., travel_timestamp: _Optional[int] = ..., guarantee_timestamp: _Optional[int] = ..., nq: _Optional[int] = ..., not_return_all_meta: bool = ...) -> None: ... + use_default_consistency: bool + def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., partition_names: _Optional[_Iterable[str]] = ..., dsl: _Optional[str] = ..., placeholder_group: _Optional[bytes] = ..., dsl_type: _Optional[_Union[_common_pb2.DslType, str]] = ..., output_fields: _Optional[_Iterable[str]] = ..., search_params: _Optional[_Iterable[_Union[_common_pb2.KeyValuePair, _Mapping]]] = ..., travel_timestamp: _Optional[int] = ..., guarantee_timestamp: _Optional[int] = ..., nq: _Optional[int] = ..., not_return_all_meta: bool = ..., consistency_level: _Optional[_Union[_common_pb2.ConsistencyLevel, str]] = ..., use_default_consistency: bool = ...) -> None: ... class SearchResults(_message.Message): __slots__ = ["collection_name", "results", "status"] diff --git a/pymilvus/grpc_gen/milvus_pb2_grpc.py b/pymilvus/grpc_gen/milvus_pb2_grpc.py index 52f537b94..214c1b6fe 100644 --- a/pymilvus/grpc_gen/milvus_pb2_grpc.py +++ b/pymilvus/grpc_gen/milvus_pb2_grpc.py @@ -130,6 +130,11 @@ def __init__(self, channel): request_serializer=milvus__pb2.DescribeIndexRequest.SerializeToString, response_deserializer=milvus__pb2.DescribeIndexResponse.FromString, ) + self.GetIndexStatistics = channel.unary_unary( + '/milvus.proto.milvus.MilvusService/GetIndexStatistics', + request_serializer=milvus__pb2.GetIndexStatisticsRequest.SerializeToString, + response_deserializer=milvus__pb2.GetIndexStatisticsResponse.FromString, + ) self.GetIndexState = channel.unary_unary( '/milvus.proto.milvus.MilvusService/GetIndexState', request_serializer=milvus__pb2.GetIndexStateRequest.SerializeToString, @@ -523,6 +528,12 @@ def DescribeIndex(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def GetIndexStatistics(self, request, context): + """Missing associated documentation comment in .proto file.""" + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def GetIndexState(self, request, context): """Deprecated: use DescribeIndex instead """ @@ -948,6 +959,11 @@ def add_MilvusServiceServicer_to_server(servicer, server): request_deserializer=milvus__pb2.DescribeIndexRequest.FromString, response_serializer=milvus__pb2.DescribeIndexResponse.SerializeToString, ), + 'GetIndexStatistics': grpc.unary_unary_rpc_method_handler( + servicer.GetIndexStatistics, + request_deserializer=milvus__pb2.GetIndexStatisticsRequest.FromString, + response_serializer=milvus__pb2.GetIndexStatisticsResponse.SerializeToString, + ), 'GetIndexState': grpc.unary_unary_rpc_method_handler( servicer.GetIndexState, request_deserializer=milvus__pb2.GetIndexStateRequest.FromString, @@ -1599,6 +1615,23 @@ def DescribeIndex(request, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + @staticmethod + def GetIndexStatistics(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/milvus.proto.milvus.MilvusService/GetIndexStatistics', + milvus__pb2.GetIndexStatisticsRequest.SerializeToString, + milvus__pb2.GetIndexStatisticsResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + @staticmethod def GetIndexState(request, target,
[FEATURE]: Set consistency_level in search/query request ### Is there an existing issue for this? - [X] I have searched the existing issues ### Is your feature request related to a problem? Please describe. In our current implementation, we construct a guarantee_timestamp on the client side based on the consistency_level passed by the user in order to control different levels of consistency. It is our desire to include a consistency_level parameter in the request, allowing the server to calculate the final timestamp based on this parameter. ### Describe the solution you'd like _No response_ ### Describe alternatives you've considered _No response_ ### Anything else? _No response_
2023-05-30T16:01:43
0.0
[]
[]
milvus-io/pymilvus
milvus-io__pymilvus-1479
978dcdda1a6a9d56ecdca4131847106f8f9924d4
diff --git a/pymilvus/client/abstract.py b/pymilvus/client/abstract.py index 30205c4bf..a425f5824 100644 --- a/pymilvus/client/abstract.py +++ b/pymilvus/client/abstract.py @@ -267,10 +267,9 @@ def score(self): class Hits(LoopBase): - def __init__(self, raw, auto_id, round_decimal=-1): + def __init__(self, raw, round_decimal=-1): super().__init__() self._raw = raw - self._auto_id = auto_id if round_decimal != -1: self._distances = [round(x, round_decimal) for x in self._raw.scores] else: @@ -393,10 +392,9 @@ def _pack(self, raw): class QueryResult(LoopBase): - def __init__(self, raw, auto_id=True): + def __init__(self, raw): super().__init__() self._raw = raw - self._auto_id = auto_id self._pack(raw.hits) def __len__(self): @@ -452,14 +450,13 @@ def _pack(self, raw): offset += raw.results.topks[i] def get__item(self, item): - return Hits(self._hits[item], self._auto_id) + return Hits(self._hits[item]) class ChunkedQueryResult(LoopBase): - def __init__(self, raw_list, auto_id=True, round_decimal=-1): + def __init__(self, raw_list, round_decimal=-1): super().__init__() self._raw_list = raw_list - self._auto_id = auto_id self._nq = 0 self.round_decimal = round_decimal @@ -523,7 +520,7 @@ def _pack(self, raw_list): offset += raw.results.topks[i] def get__item(self, item): - return Hits(self._hits[item], self._auto_id, self.round_decimal) + return Hits(self._hits[item], self.round_decimal) def _abstract(): diff --git a/pymilvus/client/asynch.py b/pymilvus/client/asynch.py index 5d74fc100..6dbe756e5 100644 --- a/pymilvus/client/asynch.py +++ b/pymilvus/client/asynch.py @@ -156,13 +156,9 @@ def exception(self): class SearchFuture(Future): - def __init__(self, future, done_callback=None, auto_id=True, pre_exception=None): - super().__init__(future, done_callback, pre_exception) - self._auto_id = auto_id - def on_response(self, response): if response.status.error_code == 0: - return QueryResult(response, self._auto_id) + return QueryResult(response) status = response.status raise MilvusException(status.error_code, status.reason) @@ -171,9 +167,8 @@ def on_response(self, response): # TODO: if ChunkedFuture is more common later, consider using ChunkedFuture as Base Class, # then Future(future, done_cb, pre_exception) equal to ChunkedFuture([future], done_cb, pre_exception) class ChunkedSearchFuture(Future): - def __init__(self, future_list, done_callback=None, auto_id=True, pre_exception=None): + def __init__(self, future_list, done_callback=None, pre_exception=None): super().__init__(None, done_callback, pre_exception) - self._auto_id = auto_id self._future_list = future_list self._response = [] @@ -244,7 +239,7 @@ def on_response(self, response): if raw.status.error_code != 0: raise MilvusException(raw.status.error_code, raw.status.reason) - return ChunkedQueryResult(response, self._auto_id) + return ChunkedQueryResult(response) class MutationFuture(Future): diff --git a/pymilvus/client/check.py b/pymilvus/client/check.py index d0d2a02a6..bf7610023 100644 --- a/pymilvus/client/check.py +++ b/pymilvus/client/check.py @@ -168,10 +168,8 @@ def is_legal_partition_name(tag: Any) -> bool: def is_legal_limit(limit: Any) -> bool: return isinstance(limit, int) and limit > 0 - def is_legal_anns_field(field: Any) -> bool: - return field and isinstance(field, str) - + return field is None or isinstance(field, str) def is_legal_search_data(data: Any) -> bool: import numpy as np @@ -258,8 +256,7 @@ def is_legal_travel_timestamp(ts: Any) -> bool: def is_legal_guarantee_timestamp(ts: Any) -> bool: - return isinstance(ts, int) and ts >= 0 - + return ts is None or isinstance(ts, int) and ts >= 0 def is_legal_user(user) -> bool: return isinstance(user, str) diff --git a/pymilvus/client/grpc_handler.py b/pymilvus/client/grpc_handler.py index 28e8606ec..6198f0a18 100644 --- a/pymilvus/client/grpc_handler.py +++ b/pymilvus/client/grpc_handler.py @@ -28,7 +28,6 @@ State, CompactionPlans, Plan, - get_consistency_level, Replica, Shard, Group, GrantInfo, UserInfo, RoleInfo, BulkInsertState, @@ -552,8 +551,6 @@ def upsert_rows(self, collection_name, entities, partition_name=None, timeout=No raise err def _execute_search_requests(self, requests, timeout=None, **kwargs): - auto_id = kwargs.get("auto_id", True) - try: if kwargs.get("_async", False): futures = [] @@ -561,7 +558,7 @@ def _execute_search_requests(self, requests, timeout=None, **kwargs): ft = self._stub.Search.future(request, timeout=timeout) futures.append(ft) func = kwargs.get("_callback", None) - return ChunkedSearchFuture(futures, func, auto_id) + return ChunkedSearchFuture(futures, func) raws = [] for request in requests: @@ -572,17 +569,17 @@ def _execute_search_requests(self, requests, timeout=None, **kwargs): raws.append(response) round_decimal = kwargs.get("round_decimal", -1) - return ChunkedQueryResult(raws, auto_id, round_decimal) + return ChunkedQueryResult(raws, round_decimal) except Exception as pre_err: if kwargs.get("_async", False): - return SearchFuture(None, None, True, pre_err) + return SearchFuture(None, None, pre_err) raise pre_err @retry_on_rpc_failure(retry_on_deadline=False) def search(self, collection_name, data, anns_field, param, limit, expression=None, partition_names=None, output_fields=None, - round_decimal=-1, timeout=None, schema=None, **kwargs): + round_decimal=-1, timeout=None, **kwargs): check_pass_param( limit=limit, round_decimal=round_decimal, @@ -591,24 +588,13 @@ def search(self, collection_name, data, anns_field, param, limit, partition_name_array=partition_names, output_fields=output_fields, travel_timestamp=kwargs.get("travel_timestamp", 0), - guarantee_timestamp=kwargs.get("guarantee_timestamp", 0) + guarantee_timestamp=kwargs.get("guarantee_timestamp", None) ) - if schema is None: - schema = self.describe_collection(collection_name, timeout=timeout, **kwargs) - - consistency_level = schema["consistency_level"] - # overwrite the consistency level defined when user created the collection - consistency_level = get_consistency_level(kwargs.get("consistency_level", consistency_level)) - - ts_utils.construct_guarantee_ts(consistency_level, collection_name, kwargs) - - requests = Prepare.search_requests_with_expr(collection_name, data, anns_field, param, limit, schema, + requests = Prepare.search_requests_with_expr(collection_name, data, anns_field, param, limit, expression, partition_names, output_fields, round_decimal, **kwargs) - - auto_id = schema["auto_id"] - return self._execute_search_requests(requests, timeout, round_decimal=round_decimal, auto_id=auto_id, **kwargs) + return self._execute_search_requests(requests, timeout, round_decimal=round_decimal, **kwargs) @retry_on_rpc_failure() def get_query_segment_info(self, collection_name, timeout=30, **kwargs): @@ -1046,14 +1032,6 @@ def get(self, collection_name, ids, output_fields=None, partition_names=None, ti def query(self, collection_name, expr, output_fields=None, partition_names=None, timeout=None, **kwargs): if output_fields is not None and not isinstance(output_fields, (list,)): raise ParamError(message="Invalid query format. 'output_fields' must be a list") - collection_schema = kwargs.get("schema", None) - if not collection_schema: - collection_schema = self.describe_collection(collection_name, timeout) - consistency_level = collection_schema["consistency_level"] - # overwrite the consistency level defined when user created the collection - consistency_level = get_consistency_level(kwargs.get("consistency_level", consistency_level)) - - ts_utils.construct_guarantee_ts(consistency_level, collection_name, kwargs) request = Prepare.query_request(collection_name, expr, output_fields, partition_names, **kwargs) future = self._stub.Query.future(request, timeout=timeout) diff --git a/pymilvus/client/prepare.py b/pymilvus/client/prepare.py index e9f5eefec..858d5e356 100644 --- a/pymilvus/client/prepare.py +++ b/pymilvus/client/prepare.py @@ -1,4 +1,3 @@ -import copy import base64 from typing import Dict, Iterable, Union @@ -7,6 +6,7 @@ from . import blob from . import entity_helper +from . import ts_utils from .check import check_pass_param, is_legal_collection_properties from .types import DataType, PlaceholderType, get_consistency_level from .utils import traverse_info, traverse_rows_info @@ -423,113 +423,19 @@ def check_str(instr, prefix): return request @classmethod - def _prepare_placeholders(cls, vectors, nq, tag, pl_type, is_binary, dimension=0): + def _prepare_placeholders(cls, vectors, nq, tag, pl_type, is_binary): pl = common_types.PlaceholderValue(tag=tag) pl.type = pl_type for i in range(0, nq): if is_binary: - if len(vectors[i]) * 8 != dimension: - raise ParamError( - message=f"The dimension of query entities[{vectors[i] * 8}] is different from schema [{dimension}]") pl.values.append(blob.vectorBinaryToBytes(vectors[i])) else: - if len(vectors[i]) != dimension: - raise ParamError( - message=f"The dimension of query entities[{vectors[i]}] is different from schema [{dimension}]") pl.values.append(blob.vectorFloatToBytes(vectors[i])) return pl @classmethod - def search_request(cls, collection_name, query_entities, partition_names=None, fields=None, round_decimal=-1, - **kwargs): - schema = kwargs.get("schema", None) - fields_schema = schema.get("fields", None) # list - fields_name_locs = {fields_schema[loc]["name"]: loc - for loc in range(len(fields_schema))} - - if not isinstance(query_entities, (dict,)): - raise ParamError(message="Invalid query format. 'query_entities' must be a dict") - - if fields is not None and not isinstance(fields, (list,)): - raise ParamError(message="Invalid query format. 'fields' must be a list") - - request = milvus_types.SearchRequest( - collection_name=collection_name, - partition_names=partition_names, - output_fields=fields, - guarantee_timestamp=kwargs.get("guarantee_timestamp", 0), - ) - - duplicated_entities = copy.deepcopy(query_entities) - vector_placeholders = {} - vector_names = {} - - def extract_vectors_param(param, placeholders, names, round_decimal): - if not isinstance(param, (dict, list)): - return - - if isinstance(param, dict): - if "vector" in param: - # TODO: Here may not replace ph - ph = "$" + str(len(placeholders)) - - for pk, pv in param["vector"].items(): - if "query" not in pv: - raise ParamError(message="param vector must contain 'query'") - placeholders[ph] = pv["query"] - names[ph] = pk - param["vector"][pk]["query"] = ph - param["vector"][pk]["round_decimal"] = round_decimal - return - - for _, v in param.items(): - extract_vectors_param(v, placeholders, names, round_decimal) - - if isinstance(param, list): - for item in param: - extract_vectors_param(item, placeholders, names, round_decimal) - - extract_vectors_param(duplicated_entities, vector_placeholders, vector_names, round_decimal) - request.dsl = ujson.dumps(duplicated_entities) - - plg = common_types.PlaceholderGroup() - for tag, vectors in vector_placeholders.items(): - if len(vectors) <= 0: - continue - pl = common_types.PlaceholderValue(tag=tag) - - fname = vector_names[tag] - if fname not in fields_name_locs: - raise ParamError(message=f"Field {fname} doesn't exist in schema") - dimension = int(fields_schema[fields_name_locs[fname]]["params"].get("dim", 0)) - - if isinstance(vectors[0], bytes): - pl.type = PlaceholderType.BinaryVector - for vector in vectors: - if dimension != len(vector) * 8: - raise ParamError(message="The dimension of query vector is different from schema") - pl.values.append(blob.vectorBinaryToBytes(vector)) - else: - pl.type = PlaceholderType.FloatVector - for vector in vectors: - if dimension != len(vector): - raise ParamError(message="The dimension of query vector is different from schema") - pl.values.append(blob.vectorFloatToBytes(vector)) - # vector_values_bytes = service_msg_types.VectorValues.SerializeToString(vector_values) - - plg.placeholders.append(pl) - plg_str = common_types.PlaceholderGroup.SerializeToString(plg) - request.placeholder_group = plg_str - - return request - - @classmethod - def search_requests_with_expr(cls, collection_name, data, anns_field, param, limit, schema, expr=None, + def search_requests_with_expr(cls, collection_name, data, anns_field, param, limit, expr=None, partition_names=None, output_fields=None, round_decimal=-1, **kwargs): - # TODO Move this impl into server side - fields_schema = schema.get("fields", None) # list - fields_name_locs = {fields_schema[loc]["name"]: loc for loc in range(len(fields_schema))} - requests = [] if len(data) <= 0: return requests @@ -541,16 +447,14 @@ def search_requests_with_expr(cls, collection_name, data, anns_field, param, lim is_binary = False pl_type = PlaceholderType.FloatVector - if anns_field not in fields_name_locs: - raise ParamError(message=f"Field {anns_field} doesn't exist in schema") - dimension = int(fields_schema[fields_name_locs[anns_field]]["params"].get("dim", 0)) + + use_default_consistency = ts_utils.construct_guarantee_ts(collection_name, kwargs) ignore_growing = param.get("ignore_growing", False) or kwargs.get("ignore_growing", False) params = param.get("params", {}) if not isinstance(params, dict): raise ParamError(message=f"Search params must be a dict, got {type(params)}") search_params = { - "anns_field": anns_field, "topk": limit, "metric_type": param.get("metric_type", "L2"), "params": params, @@ -559,6 +463,9 @@ def search_requests_with_expr(cls, collection_name, data, anns_field, param, lim "ignore_growing": ignore_growing, } + if anns_field: + search_params["anns_field"] = anns_field + def dump(v): if isinstance(v, dict): return ujson.dumps(v) @@ -566,7 +473,7 @@ def dump(v): nq = len(data) tag = "$0" - pl = cls._prepare_placeholders(data, nq, tag, pl_type, is_binary, dimension) + pl = cls._prepare_placeholders(data, nq, tag, pl_type, is_binary) plg = common_types.PlaceholderGroup() plg.placeholders.append(pl) plg_str = common_types.PlaceholderGroup.SerializeToString(plg) @@ -576,6 +483,8 @@ def dump(v): output_fields=output_fields, guarantee_timestamp=kwargs.get("guarantee_timestamp", 0), travel_timestamp=kwargs.get("travel_timestamp", 0), + use_default_consistency=use_default_consistency, + consistency_level=kwargs.get("consistency_level", 0), nq=nq, ) request.placeholder_group = plg_str @@ -704,6 +613,8 @@ def retrieve_request(cls, collection_name, ids, output_fields, partition_names): @classmethod def query_request(cls, collection_name, expr, output_fields, partition_names, **kwargs): + + use_default_consistency = ts_utils.construct_guarantee_ts(collection_name, kwargs) req = milvus_types.QueryRequest(db_name="", collection_name=collection_name, expr=expr, @@ -711,6 +622,8 @@ def query_request(cls, collection_name, expr, output_fields, partition_names, ** partition_names=partition_names, guarantee_timestamp=kwargs.get("guarantee_timestamp", 0), travel_timestamp=kwargs.get("travel_timestamp", 0), + use_default_consistency=use_default_consistency, + consistency_level=kwargs.get("consistency_level", 0) ) limit = kwargs.get("limit", None) diff --git a/pymilvus/client/ts_utils.py b/pymilvus/client/ts_utils.py index 142a217d3..071f08849 100644 --- a/pymilvus/client/ts_utils.py +++ b/pymilvus/client/ts_utils.py @@ -3,13 +3,13 @@ from .singleton_utils import Singleton from .utils import hybridts_to_unixtime +from .types import get_consistency_level from .constants import EVENTUALLY_TS, BOUNDED_TS from ..grpc_gen import common_pb2 ConsistencyLevel = common_pb2.ConsistencyLevel - class GTsDict(metaclass=Singleton): def __init__(self): # collection id -> last write ts @@ -72,7 +72,16 @@ def get_bounded_ts(): return BOUNDED_TS -def construct_guarantee_ts(consistency_level, collection_name, kwargs): +def construct_guarantee_ts(collection_name, kwargs): + consistency_level = kwargs.get("consistency_level", None) + use_default = consistency_level is None + if use_default: + # in case of the default consistency is Customized or Session, + # we set guarantee_timestamp to the cached mutation ts or 1 + kwargs["guarantee_timestamp"] = get_collection_ts(collection_name) or get_eventually_ts() + return True + consistency_level = get_consistency_level(consistency_level) + kwargs["consistency_level"] = consistency_level if consistency_level == ConsistencyLevel.Strong: # Milvus will assign a newest ts. kwargs["guarantee_timestamp"] = 0 @@ -83,9 +92,7 @@ def construct_guarantee_ts(consistency_level, collection_name, kwargs): elif consistency_level == ConsistencyLevel.Bounded: # Milvus will assign ts according to the server timestamp and a configured time interval kwargs["guarantee_timestamp"] = get_bounded_ts() - elif consistency_level == ConsistencyLevel.Eventually: - # Using a very small timestamp. - kwargs["guarantee_timestamp"] = get_eventually_ts() else: # Users customize the consistency level, no modification on `guarantee_timestamp`. - pass + kwargs.setdefault("guarantee_timestamp", get_eventually_ts()) + return use_default diff --git a/pymilvus/grpc_gen/milvus-proto b/pymilvus/grpc_gen/milvus-proto index ef84459b8..4579ee9d5 160000 --- a/pymilvus/grpc_gen/milvus-proto +++ b/pymilvus/grpc_gen/milvus-proto @@ -1,1 +1,1 @@ -Subproject commit ef84459b8f8733964a6d2dda85cc5d4fa49220de +Subproject commit 4579ee9d572313d85b34a64a5f76769d13bfb315 diff --git a/pymilvus/grpc_gen/milvus_pb2.py b/pymilvus/grpc_gen/milvus_pb2.py index f5ac0b74c..6e39599d3 100644 --- a/pymilvus/grpc_gen/milvus_pb2.py +++ b/pymilvus/grpc_gen/milvus_pb2.py @@ -17,7 +17,7 @@ from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cmilvus.proto\x12\x13milvus.proto.milvus\x1a\x0c\x63ommon.proto\x1a\x0cschema.proto\x1a\x0b\x66\x65\x64\x65r.proto\x1a google/protobuf/descriptor.proto\"y\n\x12\x43reateAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"^\n\x10\x44ropAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\"x\n\x11\x41lterAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"b\n\x14\x44\x65scribeAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\"x\n\x15\x44\x65scribeAliasResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\x12\x12\n\ncollection\x18\x04 \x01(\t\"j\n\x12ListAliasesRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"}\n\x13ListAliasesResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0f\n\x07\x61liases\x18\x04 \x03(\t\"\xb8\x02\n\x17\x43reateCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0e\n\x06schema\x18\x04 \x01(\x0c\x12\x12\n\nshards_num\x18\x05 \x01(\x05\x12@\n\x11\x63onsistency_level\x18\x06 \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x35\n\nproperties\x18\x07 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x16\n\x0enum_partitions\x18\x08 \x01(\x03:\x12\xca>\x0f\x08\x01\x10\x01\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x81\x01\n\x15\x44ropCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x02\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xcf\x01\n\x16\x41lterCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x35\n\nproperties\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair:\x12\xca>\x0f\x08\x01\x10\x01\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x80\x01\n\x14HasCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\ntime_stamp\x18\x04 \x01(\x04\"J\n\x0c\x42oolResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\x08\"L\n\x0eStringResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\t\"\xaf\x01\n\x19\x44\x65scribeCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x12\n\ntime_stamp\x18\x05 \x01(\x04:\x12\xca>\x0f\x08\x01\x10\x03\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xaa\x04\n\x1a\x44\x65scribeCollectionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x35\n\x06schema\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.CollectionSchema\x12\x14\n\x0c\x63ollectionID\x18\x03 \x01(\x03\x12\x1d\n\x15virtual_channel_names\x18\x04 \x03(\t\x12\x1e\n\x16physical_channel_names\x18\x05 \x03(\t\x12\x19\n\x11\x63reated_timestamp\x18\x06 \x01(\x04\x12\x1d\n\x15\x63reated_utc_timestamp\x18\x07 \x01(\x04\x12\x12\n\nshards_num\x18\x08 \x01(\x05\x12\x0f\n\x07\x61liases\x18\t \x03(\t\x12\x39\n\x0fstart_positions\x18\n \x03(\x0b\x32 .milvus.proto.common.KeyDataPair\x12@\n\x11\x63onsistency_level\x18\x0b \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x17\n\x0f\x63ollection_name\x18\x0c \x01(\t\x12\x35\n\nproperties\x18\r \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x0f\n\x07\x64\x62_name\x18\x0e \x01(\t\x12\x16\n\x0enum_partitions\x18\x0f \x01(\x03\"\xb8\x01\n\x15LoadCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0ereplica_number\x18\x04 \x01(\x05\x12\x17\n\x0fresource_groups\x18\x05 \x03(\t\x12\x0f\n\x07refresh\x18\x06 \x01(\x08:\x07\xca>\x04\x10\x05\x18\x03\"y\n\x18ReleaseCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x06\x18\x03\"\xab\x01\n\x14GetStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x1b\n\x13guarantee_timestamp\x18\x05 \x01(\x04:\x07\xca>\x04\x10\n\x18\x03\"v\n\x15GetStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\x7f\n\x1eGetCollectionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\n\x18\x03\"\x80\x01\n\x1fGetCollectionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc4\x01\n\x16ShowCollectionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x12\n\ntime_stamp\x18\x03 \x01(\x04\x12+\n\x04type\x18\x04 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\x12\x18\n\x10\x63ollection_names\x18\x05 \x03(\t:\x12\xca>\x0f\x08\x01\x10\x04\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xf3\x01\n\x17ShowCollectionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x18\n\x10\x63ollection_names\x18\x02 \x03(\t\x12\x16\n\x0e\x63ollection_ids\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\x12\x1f\n\x17query_service_available\x18\x07 \x03(\x08\"\x86\x01\n\x16\x43reatePartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x84\x01\n\x14\x44ropPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x83\x01\n\x13HasPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\xc8\x01\n\x15LoadPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x16\n\x0ereplica_number\x18\x05 \x01(\x05\x12\x17\n\x0fresource_groups\x18\x06 \x03(\t\x12\x0f\n\x07refresh\x18\x07 \x01(\x08\"\x89\x01\n\x18ReleasePartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x8d\x01\n\x1dGetPartitionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x7f\n\x1eGetPartitionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc9\x01\n\x15ShowPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x17\n\x0fpartition_names\x18\x05 \x03(\t\x12+\n\x04type\x18\x06 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\"\xce\x01\n\x16ShowPartitionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fpartition_names\x18\x02 \x03(\t\x12\x14\n\x0cpartitionIDs\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\"m\n\x16\x44\x65scribeSegmentRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x11\n\tsegmentID\x18\x03 \x01(\x03\"\x8f\x01\n\x17\x44\x65scribeSegmentResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x0f\n\x07\x62uildID\x18\x03 \x01(\x03\x12\x14\n\x0c\x65nable_index\x18\x04 \x01(\x08\x12\x0f\n\x07\x66ieldID\x18\x05 \x01(\x03\"l\n\x13ShowSegmentsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\"W\n\x14ShowSegmentsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x12\n\nsegmentIDs\x18\x02 \x03(\x03\"\xd4\x01\n\x12\x43reateIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x37\n\x0c\x65xtra_params\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nindex_name\x18\x06 \x01(\t:\x07\xca>\x04\x10\x0b\x18\x03\"\x9d\x01\n\x14\x44\x65scribeIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\xf9\x01\n\x10IndexDescription\x12\x12\n\nindex_name\x18\x01 \x01(\t\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x31\n\x06params\x18\x03 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x14\n\x0cindexed_rows\x18\x05 \x01(\x03\x12\x12\n\ntotal_rows\x18\x06 \x01(\x03\x12.\n\x05state\x18\x07 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x1f\n\x17index_state_fail_reason\x18\x08 \x01(\t\"\x87\x01\n\x15\x44\x65scribeIndexResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"\xa5\x01\n\x1cGetIndexBuildProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"v\n\x1dGetIndexBuildProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0cindexed_rows\x18\x02 \x01(\x03\x12\x12\n\ntotal_rows\x18\x03 \x01(\x03\"\x9d\x01\n\x14GetIndexStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\x89\x01\n\x15GetIndexStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12.\n\x05state\x18\x02 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x13\n\x0b\x66\x61il_reason\x18\x03 \x01(\t\"\x99\x01\n\x10\x44ropIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\r\x18\x03\"\xe0\x01\n\rInsertRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x33\n\x0b\x66ields_data\x18\x05 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x11\n\thash_keys\x18\x06 \x03(\r\x12\x10\n\x08num_rows\x18\x07 \x01(\r:\x07\xca>\x04\x10\x08\x18\x03\"\xe0\x01\n\rUpsertRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x33\n\x0b\x66ields_data\x18\x05 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x11\n\thash_keys\x18\x06 \x03(\r\x12\x10\n\x08num_rows\x18\x07 \x01(\r:\x07\xca>\x04\x10\x19\x18\x03\"\xf0\x01\n\x0eMutationResult\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12%\n\x03IDs\x18\x02 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x12\n\nsucc_index\x18\x03 \x03(\r\x12\x11\n\terr_index\x18\x04 \x03(\r\x12\x14\n\x0c\x61\x63knowledged\x18\x05 \x01(\x08\x12\x12\n\ninsert_cnt\x18\x06 \x01(\x03\x12\x12\n\ndelete_cnt\x18\x07 \x01(\x03\x12\x12\n\nupsert_cnt\x18\x08 \x01(\x03\x12\x11\n\ttimestamp\x18\t \x01(\x04\"\xa7\x01\n\rDeleteRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x05 \x01(\t\x12\x11\n\thash_keys\x18\x06 \x03(\r:\x07\xca>\x04\x10\t\x18\x03\"\x90\x03\n\rSearchRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x0b\n\x03\x64sl\x18\x05 \x01(\t\x12\x19\n\x11placeholder_group\x18\x06 \x01(\x0c\x12.\n\x08\x64sl_type\x18\x07 \x01(\x0e\x32\x1c.milvus.proto.common.DslType\x12\x15\n\routput_fields\x18\x08 \x03(\t\x12\x38\n\rsearch_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x18\n\x10travel_timestamp\x18\n \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x0b \x01(\x04\x12\n\n\x02nq\x18\x0c \x01(\x03\x12\x1b\n\x13not_return_all_meta\x18\r \x01(\x08:\x07\xca>\x04\x10\x0e\x18\x03\"5\n\x04Hits\x12\x0b\n\x03IDs\x18\x01 \x03(\x03\x12\x10\n\x08row_data\x18\x02 \x03(\x0c\x12\x0e\n\x06scores\x18\x03 \x03(\x02\"\x8d\x01\n\rSearchResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x36\n\x07results\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.SearchResultData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"n\n\x0c\x46lushRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x18\n\x10\x63ollection_names\x18\x03 \x03(\t:\x07\xca>\x04\x10\x0f \x03\"\x9b\x04\n\rFlushResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12G\n\x0b\x63oll_segIDs\x18\x03 \x03(\x0b\x32\x32.milvus.proto.milvus.FlushResponse.CollSegIDsEntry\x12R\n\x11\x66lush_coll_segIDs\x18\x04 \x03(\x0b\x32\x37.milvus.proto.milvus.FlushResponse.FlushCollSegIDsEntry\x12N\n\x0f\x63oll_seal_times\x18\x05 \x03(\x0b\x32\x35.milvus.proto.milvus.FlushResponse.CollSealTimesEntry\x1aQ\n\x0f\x43ollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\x1aV\n\x14\x46lushCollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\x1a\x34\n\x12\x43ollSealTimesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\"\xb8\x02\n\x0cQueryRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x04 \x01(\t\x12\x15\n\routput_fields\x18\x05 \x03(\t\x12\x17\n\x0fpartition_names\x18\x06 \x03(\t\x12\x18\n\x10travel_timestamp\x18\x07 \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x08 \x01(\x04\x12\x37\n\x0cquery_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x1b\n\x13not_return_all_meta\x18\n \x01(\x08:\x07\xca>\x04\x10\x10\x18\x03\"\xa0\x01\n\x0cQueryResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x0b\x66ields_data\x18\x02 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x15\n\routput_fields\x18\x04 \x03(\t\"}\n\tVectorIDs\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12*\n\x08id_array\x18\x03 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x83\x01\n\x0cVectorsArray\x12\x32\n\x08id_array\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.milvus.VectorIDsH\x00\x12\x36\n\ndata_array\x18\x02 \x01(\x0b\x32 .milvus.proto.schema.VectorFieldH\x00\x42\x07\n\x05\x61rray\"\xdd\x01\n\x13\x43\x61lcDistanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x32\n\x07op_left\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x33\n\x08op_right\x18\x03 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x31\n\x06params\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb5\x01\n\x13\x43\x61lcDistanceResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x31\n\x08int_dist\x18\x02 \x01(\x0b\x32\x1d.milvus.proto.schema.IntArrayH\x00\x12\x35\n\nfloat_dist\x18\x03 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x42\x07\n\x05\x61rray\"\x11\n\x0f\x46lushAllRequest\"U\n\x10\x46lushAllResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x66lush_all_ts\x18\x02 \x01(\x04\"\x99\x01\n\x15PersistentSegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08num_rows\x18\x04 \x01(\x03\x12\x30\n\x05state\x18\x05 \x01(\x0e\x32!.milvus.proto.common.SegmentState\"u\n\x1fGetPersistentSegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x8a\x01\n GetPersistentSegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x39\n\x05infos\x18\x02 \x03(\x0b\x32*.milvus.proto.milvus.PersistentSegmentInfo\"\xec\x01\n\x10QuerySegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08mem_size\x18\x04 \x01(\x03\x12\x10\n\x08num_rows\x18\x05 \x01(\x03\x12\x12\n\nindex_name\x18\x06 \x01(\t\x12\x0f\n\x07indexID\x18\x07 \x01(\x03\x12\x0e\n\x06nodeID\x18\x08 \x01(\x03\x12\x30\n\x05state\x18\t \x01(\x0e\x32!.milvus.proto.common.SegmentState\x12\x0f\n\x07nodeIds\x18\n \x03(\x03\"p\n\x1aGetQuerySegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x80\x01\n\x1bGetQuerySegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x05infos\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.QuerySegmentInfo\"$\n\x0c\x44ummyRequest\x12\x14\n\x0crequest_type\x18\x01 \x01(\t\"!\n\rDummyResponse\x12\x10\n\x08response\x18\x01 \x01(\t\"\x15\n\x13RegisterLinkRequest\"r\n\x14RegisterLinkResponse\x12-\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.Address\x12+\n\x06status\x18\x02 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"P\n\x11GetMetricsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07request\x18\x02 \x01(\t\"k\n\x12GetMetricsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08response\x18\x02 \x01(\t\x12\x16\n\x0e\x63omponent_name\x18\x03 \x01(\t\"\x98\x01\n\rComponentInfo\x12\x0e\n\x06nodeID\x18\x01 \x01(\x03\x12\x0c\n\x04role\x18\x02 \x01(\t\x12\x32\n\nstate_code\x18\x03 \x01(\x0e\x32\x1e.milvus.proto.common.StateCode\x12\x35\n\nextra_info\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb2\x01\n\x0f\x43omponentStates\x12\x31\n\x05state\x18\x01 \x01(\x0b\x32\".milvus.proto.milvus.ComponentInfo\x12?\n\x13subcomponent_states\x18\x02 \x03(\x0b\x32\".milvus.proto.milvus.ComponentInfo\x12+\n\x06status\x18\x03 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"\x1b\n\x19GetComponentStatesRequest\"\xa5\x01\n\x12LoadBalanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x12\n\nsrc_nodeID\x18\x02 \x01(\x03\x12\x13\n\x0b\x64st_nodeIDs\x18\x03 \x03(\x03\x12\x19\n\x11sealed_segmentIDs\x18\x04 \x03(\x03\x12\x16\n\x0e\x63ollectionName\x18\x05 \x01(\t:\x07\xca>\x04\x10\x11\x18\x05\"L\n\x17ManualCompactionRequest\x12\x14\n\x0c\x63ollectionID\x18\x01 \x01(\x03\x12\x12\n\ntimetravel\x18\x02 \x01(\x04:\x07\xca>\x04\x10\x07\x18\x01\"z\n\x18ManualCompactionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x63ompactionID\x18\x02 \x01(\x03\x12\x1b\n\x13\x63ompactionPlanCount\x18\x03 \x01(\x05\"1\n\x19GetCompactionStateRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xdd\x01\n\x1aGetCompactionStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12\x17\n\x0f\x65xecutingPlanNo\x18\x03 \x01(\x03\x12\x15\n\rtimeoutPlanNo\x18\x04 \x01(\x03\x12\x17\n\x0f\x63ompletedPlanNo\x18\x05 \x01(\x03\x12\x14\n\x0c\x66\x61iledPlanNo\x18\x06 \x01(\x03\"1\n\x19GetCompactionPlansRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xbc\x01\n\x1aGetCompactionPlansResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12<\n\nmergeInfos\x18\x03 \x03(\x0b\x32(.milvus.proto.milvus.CompactionMergeInfo\"6\n\x13\x43ompactionMergeInfo\x12\x0f\n\x07sources\x18\x01 \x03(\x03\x12\x0e\n\x06target\x18\x02 \x01(\x03\"*\n\x14GetFlushStateRequest\x12\x12\n\nsegmentIDs\x18\x01 \x03(\x03\"U\n\x15GetFlushStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"[\n\x17GetFlushAllStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x66lush_all_ts\x18\x02 \x01(\x04\"X\n\x18GetFlushAllStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"\xb6\x01\n\rImportRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x16\n\x0epartition_name\x18\x02 \x01(\t\x12\x15\n\rchannel_names\x18\x03 \x03(\t\x12\x11\n\trow_based\x18\x04 \x01(\x08\x12\r\n\x05\x66iles\x18\x05 \x03(\t\x12\x32\n\x07options\x18\x06 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair:\x07\xca>\x04\x10\x12\x18\x01\"L\n\x0eImportResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05tasks\x18\x02 \x03(\x03\"%\n\x15GetImportStateRequest\x12\x0c\n\x04task\x18\x01 \x01(\x03\"\x97\x02\n\x16GetImportStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12/\n\x05state\x18\x02 \x01(\x0e\x32 .milvus.proto.common.ImportState\x12\x11\n\trow_count\x18\x03 \x01(\x03\x12\x0f\n\x07id_list\x18\x04 \x03(\x03\x12\x30\n\x05infos\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\n\n\x02id\x18\x06 \x01(\x03\x12\x15\n\rcollection_id\x18\x07 \x01(\x03\x12\x13\n\x0bsegment_ids\x18\x08 \x03(\x03\x12\x11\n\tcreate_ts\x18\t \x01(\x03\"@\n\x16ListImportTasksRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\r\n\x05limit\x18\x02 \x01(\x03\"\x82\x01\n\x17ListImportTasksResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x05tasks\x18\x02 \x03(\x0b\x32+.milvus.proto.milvus.GetImportStateResponse\"\x89\x01\n\x12GetReplicasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x18\n\x10with_shard_nodes\x18\x03 \x01(\x08\x12\x17\n\x0f\x63ollection_name\x18\x04 \x01(\t\"v\n\x13GetReplicasResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08replicas\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.ReplicaInfo\"\xc1\x02\n\x0bReplicaInfo\x12\x11\n\treplicaID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x15\n\rpartition_ids\x18\x03 \x03(\x03\x12\x39\n\x0eshard_replicas\x18\x04 \x03(\x0b\x32!.milvus.proto.milvus.ShardReplica\x12\x10\n\x08node_ids\x18\x05 \x03(\x03\x12\x1b\n\x13resource_group_name\x18\x06 \x01(\t\x12P\n\x11num_outbound_node\x18\x07 \x03(\x0b\x32\x35.milvus.proto.milvus.ReplicaInfo.NumOutboundNodeEntry\x1a\x36\n\x14NumOutboundNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"`\n\x0cShardReplica\x12\x10\n\x08leaderID\x18\x01 \x01(\x03\x12\x13\n\x0bleader_addr\x18\x02 \x01(\t\x12\x17\n\x0f\x64m_channel_name\x18\x03 \x01(\t\x12\x10\n\x08node_ids\x18\x04 \x03(\x03\"\xbe\x01\n\x17\x43reateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x10\n\x08password\x18\x03 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x04 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x05 \x01(\x04:\x12\xca>\x0f\x08\x01\x10\x13\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xcd\x01\n\x17UpdateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boldPassword\x18\x03 \x01(\t\x12\x13\n\x0bnewPassword\x18\x04 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x06 \x01(\x04:\t\xca>\x06\x08\x02\x10\x14\x18\x02\"k\n\x17\x44\x65leteCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x15\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"W\n\x15ListCredUsersResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tusernames\x18\x02 \x03(\t\"V\n\x14ListCredUsersRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x1a\n\nRoleEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1a\n\nUserEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x84\x01\n\x11\x43reateRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12/\n\x06\x65ntity\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity:\x12\xca>\x0f\x08\x01\x10\x13\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"d\n\x0f\x44ropRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\trole_name\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x15\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xb5\x01\n\x16OperateUserRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x11\n\trole_name\x18\x03 \x01(\t\x12\x36\n\x04type\x18\x04 \x01(\x0e\x32(.milvus.proto.milvus.OperateUserRoleType:\x12\xca>\x0f\x08\x01\x10\x17\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x9d\x01\n\x11SelectRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04role\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x19\n\x11include_user_info\x18\x03 \x01(\x08:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"k\n\nRoleResult\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12.\n\x05users\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\"s\n\x12SelectRoleResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleResult\"\x94\x01\n\x11SelectUserRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04user\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x19\n\x11include_role_info\x18\x03 \x01(\x08:\t\xca>\x06\x08\x02\x10\x18\x18\x02\"k\n\nUserResult\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12.\n\x05roles\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\"s\n\x12SelectUserResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserResult\"\x1c\n\x0cObjectEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1f\n\x0fPrivilegeEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"w\n\rGrantorEntity\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x37\n\tprivilege\x18\x02 \x01(\x0b\x32$.milvus.proto.milvus.PrivilegeEntity\"L\n\x14GrantPrivilegeEntity\x12\x34\n\x08\x65ntities\x18\x01 \x03(\x0b\x32\".milvus.proto.milvus.GrantorEntity\"\xb9\x01\n\x0bGrantEntity\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x31\n\x06object\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.ObjectEntity\x12\x13\n\x0bobject_name\x18\x03 \x01(\t\x12\x33\n\x07grantor\x18\x04 \x01(\x0b\x32\".milvus.proto.milvus.GrantorEntity\"\x86\x01\n\x12SelectGrantRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"v\n\x13SelectGrantResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08\x65ntities\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.GrantEntity\"\xc4\x01\n\x17OperatePrivilegeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity\x12\x37\n\x04type\x18\x03 \x01(\x0e\x32).milvus.proto.milvus.OperatePrivilegeType:\x12\xca>\x0f\x08\x01\x10\x17\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x82\x01\n\x19GetLoadingProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x17\n\x0f\x63ollection_name\x18\x02 \x01(\t\x12\x17\n\x0fpartition_names\x18\x03 \x03(\t:\x07\xca>\x04\x10 \x18\x02\"u\n\x1aGetLoadingProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08progress\x18\x02 \x01(\x03\x12\x18\n\x10refresh_progress\x18\x03 \x01(\x03\"|\n\x13GetLoadStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x17\n\x0f\x63ollection_name\x18\x02 \x01(\t\x12\x17\n\x0fpartition_names\x18\x03 \x03(\t:\x07\xca>\x04\x10!\x18\x02\"r\n\x14GetLoadStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12-\n\x05state\x18\x02 \x01(\x0e\x32\x1e.milvus.proto.common.LoadState\"\x1c\n\tMilvusExt\x12\x0f\n\x07version\x18\x01 \x01(\t\"\x13\n\x11GetVersionRequest\"R\n\x12GetVersionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07version\x18\x02 \x01(\t\"\x14\n\x12\x43heckHealthRequest\"\x9d\x01\n\x13\x43heckHealthResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tisHealthy\x18\x02 \x01(\x08\x12\x0f\n\x07reasons\x18\x03 \x03(\t\x12\x35\n\x0cquota_states\x18\x04 \x03(\x0e\x32\x1f.milvus.proto.milvus.QuotaState\"t\n\x1a\x43reateResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1a\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"r\n\x18\x44ropResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1b\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xa5\x01\n\x13TransferNodeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x1d\n\x15source_resource_group\x18\x02 \x01(\t\x12\x1d\n\x15target_resource_group\x18\x03 \x01(\t\x12\x10\n\x08num_node\x18\x04 \x01(\x05:\x12\xca>\x0f\x08\x01\x10\x1e\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xc4\x01\n\x16TransferReplicaRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x1d\n\x15source_resource_group\x18\x02 \x01(\t\x12\x1d\n\x15target_resource_group\x18\x03 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x04 \x01(\t\x12\x13\n\x0bnum_replica\x18\x05 \x01(\x03:\x12\xca>\x0f\x08\x01\x10\x1f\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"[\n\x19ListResourceGroupsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10\x1d\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"b\n\x1aListResourceGroupsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fresource_groups\x18\x02 \x03(\t\"v\n\x1c\x44\x65scribeResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1c\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x88\x01\n\x1d\x44\x65scribeResourceGroupResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x0eresource_group\x18\x02 \x01(\x0b\x32\".milvus.proto.milvus.ResourceGroup\"\xf2\x03\n\rResourceGroup\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x63\x61pacity\x18\x02 \x01(\x05\x12\x1a\n\x12num_available_node\x18\x03 \x01(\x05\x12T\n\x12num_loaded_replica\x18\x04 \x03(\x0b\x32\x38.milvus.proto.milvus.ResourceGroup.NumLoadedReplicaEntry\x12R\n\x11num_outgoing_node\x18\x05 \x03(\x0b\x32\x37.milvus.proto.milvus.ResourceGroup.NumOutgoingNodeEntry\x12R\n\x11num_incoming_node\x18\x06 \x03(\x0b\x32\x37.milvus.proto.milvus.ResourceGroup.NumIncomingNodeEntry\x1a\x37\n\x15NumLoadedReplicaEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x36\n\x14NumOutgoingNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x36\n\x14NumIncomingNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"s\n\x17RenameCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\n\n\x02\x64\x62\x18\x02 \x01(\t\x12\x0f\n\x07oldName\x18\x03 \x01(\t\x12\x0f\n\x07newName\x18\x04 \x01(\t\"\x8e\x01\n\x19GetIndexStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nindex_name\x18\x04 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\x8c\x01\n\x1aGetIndexStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"r\n\x0e\x43onnectRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x34\n\x0b\x63lient_info\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.common.ClientInfo\"\x88\x01\n\x0f\x43onnectResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x0bserver_info\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.common.ServerInfo\x12\x12\n\nidentifier\x18\x03 \x01(\x03*!\n\x08ShowType\x12\x07\n\x03\x41ll\x10\x00\x12\x0c\n\x08InMemory\x10\x01*@\n\x13OperateUserRoleType\x12\x11\n\rAddUserToRole\x10\x00\x12\x16\n\x12RemoveUserFromRole\x10\x01*-\n\x14OperatePrivilegeType\x12\t\n\x05Grant\x10\x00\x12\n\n\x06Revoke\x10\x01*]\n\nQuotaState\x12\x0b\n\x07Unknown\x10\x00\x12\x0f\n\x0bReadLimited\x10\x02\x12\x10\n\x0cWriteLimited\x10\x03\x12\x0e\n\nDenyToRead\x10\x04\x12\x0f\n\x0b\x44\x65nyToWrite\x10\x05\x32\xc8<\n\rMilvusService\x12_\n\x10\x43reateCollection\x12,.milvus.proto.milvus.CreateCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12[\n\x0e\x44ropCollection\x12*.milvus.proto.milvus.DropCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\rHasCollection\x12).milvus.proto.milvus.HasCollectionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadCollection\x12*.milvus.proto.milvus.LoadCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleaseCollection\x12-.milvus.proto.milvus.ReleaseCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12\x44\x65scribeCollection\x12..milvus.proto.milvus.DescribeCollectionRequest\x1a/.milvus.proto.milvus.DescribeCollectionResponse\"\x00\x12\x86\x01\n\x17GetCollectionStatistics\x12\x33.milvus.proto.milvus.GetCollectionStatisticsRequest\x1a\x34.milvus.proto.milvus.GetCollectionStatisticsResponse\"\x00\x12n\n\x0fShowCollections\x12+.milvus.proto.milvus.ShowCollectionsRequest\x1a,.milvus.proto.milvus.ShowCollectionsResponse\"\x00\x12]\n\x0f\x41lterCollection\x12+.milvus.proto.milvus.AlterCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0f\x43reatePartition\x12+.milvus.proto.milvus.CreatePartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Y\n\rDropPartition\x12).milvus.proto.milvus.DropPartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0cHasPartition\x12(.milvus.proto.milvus.HasPartitionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadPartitions\x12*.milvus.proto.milvus.LoadPartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleasePartitions\x12-.milvus.proto.milvus.ReleasePartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x83\x01\n\x16GetPartitionStatistics\x12\x32.milvus.proto.milvus.GetPartitionStatisticsRequest\x1a\x33.milvus.proto.milvus.GetPartitionStatisticsResponse\"\x00\x12k\n\x0eShowPartitions\x12*.milvus.proto.milvus.ShowPartitionsRequest\x1a+.milvus.proto.milvus.ShowPartitionsResponse\"\x00\x12w\n\x12GetLoadingProgress\x12..milvus.proto.milvus.GetLoadingProgressRequest\x1a/.milvus.proto.milvus.GetLoadingProgressResponse\"\x00\x12\x65\n\x0cGetLoadState\x12(.milvus.proto.milvus.GetLoadStateRequest\x1a).milvus.proto.milvus.GetLoadStateResponse\"\x00\x12U\n\x0b\x43reateAlias\x12\'.milvus.proto.milvus.CreateAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Q\n\tDropAlias\x12%.milvus.proto.milvus.DropAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\nAlterAlias\x12&.milvus.proto.milvus.AlterAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rDescribeAlias\x12).milvus.proto.milvus.DescribeAliasRequest\x1a*.milvus.proto.milvus.DescribeAliasResponse\"\x00\x12\x62\n\x0bListAliases\x12\'.milvus.proto.milvus.ListAliasesRequest\x1a(.milvus.proto.milvus.ListAliasesResponse\"\x00\x12U\n\x0b\x43reateIndex\x12\'.milvus.proto.milvus.CreateIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rDescribeIndex\x12).milvus.proto.milvus.DescribeIndexRequest\x1a*.milvus.proto.milvus.DescribeIndexResponse\"\x00\x12w\n\x12GetIndexStatistics\x12..milvus.proto.milvus.GetIndexStatisticsRequest\x1a/.milvus.proto.milvus.GetIndexStatisticsResponse\"\x00\x12h\n\rGetIndexState\x12).milvus.proto.milvus.GetIndexStateRequest\x1a*.milvus.proto.milvus.GetIndexStateResponse\"\x00\x12\x80\x01\n\x15GetIndexBuildProgress\x12\x31.milvus.proto.milvus.GetIndexBuildProgressRequest\x1a\x32.milvus.proto.milvus.GetIndexBuildProgressResponse\"\x00\x12Q\n\tDropIndex\x12%.milvus.proto.milvus.DropIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\x06Insert\x12\".milvus.proto.milvus.InsertRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12S\n\x06\x44\x65lete\x12\".milvus.proto.milvus.DeleteRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12S\n\x06Upsert\x12\".milvus.proto.milvus.UpsertRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12R\n\x06Search\x12\".milvus.proto.milvus.SearchRequest\x1a\".milvus.proto.milvus.SearchResults\"\x00\x12P\n\x05\x46lush\x12!.milvus.proto.milvus.FlushRequest\x1a\".milvus.proto.milvus.FlushResponse\"\x00\x12O\n\x05Query\x12!.milvus.proto.milvus.QueryRequest\x1a!.milvus.proto.milvus.QueryResults\"\x00\x12\x64\n\x0c\x43\x61lcDistance\x12(.milvus.proto.milvus.CalcDistanceRequest\x1a(.milvus.proto.milvus.CalcDistanceResults\"\x00\x12Y\n\x08\x46lushAll\x12$.milvus.proto.milvus.FlushAllRequest\x1a%.milvus.proto.milvus.FlushAllResponse\"\x00\x12h\n\rGetFlushState\x12).milvus.proto.milvus.GetFlushStateRequest\x1a*.milvus.proto.milvus.GetFlushStateResponse\"\x00\x12q\n\x10GetFlushAllState\x12,.milvus.proto.milvus.GetFlushAllStateRequest\x1a-.milvus.proto.milvus.GetFlushAllStateResponse\"\x00\x12\x89\x01\n\x18GetPersistentSegmentInfo\x12\x34.milvus.proto.milvus.GetPersistentSegmentInfoRequest\x1a\x35.milvus.proto.milvus.GetPersistentSegmentInfoResponse\"\x00\x12z\n\x13GetQuerySegmentInfo\x12/.milvus.proto.milvus.GetQuerySegmentInfoRequest\x1a\x30.milvus.proto.milvus.GetQuerySegmentInfoResponse\"\x00\x12\x62\n\x0bGetReplicas\x12\'.milvus.proto.milvus.GetReplicasRequest\x1a(.milvus.proto.milvus.GetReplicasResponse\"\x00\x12P\n\x05\x44ummy\x12!.milvus.proto.milvus.DummyRequest\x1a\".milvus.proto.milvus.DummyResponse\"\x00\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00\x12_\n\nGetMetrics\x12&.milvus.proto.milvus.GetMetricsRequest\x1a\'.milvus.proto.milvus.GetMetricsResponse\"\x00\x12l\n\x12GetComponentStates\x12..milvus.proto.milvus.GetComponentStatesRequest\x1a$.milvus.proto.milvus.ComponentStates\"\x00\x12U\n\x0bLoadBalance\x12\'.milvus.proto.milvus.LoadBalanceRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12GetCompactionState\x12..milvus.proto.milvus.GetCompactionStateRequest\x1a/.milvus.proto.milvus.GetCompactionStateResponse\"\x00\x12q\n\x10ManualCompaction\x12,.milvus.proto.milvus.ManualCompactionRequest\x1a-.milvus.proto.milvus.ManualCompactionResponse\"\x00\x12\x80\x01\n\x1bGetCompactionStateWithPlans\x12..milvus.proto.milvus.GetCompactionPlansRequest\x1a/.milvus.proto.milvus.GetCompactionPlansResponse\"\x00\x12S\n\x06Import\x12\".milvus.proto.milvus.ImportRequest\x1a#.milvus.proto.milvus.ImportResponse\"\x00\x12k\n\x0eGetImportState\x12*.milvus.proto.milvus.GetImportStateRequest\x1a+.milvus.proto.milvus.GetImportStateResponse\"\x00\x12n\n\x0fListImportTasks\x12+.milvus.proto.milvus.ListImportTasksRequest\x1a,.milvus.proto.milvus.ListImportTasksResponse\"\x00\x12_\n\x10\x43reateCredential\x12,.milvus.proto.milvus.CreateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10UpdateCredential\x12,.milvus.proto.milvus.UpdateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10\x44\x65leteCredential\x12,.milvus.proto.milvus.DeleteCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rListCredUsers\x12).milvus.proto.milvus.ListCredUsersRequest\x1a*.milvus.proto.milvus.ListCredUsersResponse\"\x00\x12S\n\nCreateRole\x12&.milvus.proto.milvus.CreateRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12O\n\x08\x44ropRole\x12$.milvus.proto.milvus.DropRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fOperateUserRole\x12+.milvus.proto.milvus.OperateUserRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\nSelectRole\x12&.milvus.proto.milvus.SelectRoleRequest\x1a\'.milvus.proto.milvus.SelectRoleResponse\"\x00\x12_\n\nSelectUser\x12&.milvus.proto.milvus.SelectUserRequest\x1a\'.milvus.proto.milvus.SelectUserResponse\"\x00\x12_\n\x10OperatePrivilege\x12,.milvus.proto.milvus.OperatePrivilegeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x62\n\x0bSelectGrant\x12\'.milvus.proto.milvus.SelectGrantRequest\x1a(.milvus.proto.milvus.SelectGrantResponse\"\x00\x12_\n\nGetVersion\x12&.milvus.proto.milvus.GetVersionRequest\x1a\'.milvus.proto.milvus.GetVersionResponse\"\x00\x12\x62\n\x0b\x43heckHealth\x12\'.milvus.proto.milvus.CheckHealthRequest\x1a(.milvus.proto.milvus.CheckHealthResponse\"\x00\x12\x65\n\x13\x43reateResourceGroup\x12/.milvus.proto.milvus.CreateResourceGroupRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11\x44ropResourceGroup\x12-.milvus.proto.milvus.DropResourceGroupRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12W\n\x0cTransferNode\x12(.milvus.proto.milvus.TransferNodeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fTransferReplica\x12+.milvus.proto.milvus.TransferReplicaRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12ListResourceGroups\x12..milvus.proto.milvus.ListResourceGroupsRequest\x1a/.milvus.proto.milvus.ListResourceGroupsResponse\"\x00\x12\x80\x01\n\x15\x44\x65scribeResourceGroup\x12\x31.milvus.proto.milvus.DescribeResourceGroupRequest\x1a\x32.milvus.proto.milvus.DescribeResourceGroupResponse\"\x00\x12_\n\x10RenameCollection\x12,.milvus.proto.milvus.RenameCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12u\n\x12ListIndexedSegment\x12-.milvus.proto.feder.ListIndexedSegmentRequest\x1a..milvus.proto.feder.ListIndexedSegmentResponse\"\x00\x12\x87\x01\n\x18\x44\x65scribeSegmentIndexData\x12\x33.milvus.proto.feder.DescribeSegmentIndexDataRequest\x1a\x34.milvus.proto.feder.DescribeSegmentIndexDataResponse\"\x00\x12V\n\x07\x43onnect\x12#.milvus.proto.milvus.ConnectRequest\x1a$.milvus.proto.milvus.ConnectResponse\"\x00\x32u\n\x0cProxyService\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00:U\n\x0emilvus_ext_obj\x12\x1c.google.protobuf.FileOptions\x18\xe9\x07 \x01(\x0b\x32\x1e.milvus.proto.milvus.MilvusExtBf\n\x0eio.milvus.grpcB\x0bMilvusProtoP\x01Z1github.com/milvus-io/milvus-proto/go-api/milvuspb\xa0\x01\x01\xaa\x02\x0eIO.Milvus.Grpcb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cmilvus.proto\x12\x13milvus.proto.milvus\x1a\x0c\x63ommon.proto\x1a\x0cschema.proto\x1a\x0b\x66\x65\x64\x65r.proto\x1a google/protobuf/descriptor.proto\"y\n\x12\x43reateAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"^\n\x10\x44ropAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\"x\n\x11\x41lterAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"b\n\x14\x44\x65scribeAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\"x\n\x15\x44\x65scribeAliasResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\x12\x12\n\ncollection\x18\x04 \x01(\t\"j\n\x12ListAliasesRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"}\n\x13ListAliasesResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0f\n\x07\x61liases\x18\x04 \x03(\t\"\xb8\x02\n\x17\x43reateCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0e\n\x06schema\x18\x04 \x01(\x0c\x12\x12\n\nshards_num\x18\x05 \x01(\x05\x12@\n\x11\x63onsistency_level\x18\x06 \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x35\n\nproperties\x18\x07 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x16\n\x0enum_partitions\x18\x08 \x01(\x03:\x12\xca>\x0f\x08\x01\x10\x01\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x81\x01\n\x15\x44ropCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x02\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xcf\x01\n\x16\x41lterCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x35\n\nproperties\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair:\x12\xca>\x0f\x08\x01\x10\x01\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x80\x01\n\x14HasCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\ntime_stamp\x18\x04 \x01(\x04\"J\n\x0c\x42oolResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\x08\"L\n\x0eStringResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\t\"\xaf\x01\n\x19\x44\x65scribeCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x12\n\ntime_stamp\x18\x05 \x01(\x04:\x12\xca>\x0f\x08\x01\x10\x03\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xaa\x04\n\x1a\x44\x65scribeCollectionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x35\n\x06schema\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.CollectionSchema\x12\x14\n\x0c\x63ollectionID\x18\x03 \x01(\x03\x12\x1d\n\x15virtual_channel_names\x18\x04 \x03(\t\x12\x1e\n\x16physical_channel_names\x18\x05 \x03(\t\x12\x19\n\x11\x63reated_timestamp\x18\x06 \x01(\x04\x12\x1d\n\x15\x63reated_utc_timestamp\x18\x07 \x01(\x04\x12\x12\n\nshards_num\x18\x08 \x01(\x05\x12\x0f\n\x07\x61liases\x18\t \x03(\t\x12\x39\n\x0fstart_positions\x18\n \x03(\x0b\x32 .milvus.proto.common.KeyDataPair\x12@\n\x11\x63onsistency_level\x18\x0b \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x17\n\x0f\x63ollection_name\x18\x0c \x01(\t\x12\x35\n\nproperties\x18\r \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x0f\n\x07\x64\x62_name\x18\x0e \x01(\t\x12\x16\n\x0enum_partitions\x18\x0f \x01(\x03\"\xb8\x01\n\x15LoadCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0ereplica_number\x18\x04 \x01(\x05\x12\x17\n\x0fresource_groups\x18\x05 \x03(\t\x12\x0f\n\x07refresh\x18\x06 \x01(\x08:\x07\xca>\x04\x10\x05\x18\x03\"y\n\x18ReleaseCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x06\x18\x03\"\xab\x01\n\x14GetStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x1b\n\x13guarantee_timestamp\x18\x05 \x01(\x04:\x07\xca>\x04\x10\n\x18\x03\"v\n\x15GetStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\x7f\n\x1eGetCollectionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\n\x18\x03\"\x80\x01\n\x1fGetCollectionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc4\x01\n\x16ShowCollectionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x12\n\ntime_stamp\x18\x03 \x01(\x04\x12+\n\x04type\x18\x04 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\x12\x18\n\x10\x63ollection_names\x18\x05 \x03(\t:\x12\xca>\x0f\x08\x01\x10\x04\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xf3\x01\n\x17ShowCollectionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x18\n\x10\x63ollection_names\x18\x02 \x03(\t\x12\x16\n\x0e\x63ollection_ids\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\x12\x1f\n\x17query_service_available\x18\x07 \x03(\x08\"\x86\x01\n\x16\x43reatePartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x84\x01\n\x14\x44ropPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x83\x01\n\x13HasPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\xc8\x01\n\x15LoadPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x16\n\x0ereplica_number\x18\x05 \x01(\x05\x12\x17\n\x0fresource_groups\x18\x06 \x03(\t\x12\x0f\n\x07refresh\x18\x07 \x01(\x08\"\x89\x01\n\x18ReleasePartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x8d\x01\n\x1dGetPartitionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x7f\n\x1eGetPartitionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc9\x01\n\x15ShowPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x17\n\x0fpartition_names\x18\x05 \x03(\t\x12+\n\x04type\x18\x06 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\"\xce\x01\n\x16ShowPartitionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fpartition_names\x18\x02 \x03(\t\x12\x14\n\x0cpartitionIDs\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\"m\n\x16\x44\x65scribeSegmentRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x11\n\tsegmentID\x18\x03 \x01(\x03\"\x8f\x01\n\x17\x44\x65scribeSegmentResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x0f\n\x07\x62uildID\x18\x03 \x01(\x03\x12\x14\n\x0c\x65nable_index\x18\x04 \x01(\x08\x12\x0f\n\x07\x66ieldID\x18\x05 \x01(\x03\"l\n\x13ShowSegmentsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\"W\n\x14ShowSegmentsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x12\n\nsegmentIDs\x18\x02 \x03(\x03\"\xd4\x01\n\x12\x43reateIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x37\n\x0c\x65xtra_params\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nindex_name\x18\x06 \x01(\t:\x07\xca>\x04\x10\x0b\x18\x03\"\x9d\x01\n\x14\x44\x65scribeIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\xf9\x01\n\x10IndexDescription\x12\x12\n\nindex_name\x18\x01 \x01(\t\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x31\n\x06params\x18\x03 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x14\n\x0cindexed_rows\x18\x05 \x01(\x03\x12\x12\n\ntotal_rows\x18\x06 \x01(\x03\x12.\n\x05state\x18\x07 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x1f\n\x17index_state_fail_reason\x18\x08 \x01(\t\"\x87\x01\n\x15\x44\x65scribeIndexResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"\xa5\x01\n\x1cGetIndexBuildProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"v\n\x1dGetIndexBuildProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0cindexed_rows\x18\x02 \x01(\x03\x12\x12\n\ntotal_rows\x18\x03 \x01(\x03\"\x9d\x01\n\x14GetIndexStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\x89\x01\n\x15GetIndexStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12.\n\x05state\x18\x02 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x13\n\x0b\x66\x61il_reason\x18\x03 \x01(\t\"\x99\x01\n\x10\x44ropIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t:\x07\xca>\x04\x10\r\x18\x03\"\xe0\x01\n\rInsertRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x33\n\x0b\x66ields_data\x18\x05 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x11\n\thash_keys\x18\x06 \x03(\r\x12\x10\n\x08num_rows\x18\x07 \x01(\r:\x07\xca>\x04\x10\x08\x18\x03\"\xe0\x01\n\rUpsertRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x33\n\x0b\x66ields_data\x18\x05 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x11\n\thash_keys\x18\x06 \x03(\r\x12\x10\n\x08num_rows\x18\x07 \x01(\r:\x07\xca>\x04\x10\x19\x18\x03\"\xf0\x01\n\x0eMutationResult\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12%\n\x03IDs\x18\x02 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x12\n\nsucc_index\x18\x03 \x03(\r\x12\x11\n\terr_index\x18\x04 \x03(\r\x12\x14\n\x0c\x61\x63knowledged\x18\x05 \x01(\x08\x12\x12\n\ninsert_cnt\x18\x06 \x01(\x03\x12\x12\n\ndelete_cnt\x18\x07 \x01(\x03\x12\x12\n\nupsert_cnt\x18\x08 \x01(\x03\x12\x11\n\ttimestamp\x18\t \x01(\x04\"\xa7\x01\n\rDeleteRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x05 \x01(\t\x12\x11\n\thash_keys\x18\x06 \x03(\r:\x07\xca>\x04\x10\t\x18\x03\"\xf3\x03\n\rSearchRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x0b\n\x03\x64sl\x18\x05 \x01(\t\x12\x19\n\x11placeholder_group\x18\x06 \x01(\x0c\x12.\n\x08\x64sl_type\x18\x07 \x01(\x0e\x32\x1c.milvus.proto.common.DslType\x12\x15\n\routput_fields\x18\x08 \x03(\t\x12\x38\n\rsearch_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x18\n\x10travel_timestamp\x18\n \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x0b \x01(\x04\x12\n\n\x02nq\x18\x0c \x01(\x03\x12\x1b\n\x13not_return_all_meta\x18\r \x01(\x08\x12@\n\x11\x63onsistency_level\x18\x0e \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x1f\n\x17use_default_consistency\x18\x0f \x01(\x08:\x07\xca>\x04\x10\x0e\x18\x03\"5\n\x04Hits\x12\x0b\n\x03IDs\x18\x01 \x03(\x03\x12\x10\n\x08row_data\x18\x02 \x03(\x0c\x12\x0e\n\x06scores\x18\x03 \x03(\x02\"\x8d\x01\n\rSearchResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x36\n\x07results\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.SearchResultData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"n\n\x0c\x46lushRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x18\n\x10\x63ollection_names\x18\x03 \x03(\t:\x07\xca>\x04\x10\x0f \x03\"\x9b\x04\n\rFlushResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12G\n\x0b\x63oll_segIDs\x18\x03 \x03(\x0b\x32\x32.milvus.proto.milvus.FlushResponse.CollSegIDsEntry\x12R\n\x11\x66lush_coll_segIDs\x18\x04 \x03(\x0b\x32\x37.milvus.proto.milvus.FlushResponse.FlushCollSegIDsEntry\x12N\n\x0f\x63oll_seal_times\x18\x05 \x03(\x0b\x32\x35.milvus.proto.milvus.FlushResponse.CollSealTimesEntry\x1aQ\n\x0f\x43ollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\x1aV\n\x14\x46lushCollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\x1a\x34\n\x12\x43ollSealTimesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x03:\x02\x38\x01\"\x9b\x03\n\x0cQueryRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x04 \x01(\t\x12\x15\n\routput_fields\x18\x05 \x03(\t\x12\x17\n\x0fpartition_names\x18\x06 \x03(\t\x12\x18\n\x10travel_timestamp\x18\x07 \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x08 \x01(\x04\x12\x37\n\x0cquery_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x1b\n\x13not_return_all_meta\x18\n \x01(\x08\x12@\n\x11\x63onsistency_level\x18\x0b \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x1f\n\x17use_default_consistency\x18\x0c \x01(\x08:\x07\xca>\x04\x10\x10\x18\x03\"\xa0\x01\n\x0cQueryResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x0b\x66ields_data\x18\x02 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x15\n\routput_fields\x18\x04 \x03(\t\"}\n\tVectorIDs\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12*\n\x08id_array\x18\x03 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x83\x01\n\x0cVectorsArray\x12\x32\n\x08id_array\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.milvus.VectorIDsH\x00\x12\x36\n\ndata_array\x18\x02 \x01(\x0b\x32 .milvus.proto.schema.VectorFieldH\x00\x42\x07\n\x05\x61rray\"\xdd\x01\n\x13\x43\x61lcDistanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x32\n\x07op_left\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x33\n\x08op_right\x18\x03 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x31\n\x06params\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb5\x01\n\x13\x43\x61lcDistanceResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x31\n\x08int_dist\x18\x02 \x01(\x0b\x32\x1d.milvus.proto.schema.IntArrayH\x00\x12\x35\n\nfloat_dist\x18\x03 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x42\x07\n\x05\x61rray\"\x11\n\x0f\x46lushAllRequest\"U\n\x10\x46lushAllResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x66lush_all_ts\x18\x02 \x01(\x04\"\x99\x01\n\x15PersistentSegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08num_rows\x18\x04 \x01(\x03\x12\x30\n\x05state\x18\x05 \x01(\x0e\x32!.milvus.proto.common.SegmentState\"u\n\x1fGetPersistentSegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x8a\x01\n GetPersistentSegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x39\n\x05infos\x18\x02 \x03(\x0b\x32*.milvus.proto.milvus.PersistentSegmentInfo\"\xec\x01\n\x10QuerySegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08mem_size\x18\x04 \x01(\x03\x12\x10\n\x08num_rows\x18\x05 \x01(\x03\x12\x12\n\nindex_name\x18\x06 \x01(\t\x12\x0f\n\x07indexID\x18\x07 \x01(\x03\x12\x0e\n\x06nodeID\x18\x08 \x01(\x03\x12\x30\n\x05state\x18\t \x01(\x0e\x32!.milvus.proto.common.SegmentState\x12\x0f\n\x07nodeIds\x18\n \x03(\x03\"p\n\x1aGetQuerySegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x80\x01\n\x1bGetQuerySegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x05infos\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.QuerySegmentInfo\"$\n\x0c\x44ummyRequest\x12\x14\n\x0crequest_type\x18\x01 \x01(\t\"!\n\rDummyResponse\x12\x10\n\x08response\x18\x01 \x01(\t\"\x15\n\x13RegisterLinkRequest\"r\n\x14RegisterLinkResponse\x12-\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.Address\x12+\n\x06status\x18\x02 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"P\n\x11GetMetricsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07request\x18\x02 \x01(\t\"k\n\x12GetMetricsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08response\x18\x02 \x01(\t\x12\x16\n\x0e\x63omponent_name\x18\x03 \x01(\t\"\x98\x01\n\rComponentInfo\x12\x0e\n\x06nodeID\x18\x01 \x01(\x03\x12\x0c\n\x04role\x18\x02 \x01(\t\x12\x32\n\nstate_code\x18\x03 \x01(\x0e\x32\x1e.milvus.proto.common.StateCode\x12\x35\n\nextra_info\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb2\x01\n\x0f\x43omponentStates\x12\x31\n\x05state\x18\x01 \x01(\x0b\x32\".milvus.proto.milvus.ComponentInfo\x12?\n\x13subcomponent_states\x18\x02 \x03(\x0b\x32\".milvus.proto.milvus.ComponentInfo\x12+\n\x06status\x18\x03 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"\x1b\n\x19GetComponentStatesRequest\"\xa5\x01\n\x12LoadBalanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x12\n\nsrc_nodeID\x18\x02 \x01(\x03\x12\x13\n\x0b\x64st_nodeIDs\x18\x03 \x03(\x03\x12\x19\n\x11sealed_segmentIDs\x18\x04 \x03(\x03\x12\x16\n\x0e\x63ollectionName\x18\x05 \x01(\t:\x07\xca>\x04\x10\x11\x18\x05\"L\n\x17ManualCompactionRequest\x12\x14\n\x0c\x63ollectionID\x18\x01 \x01(\x03\x12\x12\n\ntimetravel\x18\x02 \x01(\x04:\x07\xca>\x04\x10\x07\x18\x01\"z\n\x18ManualCompactionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x63ompactionID\x18\x02 \x01(\x03\x12\x1b\n\x13\x63ompactionPlanCount\x18\x03 \x01(\x05\"1\n\x19GetCompactionStateRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xdd\x01\n\x1aGetCompactionStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12\x17\n\x0f\x65xecutingPlanNo\x18\x03 \x01(\x03\x12\x15\n\rtimeoutPlanNo\x18\x04 \x01(\x03\x12\x17\n\x0f\x63ompletedPlanNo\x18\x05 \x01(\x03\x12\x14\n\x0c\x66\x61iledPlanNo\x18\x06 \x01(\x03\"1\n\x19GetCompactionPlansRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xbc\x01\n\x1aGetCompactionPlansResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12<\n\nmergeInfos\x18\x03 \x03(\x0b\x32(.milvus.proto.milvus.CompactionMergeInfo\"6\n\x13\x43ompactionMergeInfo\x12\x0f\n\x07sources\x18\x01 \x03(\x03\x12\x0e\n\x06target\x18\x02 \x01(\x03\"*\n\x14GetFlushStateRequest\x12\x12\n\nsegmentIDs\x18\x01 \x03(\x03\"U\n\x15GetFlushStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"[\n\x17GetFlushAllStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x66lush_all_ts\x18\x02 \x01(\x04\"X\n\x18GetFlushAllStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"\xb6\x01\n\rImportRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x16\n\x0epartition_name\x18\x02 \x01(\t\x12\x15\n\rchannel_names\x18\x03 \x03(\t\x12\x11\n\trow_based\x18\x04 \x01(\x08\x12\r\n\x05\x66iles\x18\x05 \x03(\t\x12\x32\n\x07options\x18\x06 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair:\x07\xca>\x04\x10\x12\x18\x01\"L\n\x0eImportResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05tasks\x18\x02 \x03(\x03\"%\n\x15GetImportStateRequest\x12\x0c\n\x04task\x18\x01 \x01(\x03\"\x97\x02\n\x16GetImportStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12/\n\x05state\x18\x02 \x01(\x0e\x32 .milvus.proto.common.ImportState\x12\x11\n\trow_count\x18\x03 \x01(\x03\x12\x0f\n\x07id_list\x18\x04 \x03(\x03\x12\x30\n\x05infos\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\n\n\x02id\x18\x06 \x01(\x03\x12\x15\n\rcollection_id\x18\x07 \x01(\x03\x12\x13\n\x0bsegment_ids\x18\x08 \x03(\x03\x12\x11\n\tcreate_ts\x18\t \x01(\x03\"@\n\x16ListImportTasksRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\r\n\x05limit\x18\x02 \x01(\x03\"\x82\x01\n\x17ListImportTasksResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x05tasks\x18\x02 \x03(\x0b\x32+.milvus.proto.milvus.GetImportStateResponse\"\x89\x01\n\x12GetReplicasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x18\n\x10with_shard_nodes\x18\x03 \x01(\x08\x12\x17\n\x0f\x63ollection_name\x18\x04 \x01(\t\"v\n\x13GetReplicasResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08replicas\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.ReplicaInfo\"\xc1\x02\n\x0bReplicaInfo\x12\x11\n\treplicaID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x15\n\rpartition_ids\x18\x03 \x03(\x03\x12\x39\n\x0eshard_replicas\x18\x04 \x03(\x0b\x32!.milvus.proto.milvus.ShardReplica\x12\x10\n\x08node_ids\x18\x05 \x03(\x03\x12\x1b\n\x13resource_group_name\x18\x06 \x01(\t\x12P\n\x11num_outbound_node\x18\x07 \x03(\x0b\x32\x35.milvus.proto.milvus.ReplicaInfo.NumOutboundNodeEntry\x1a\x36\n\x14NumOutboundNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"`\n\x0cShardReplica\x12\x10\n\x08leaderID\x18\x01 \x01(\x03\x12\x13\n\x0bleader_addr\x18\x02 \x01(\t\x12\x17\n\x0f\x64m_channel_name\x18\x03 \x01(\t\x12\x10\n\x08node_ids\x18\x04 \x03(\x03\"\xbe\x01\n\x17\x43reateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x10\n\x08password\x18\x03 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x04 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x05 \x01(\x04:\x12\xca>\x0f\x08\x01\x10\x13\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xcd\x01\n\x17UpdateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boldPassword\x18\x03 \x01(\t\x12\x13\n\x0bnewPassword\x18\x04 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x06 \x01(\x04:\t\xca>\x06\x08\x02\x10\x14\x18\x02\"k\n\x17\x44\x65leteCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x15\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"W\n\x15ListCredUsersResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tusernames\x18\x02 \x03(\t\"V\n\x14ListCredUsersRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x1a\n\nRoleEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1a\n\nUserEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x84\x01\n\x11\x43reateRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12/\n\x06\x65ntity\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity:\x12\xca>\x0f\x08\x01\x10\x13\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"d\n\x0f\x44ropRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\trole_name\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x15\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xb5\x01\n\x16OperateUserRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x11\n\trole_name\x18\x03 \x01(\t\x12\x36\n\x04type\x18\x04 \x01(\x0e\x32(.milvus.proto.milvus.OperateUserRoleType:\x12\xca>\x0f\x08\x01\x10\x17\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x9d\x01\n\x11SelectRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04role\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x19\n\x11include_user_info\x18\x03 \x01(\x08:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"k\n\nRoleResult\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12.\n\x05users\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\"s\n\x12SelectRoleResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleResult\"\x94\x01\n\x11SelectUserRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04user\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x19\n\x11include_role_info\x18\x03 \x01(\x08:\t\xca>\x06\x08\x02\x10\x18\x18\x02\"k\n\nUserResult\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12.\n\x05roles\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\"s\n\x12SelectUserResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserResult\"\x1c\n\x0cObjectEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1f\n\x0fPrivilegeEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"w\n\rGrantorEntity\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x37\n\tprivilege\x18\x02 \x01(\x0b\x32$.milvus.proto.milvus.PrivilegeEntity\"L\n\x14GrantPrivilegeEntity\x12\x34\n\x08\x65ntities\x18\x01 \x03(\x0b\x32\".milvus.proto.milvus.GrantorEntity\"\xb9\x01\n\x0bGrantEntity\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x31\n\x06object\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.ObjectEntity\x12\x13\n\x0bobject_name\x18\x03 \x01(\t\x12\x33\n\x07grantor\x18\x04 \x01(\x0b\x32\".milvus.proto.milvus.GrantorEntity\"\x86\x01\n\x12SelectGrantRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity:\x12\xca>\x0f\x08\x01\x10\x16\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"v\n\x13SelectGrantResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08\x65ntities\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.GrantEntity\"\xc4\x01\n\x17OperatePrivilegeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity\x12\x37\n\x04type\x18\x03 \x01(\x0e\x32).milvus.proto.milvus.OperatePrivilegeType:\x12\xca>\x0f\x08\x01\x10\x17\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x82\x01\n\x19GetLoadingProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x17\n\x0f\x63ollection_name\x18\x02 \x01(\t\x12\x17\n\x0fpartition_names\x18\x03 \x03(\t:\x07\xca>\x04\x10 \x18\x02\"u\n\x1aGetLoadingProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08progress\x18\x02 \x01(\x03\x12\x18\n\x10refresh_progress\x18\x03 \x01(\x03\"|\n\x13GetLoadStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x17\n\x0f\x63ollection_name\x18\x02 \x01(\t\x12\x17\n\x0fpartition_names\x18\x03 \x03(\t:\x07\xca>\x04\x10!\x18\x02\"r\n\x14GetLoadStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12-\n\x05state\x18\x02 \x01(\x0e\x32\x1e.milvus.proto.common.LoadState\"\x1c\n\tMilvusExt\x12\x0f\n\x07version\x18\x01 \x01(\t\"\x13\n\x11GetVersionRequest\"R\n\x12GetVersionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07version\x18\x02 \x01(\t\"\x14\n\x12\x43heckHealthRequest\"\x9d\x01\n\x13\x43heckHealthResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tisHealthy\x18\x02 \x01(\x08\x12\x0f\n\x07reasons\x18\x03 \x03(\t\x12\x35\n\x0cquota_states\x18\x04 \x03(\x0e\x32\x1f.milvus.proto.milvus.QuotaState\"t\n\x1a\x43reateResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1a\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"r\n\x18\x44ropResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1b\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xa5\x01\n\x13TransferNodeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x1d\n\x15source_resource_group\x18\x02 \x01(\t\x12\x1d\n\x15target_resource_group\x18\x03 \x01(\t\x12\x10\n\x08num_node\x18\x04 \x01(\x05:\x12\xca>\x0f\x08\x01\x10\x1e\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\xc4\x01\n\x16TransferReplicaRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x1d\n\x15source_resource_group\x18\x02 \x01(\t\x12\x1d\n\x15target_resource_group\x18\x03 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x04 \x01(\t\x12\x13\n\x0bnum_replica\x18\x05 \x01(\x03:\x12\xca>\x0f\x08\x01\x10\x1f\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"[\n\x19ListResourceGroupsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase:\x12\xca>\x0f\x08\x01\x10\x1d\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"b\n\x1aListResourceGroupsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fresource_groups\x18\x02 \x03(\t\"v\n\x1c\x44\x65scribeResourceGroupRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x16\n\x0eresource_group\x18\x02 \x01(\t:\x12\xca>\x0f\x08\x01\x10\x1c\x18\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\"\x88\x01\n\x1d\x44\x65scribeResourceGroupResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x0eresource_group\x18\x02 \x01(\x0b\x32\".milvus.proto.milvus.ResourceGroup\"\xf2\x03\n\rResourceGroup\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x63\x61pacity\x18\x02 \x01(\x05\x12\x1a\n\x12num_available_node\x18\x03 \x01(\x05\x12T\n\x12num_loaded_replica\x18\x04 \x03(\x0b\x32\x38.milvus.proto.milvus.ResourceGroup.NumLoadedReplicaEntry\x12R\n\x11num_outgoing_node\x18\x05 \x03(\x0b\x32\x37.milvus.proto.milvus.ResourceGroup.NumOutgoingNodeEntry\x12R\n\x11num_incoming_node\x18\x06 \x03(\x0b\x32\x37.milvus.proto.milvus.ResourceGroup.NumIncomingNodeEntry\x1a\x37\n\x15NumLoadedReplicaEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x36\n\x14NumOutgoingNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x36\n\x14NumIncomingNodeEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"s\n\x17RenameCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\n\n\x02\x64\x62\x18\x02 \x01(\t\x12\x0f\n\x07oldName\x18\x03 \x01(\t\x12\x0f\n\x07newName\x18\x04 \x01(\t\"\x8e\x01\n\x19GetIndexStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nindex_name\x18\x04 \x01(\t:\x07\xca>\x04\x10\x0c\x18\x03\"\x8c\x01\n\x1aGetIndexStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"r\n\x0e\x43onnectRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x34\n\x0b\x63lient_info\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.common.ClientInfo\"\x88\x01\n\x0f\x43onnectResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x0bserver_info\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.common.ServerInfo\x12\x12\n\nidentifier\x18\x03 \x01(\x03*!\n\x08ShowType\x12\x07\n\x03\x41ll\x10\x00\x12\x0c\n\x08InMemory\x10\x01*@\n\x13OperateUserRoleType\x12\x11\n\rAddUserToRole\x10\x00\x12\x16\n\x12RemoveUserFromRole\x10\x01*-\n\x14OperatePrivilegeType\x12\t\n\x05Grant\x10\x00\x12\n\n\x06Revoke\x10\x01*]\n\nQuotaState\x12\x0b\n\x07Unknown\x10\x00\x12\x0f\n\x0bReadLimited\x10\x02\x12\x10\n\x0cWriteLimited\x10\x03\x12\x0e\n\nDenyToRead\x10\x04\x12\x0f\n\x0b\x44\x65nyToWrite\x10\x05\x32\xc8<\n\rMilvusService\x12_\n\x10\x43reateCollection\x12,.milvus.proto.milvus.CreateCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12[\n\x0e\x44ropCollection\x12*.milvus.proto.milvus.DropCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\rHasCollection\x12).milvus.proto.milvus.HasCollectionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadCollection\x12*.milvus.proto.milvus.LoadCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleaseCollection\x12-.milvus.proto.milvus.ReleaseCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12\x44\x65scribeCollection\x12..milvus.proto.milvus.DescribeCollectionRequest\x1a/.milvus.proto.milvus.DescribeCollectionResponse\"\x00\x12\x86\x01\n\x17GetCollectionStatistics\x12\x33.milvus.proto.milvus.GetCollectionStatisticsRequest\x1a\x34.milvus.proto.milvus.GetCollectionStatisticsResponse\"\x00\x12n\n\x0fShowCollections\x12+.milvus.proto.milvus.ShowCollectionsRequest\x1a,.milvus.proto.milvus.ShowCollectionsResponse\"\x00\x12]\n\x0f\x41lterCollection\x12+.milvus.proto.milvus.AlterCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0f\x43reatePartition\x12+.milvus.proto.milvus.CreatePartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Y\n\rDropPartition\x12).milvus.proto.milvus.DropPartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0cHasPartition\x12(.milvus.proto.milvus.HasPartitionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadPartitions\x12*.milvus.proto.milvus.LoadPartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleasePartitions\x12-.milvus.proto.milvus.ReleasePartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x83\x01\n\x16GetPartitionStatistics\x12\x32.milvus.proto.milvus.GetPartitionStatisticsRequest\x1a\x33.milvus.proto.milvus.GetPartitionStatisticsResponse\"\x00\x12k\n\x0eShowPartitions\x12*.milvus.proto.milvus.ShowPartitionsRequest\x1a+.milvus.proto.milvus.ShowPartitionsResponse\"\x00\x12w\n\x12GetLoadingProgress\x12..milvus.proto.milvus.GetLoadingProgressRequest\x1a/.milvus.proto.milvus.GetLoadingProgressResponse\"\x00\x12\x65\n\x0cGetLoadState\x12(.milvus.proto.milvus.GetLoadStateRequest\x1a).milvus.proto.milvus.GetLoadStateResponse\"\x00\x12U\n\x0b\x43reateAlias\x12\'.milvus.proto.milvus.CreateAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Q\n\tDropAlias\x12%.milvus.proto.milvus.DropAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\nAlterAlias\x12&.milvus.proto.milvus.AlterAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rDescribeAlias\x12).milvus.proto.milvus.DescribeAliasRequest\x1a*.milvus.proto.milvus.DescribeAliasResponse\"\x00\x12\x62\n\x0bListAliases\x12\'.milvus.proto.milvus.ListAliasesRequest\x1a(.milvus.proto.milvus.ListAliasesResponse\"\x00\x12U\n\x0b\x43reateIndex\x12\'.milvus.proto.milvus.CreateIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rDescribeIndex\x12).milvus.proto.milvus.DescribeIndexRequest\x1a*.milvus.proto.milvus.DescribeIndexResponse\"\x00\x12w\n\x12GetIndexStatistics\x12..milvus.proto.milvus.GetIndexStatisticsRequest\x1a/.milvus.proto.milvus.GetIndexStatisticsResponse\"\x00\x12h\n\rGetIndexState\x12).milvus.proto.milvus.GetIndexStateRequest\x1a*.milvus.proto.milvus.GetIndexStateResponse\"\x00\x12\x80\x01\n\x15GetIndexBuildProgress\x12\x31.milvus.proto.milvus.GetIndexBuildProgressRequest\x1a\x32.milvus.proto.milvus.GetIndexBuildProgressResponse\"\x00\x12Q\n\tDropIndex\x12%.milvus.proto.milvus.DropIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\x06Insert\x12\".milvus.proto.milvus.InsertRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12S\n\x06\x44\x65lete\x12\".milvus.proto.milvus.DeleteRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12S\n\x06Upsert\x12\".milvus.proto.milvus.UpsertRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12R\n\x06Search\x12\".milvus.proto.milvus.SearchRequest\x1a\".milvus.proto.milvus.SearchResults\"\x00\x12P\n\x05\x46lush\x12!.milvus.proto.milvus.FlushRequest\x1a\".milvus.proto.milvus.FlushResponse\"\x00\x12O\n\x05Query\x12!.milvus.proto.milvus.QueryRequest\x1a!.milvus.proto.milvus.QueryResults\"\x00\x12\x64\n\x0c\x43\x61lcDistance\x12(.milvus.proto.milvus.CalcDistanceRequest\x1a(.milvus.proto.milvus.CalcDistanceResults\"\x00\x12Y\n\x08\x46lushAll\x12$.milvus.proto.milvus.FlushAllRequest\x1a%.milvus.proto.milvus.FlushAllResponse\"\x00\x12h\n\rGetFlushState\x12).milvus.proto.milvus.GetFlushStateRequest\x1a*.milvus.proto.milvus.GetFlushStateResponse\"\x00\x12q\n\x10GetFlushAllState\x12,.milvus.proto.milvus.GetFlushAllStateRequest\x1a-.milvus.proto.milvus.GetFlushAllStateResponse\"\x00\x12\x89\x01\n\x18GetPersistentSegmentInfo\x12\x34.milvus.proto.milvus.GetPersistentSegmentInfoRequest\x1a\x35.milvus.proto.milvus.GetPersistentSegmentInfoResponse\"\x00\x12z\n\x13GetQuerySegmentInfo\x12/.milvus.proto.milvus.GetQuerySegmentInfoRequest\x1a\x30.milvus.proto.milvus.GetQuerySegmentInfoResponse\"\x00\x12\x62\n\x0bGetReplicas\x12\'.milvus.proto.milvus.GetReplicasRequest\x1a(.milvus.proto.milvus.GetReplicasResponse\"\x00\x12P\n\x05\x44ummy\x12!.milvus.proto.milvus.DummyRequest\x1a\".milvus.proto.milvus.DummyResponse\"\x00\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00\x12_\n\nGetMetrics\x12&.milvus.proto.milvus.GetMetricsRequest\x1a\'.milvus.proto.milvus.GetMetricsResponse\"\x00\x12l\n\x12GetComponentStates\x12..milvus.proto.milvus.GetComponentStatesRequest\x1a$.milvus.proto.milvus.ComponentStates\"\x00\x12U\n\x0bLoadBalance\x12\'.milvus.proto.milvus.LoadBalanceRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12GetCompactionState\x12..milvus.proto.milvus.GetCompactionStateRequest\x1a/.milvus.proto.milvus.GetCompactionStateResponse\"\x00\x12q\n\x10ManualCompaction\x12,.milvus.proto.milvus.ManualCompactionRequest\x1a-.milvus.proto.milvus.ManualCompactionResponse\"\x00\x12\x80\x01\n\x1bGetCompactionStateWithPlans\x12..milvus.proto.milvus.GetCompactionPlansRequest\x1a/.milvus.proto.milvus.GetCompactionPlansResponse\"\x00\x12S\n\x06Import\x12\".milvus.proto.milvus.ImportRequest\x1a#.milvus.proto.milvus.ImportResponse\"\x00\x12k\n\x0eGetImportState\x12*.milvus.proto.milvus.GetImportStateRequest\x1a+.milvus.proto.milvus.GetImportStateResponse\"\x00\x12n\n\x0fListImportTasks\x12+.milvus.proto.milvus.ListImportTasksRequest\x1a,.milvus.proto.milvus.ListImportTasksResponse\"\x00\x12_\n\x10\x43reateCredential\x12,.milvus.proto.milvus.CreateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10UpdateCredential\x12,.milvus.proto.milvus.UpdateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10\x44\x65leteCredential\x12,.milvus.proto.milvus.DeleteCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rListCredUsers\x12).milvus.proto.milvus.ListCredUsersRequest\x1a*.milvus.proto.milvus.ListCredUsersResponse\"\x00\x12S\n\nCreateRole\x12&.milvus.proto.milvus.CreateRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12O\n\x08\x44ropRole\x12$.milvus.proto.milvus.DropRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fOperateUserRole\x12+.milvus.proto.milvus.OperateUserRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\nSelectRole\x12&.milvus.proto.milvus.SelectRoleRequest\x1a\'.milvus.proto.milvus.SelectRoleResponse\"\x00\x12_\n\nSelectUser\x12&.milvus.proto.milvus.SelectUserRequest\x1a\'.milvus.proto.milvus.SelectUserResponse\"\x00\x12_\n\x10OperatePrivilege\x12,.milvus.proto.milvus.OperatePrivilegeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x62\n\x0bSelectGrant\x12\'.milvus.proto.milvus.SelectGrantRequest\x1a(.milvus.proto.milvus.SelectGrantResponse\"\x00\x12_\n\nGetVersion\x12&.milvus.proto.milvus.GetVersionRequest\x1a\'.milvus.proto.milvus.GetVersionResponse\"\x00\x12\x62\n\x0b\x43heckHealth\x12\'.milvus.proto.milvus.CheckHealthRequest\x1a(.milvus.proto.milvus.CheckHealthResponse\"\x00\x12\x65\n\x13\x43reateResourceGroup\x12/.milvus.proto.milvus.CreateResourceGroupRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11\x44ropResourceGroup\x12-.milvus.proto.milvus.DropResourceGroupRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12W\n\x0cTransferNode\x12(.milvus.proto.milvus.TransferNodeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fTransferReplica\x12+.milvus.proto.milvus.TransferReplicaRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12ListResourceGroups\x12..milvus.proto.milvus.ListResourceGroupsRequest\x1a/.milvus.proto.milvus.ListResourceGroupsResponse\"\x00\x12\x80\x01\n\x15\x44\x65scribeResourceGroup\x12\x31.milvus.proto.milvus.DescribeResourceGroupRequest\x1a\x32.milvus.proto.milvus.DescribeResourceGroupResponse\"\x00\x12_\n\x10RenameCollection\x12,.milvus.proto.milvus.RenameCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12u\n\x12ListIndexedSegment\x12-.milvus.proto.feder.ListIndexedSegmentRequest\x1a..milvus.proto.feder.ListIndexedSegmentResponse\"\x00\x12\x87\x01\n\x18\x44\x65scribeSegmentIndexData\x12\x33.milvus.proto.feder.DescribeSegmentIndexDataRequest\x1a\x34.milvus.proto.feder.DescribeSegmentIndexDataResponse\"\x00\x12V\n\x07\x43onnect\x12#.milvus.proto.milvus.ConnectRequest\x1a$.milvus.proto.milvus.ConnectResponse\"\x00\x32u\n\x0cProxyService\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00:U\n\x0emilvus_ext_obj\x12\x1c.google.protobuf.FileOptions\x18\xe9\x07 \x01(\x0b\x32\x1e.milvus.proto.milvus.MilvusExtBf\n\x0eio.milvus.grpcB\x0bMilvusProtoP\x01Z1github.com/milvus-io/milvus-proto/go-api/milvuspb\xa0\x01\x01\xaa\x02\x0eIO.Milvus.Grpcb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'milvus_pb2', globals()) @@ -126,14 +126,14 @@ _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_options = b'8\001' _GETINDEXSTATISTICSREQUEST._options = None _GETINDEXSTATISTICSREQUEST._serialized_options = b'\312>\004\020\014\030\003' - _SHOWTYPE._serialized_start=20920 - _SHOWTYPE._serialized_end=20953 - _OPERATEUSERROLETYPE._serialized_start=20955 - _OPERATEUSERROLETYPE._serialized_end=21019 - _OPERATEPRIVILEGETYPE._serialized_start=21021 - _OPERATEPRIVILEGETYPE._serialized_end=21066 - _QUOTASTATE._serialized_start=21068 - _QUOTASTATE._serialized_end=21161 + _SHOWTYPE._serialized_start=21118 + _SHOWTYPE._serialized_end=21151 + _OPERATEUSERROLETYPE._serialized_start=21153 + _OPERATEUSERROLETYPE._serialized_end=21217 + _OPERATEPRIVILEGETYPE._serialized_start=21219 + _OPERATEPRIVILEGETYPE._serialized_end=21264 + _QUOTASTATE._serialized_start=21266 + _QUOTASTATE._serialized_end=21359 _CREATEALIASREQUEST._serialized_start=112 _CREATEALIASREQUEST._serialized_end=233 _DROPALIASREQUEST._serialized_start=235 @@ -233,215 +233,215 @@ _DELETEREQUEST._serialized_start=7994 _DELETEREQUEST._serialized_end=8161 _SEARCHREQUEST._serialized_start=8164 - _SEARCHREQUEST._serialized_end=8564 - _HITS._serialized_start=8566 - _HITS._serialized_end=8619 - _SEARCHRESULTS._serialized_start=8622 - _SEARCHRESULTS._serialized_end=8763 - _FLUSHREQUEST._serialized_start=8765 - _FLUSHREQUEST._serialized_end=8875 - _FLUSHRESPONSE._serialized_start=8878 - _FLUSHRESPONSE._serialized_end=9417 - _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_start=9194 - _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_end=9275 - _FLUSHRESPONSE_FLUSHCOLLSEGIDSENTRY._serialized_start=9277 - _FLUSHRESPONSE_FLUSHCOLLSEGIDSENTRY._serialized_end=9363 - _FLUSHRESPONSE_COLLSEALTIMESENTRY._serialized_start=9365 - _FLUSHRESPONSE_COLLSEALTIMESENTRY._serialized_end=9417 - _QUERYREQUEST._serialized_start=9420 - _QUERYREQUEST._serialized_end=9732 - _QUERYRESULTS._serialized_start=9735 - _QUERYRESULTS._serialized_end=9895 - _VECTORIDS._serialized_start=9897 - _VECTORIDS._serialized_end=10022 - _VECTORSARRAY._serialized_start=10025 - _VECTORSARRAY._serialized_end=10156 - _CALCDISTANCEREQUEST._serialized_start=10159 - _CALCDISTANCEREQUEST._serialized_end=10380 - _CALCDISTANCERESULTS._serialized_start=10383 - _CALCDISTANCERESULTS._serialized_end=10564 - _FLUSHALLREQUEST._serialized_start=10566 - _FLUSHALLREQUEST._serialized_end=10583 - _FLUSHALLRESPONSE._serialized_start=10585 - _FLUSHALLRESPONSE._serialized_end=10670 - _PERSISTENTSEGMENTINFO._serialized_start=10673 - _PERSISTENTSEGMENTINFO._serialized_end=10826 - _GETPERSISTENTSEGMENTINFOREQUEST._serialized_start=10828 - _GETPERSISTENTSEGMENTINFOREQUEST._serialized_end=10945 - _GETPERSISTENTSEGMENTINFORESPONSE._serialized_start=10948 - _GETPERSISTENTSEGMENTINFORESPONSE._serialized_end=11086 - _QUERYSEGMENTINFO._serialized_start=11089 - _QUERYSEGMENTINFO._serialized_end=11325 - _GETQUERYSEGMENTINFOREQUEST._serialized_start=11327 - _GETQUERYSEGMENTINFOREQUEST._serialized_end=11439 - _GETQUERYSEGMENTINFORESPONSE._serialized_start=11442 - _GETQUERYSEGMENTINFORESPONSE._serialized_end=11570 - _DUMMYREQUEST._serialized_start=11572 - _DUMMYREQUEST._serialized_end=11608 - _DUMMYRESPONSE._serialized_start=11610 - _DUMMYRESPONSE._serialized_end=11643 - _REGISTERLINKREQUEST._serialized_start=11645 - _REGISTERLINKREQUEST._serialized_end=11666 - _REGISTERLINKRESPONSE._serialized_start=11668 - _REGISTERLINKRESPONSE._serialized_end=11782 - _GETMETRICSREQUEST._serialized_start=11784 - _GETMETRICSREQUEST._serialized_end=11864 - _GETMETRICSRESPONSE._serialized_start=11866 - _GETMETRICSRESPONSE._serialized_end=11973 - _COMPONENTINFO._serialized_start=11976 - _COMPONENTINFO._serialized_end=12128 - _COMPONENTSTATES._serialized_start=12131 - _COMPONENTSTATES._serialized_end=12309 - _GETCOMPONENTSTATESREQUEST._serialized_start=12311 - _GETCOMPONENTSTATESREQUEST._serialized_end=12338 - _LOADBALANCEREQUEST._serialized_start=12341 - _LOADBALANCEREQUEST._serialized_end=12506 - _MANUALCOMPACTIONREQUEST._serialized_start=12508 - _MANUALCOMPACTIONREQUEST._serialized_end=12584 - _MANUALCOMPACTIONRESPONSE._serialized_start=12586 - _MANUALCOMPACTIONRESPONSE._serialized_end=12708 - _GETCOMPACTIONSTATEREQUEST._serialized_start=12710 - _GETCOMPACTIONSTATEREQUEST._serialized_end=12759 - _GETCOMPACTIONSTATERESPONSE._serialized_start=12762 - _GETCOMPACTIONSTATERESPONSE._serialized_end=12983 - _GETCOMPACTIONPLANSREQUEST._serialized_start=12985 - _GETCOMPACTIONPLANSREQUEST._serialized_end=13034 - _GETCOMPACTIONPLANSRESPONSE._serialized_start=13037 - _GETCOMPACTIONPLANSRESPONSE._serialized_end=13225 - _COMPACTIONMERGEINFO._serialized_start=13227 - _COMPACTIONMERGEINFO._serialized_end=13281 - _GETFLUSHSTATEREQUEST._serialized_start=13283 - _GETFLUSHSTATEREQUEST._serialized_end=13325 - _GETFLUSHSTATERESPONSE._serialized_start=13327 - _GETFLUSHSTATERESPONSE._serialized_end=13412 - _GETFLUSHALLSTATEREQUEST._serialized_start=13414 - _GETFLUSHALLSTATEREQUEST._serialized_end=13505 - _GETFLUSHALLSTATERESPONSE._serialized_start=13507 - _GETFLUSHALLSTATERESPONSE._serialized_end=13595 - _IMPORTREQUEST._serialized_start=13598 - _IMPORTREQUEST._serialized_end=13780 - _IMPORTRESPONSE._serialized_start=13782 - _IMPORTRESPONSE._serialized_end=13858 - _GETIMPORTSTATEREQUEST._serialized_start=13860 - _GETIMPORTSTATEREQUEST._serialized_end=13897 - _GETIMPORTSTATERESPONSE._serialized_start=13900 - _GETIMPORTSTATERESPONSE._serialized_end=14179 - _LISTIMPORTTASKSREQUEST._serialized_start=14181 - _LISTIMPORTTASKSREQUEST._serialized_end=14245 - _LISTIMPORTTASKSRESPONSE._serialized_start=14248 - _LISTIMPORTTASKSRESPONSE._serialized_end=14378 - _GETREPLICASREQUEST._serialized_start=14381 - _GETREPLICASREQUEST._serialized_end=14518 - _GETREPLICASRESPONSE._serialized_start=14520 - _GETREPLICASRESPONSE._serialized_end=14638 - _REPLICAINFO._serialized_start=14641 - _REPLICAINFO._serialized_end=14962 - _REPLICAINFO_NUMOUTBOUNDNODEENTRY._serialized_start=14908 - _REPLICAINFO_NUMOUTBOUNDNODEENTRY._serialized_end=14962 - _SHARDREPLICA._serialized_start=14964 - _SHARDREPLICA._serialized_end=15060 - _CREATECREDENTIALREQUEST._serialized_start=15063 - _CREATECREDENTIALREQUEST._serialized_end=15253 - _UPDATECREDENTIALREQUEST._serialized_start=15256 - _UPDATECREDENTIALREQUEST._serialized_end=15461 - _DELETECREDENTIALREQUEST._serialized_start=15463 - _DELETECREDENTIALREQUEST._serialized_end=15570 - _LISTCREDUSERSRESPONSE._serialized_start=15572 - _LISTCREDUSERSRESPONSE._serialized_end=15659 - _LISTCREDUSERSREQUEST._serialized_start=15661 - _LISTCREDUSERSREQUEST._serialized_end=15747 - _ROLEENTITY._serialized_start=15749 - _ROLEENTITY._serialized_end=15775 - _USERENTITY._serialized_start=15777 - _USERENTITY._serialized_end=15803 - _CREATEROLEREQUEST._serialized_start=15806 - _CREATEROLEREQUEST._serialized_end=15938 - _DROPROLEREQUEST._serialized_start=15940 - _DROPROLEREQUEST._serialized_end=16040 - _OPERATEUSERROLEREQUEST._serialized_start=16043 - _OPERATEUSERROLEREQUEST._serialized_end=16224 - _SELECTROLEREQUEST._serialized_start=16227 - _SELECTROLEREQUEST._serialized_end=16384 - _ROLERESULT._serialized_start=16386 - _ROLERESULT._serialized_end=16493 - _SELECTROLERESPONSE._serialized_start=16495 - _SELECTROLERESPONSE._serialized_end=16610 - _SELECTUSERREQUEST._serialized_start=16613 - _SELECTUSERREQUEST._serialized_end=16761 - _USERRESULT._serialized_start=16763 - _USERRESULT._serialized_end=16870 - _SELECTUSERRESPONSE._serialized_start=16872 - _SELECTUSERRESPONSE._serialized_end=16987 - _OBJECTENTITY._serialized_start=16989 - _OBJECTENTITY._serialized_end=17017 - _PRIVILEGEENTITY._serialized_start=17019 - _PRIVILEGEENTITY._serialized_end=17050 - _GRANTORENTITY._serialized_start=17052 - _GRANTORENTITY._serialized_end=17171 - _GRANTPRIVILEGEENTITY._serialized_start=17173 - _GRANTPRIVILEGEENTITY._serialized_end=17249 - _GRANTENTITY._serialized_start=17252 - _GRANTENTITY._serialized_end=17437 - _SELECTGRANTREQUEST._serialized_start=17440 - _SELECTGRANTREQUEST._serialized_end=17574 - _SELECTGRANTRESPONSE._serialized_start=17576 - _SELECTGRANTRESPONSE._serialized_end=17694 - _OPERATEPRIVILEGEREQUEST._serialized_start=17697 - _OPERATEPRIVILEGEREQUEST._serialized_end=17893 - _GETLOADINGPROGRESSREQUEST._serialized_start=17896 - _GETLOADINGPROGRESSREQUEST._serialized_end=18026 - _GETLOADINGPROGRESSRESPONSE._serialized_start=18028 - _GETLOADINGPROGRESSRESPONSE._serialized_end=18145 - _GETLOADSTATEREQUEST._serialized_start=18147 - _GETLOADSTATEREQUEST._serialized_end=18271 - _GETLOADSTATERESPONSE._serialized_start=18273 - _GETLOADSTATERESPONSE._serialized_end=18387 - _MILVUSEXT._serialized_start=18389 - _MILVUSEXT._serialized_end=18417 - _GETVERSIONREQUEST._serialized_start=18419 - _GETVERSIONREQUEST._serialized_end=18438 - _GETVERSIONRESPONSE._serialized_start=18440 - _GETVERSIONRESPONSE._serialized_end=18522 - _CHECKHEALTHREQUEST._serialized_start=18524 - _CHECKHEALTHREQUEST._serialized_end=18544 - _CHECKHEALTHRESPONSE._serialized_start=18547 - _CHECKHEALTHRESPONSE._serialized_end=18704 - _CREATERESOURCEGROUPREQUEST._serialized_start=18706 - _CREATERESOURCEGROUPREQUEST._serialized_end=18822 - _DROPRESOURCEGROUPREQUEST._serialized_start=18824 - _DROPRESOURCEGROUPREQUEST._serialized_end=18938 - _TRANSFERNODEREQUEST._serialized_start=18941 - _TRANSFERNODEREQUEST._serialized_end=19106 - _TRANSFERREPLICAREQUEST._serialized_start=19109 - _TRANSFERREPLICAREQUEST._serialized_end=19305 - _LISTRESOURCEGROUPSREQUEST._serialized_start=19307 - _LISTRESOURCEGROUPSREQUEST._serialized_end=19398 - _LISTRESOURCEGROUPSRESPONSE._serialized_start=19400 - _LISTRESOURCEGROUPSRESPONSE._serialized_end=19498 - _DESCRIBERESOURCEGROUPREQUEST._serialized_start=19500 - _DESCRIBERESOURCEGROUPREQUEST._serialized_end=19618 - _DESCRIBERESOURCEGROUPRESPONSE._serialized_start=19621 - _DESCRIBERESOURCEGROUPRESPONSE._serialized_end=19757 - _RESOURCEGROUP._serialized_start=19760 - _RESOURCEGROUP._serialized_end=20258 - _RESOURCEGROUP_NUMLOADEDREPLICAENTRY._serialized_start=20091 - _RESOURCEGROUP_NUMLOADEDREPLICAENTRY._serialized_end=20146 - _RESOURCEGROUP_NUMOUTGOINGNODEENTRY._serialized_start=20148 - _RESOURCEGROUP_NUMOUTGOINGNODEENTRY._serialized_end=20202 - _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_start=20204 - _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_end=20258 - _RENAMECOLLECTIONREQUEST._serialized_start=20260 - _RENAMECOLLECTIONREQUEST._serialized_end=20375 - _GETINDEXSTATISTICSREQUEST._serialized_start=20378 - _GETINDEXSTATISTICSREQUEST._serialized_end=20520 - _GETINDEXSTATISTICSRESPONSE._serialized_start=20523 - _GETINDEXSTATISTICSRESPONSE._serialized_end=20663 - _CONNECTREQUEST._serialized_start=20665 - _CONNECTREQUEST._serialized_end=20779 - _CONNECTRESPONSE._serialized_start=20782 - _CONNECTRESPONSE._serialized_end=20918 - _MILVUSSERVICE._serialized_start=21164 - _MILVUSSERVICE._serialized_end=28916 - _PROXYSERVICE._serialized_start=28918 - _PROXYSERVICE._serialized_end=29035 + _SEARCHREQUEST._serialized_end=8663 + _HITS._serialized_start=8665 + _HITS._serialized_end=8718 + _SEARCHRESULTS._serialized_start=8721 + _SEARCHRESULTS._serialized_end=8862 + _FLUSHREQUEST._serialized_start=8864 + _FLUSHREQUEST._serialized_end=8974 + _FLUSHRESPONSE._serialized_start=8977 + _FLUSHRESPONSE._serialized_end=9516 + _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_start=9293 + _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_end=9374 + _FLUSHRESPONSE_FLUSHCOLLSEGIDSENTRY._serialized_start=9376 + _FLUSHRESPONSE_FLUSHCOLLSEGIDSENTRY._serialized_end=9462 + _FLUSHRESPONSE_COLLSEALTIMESENTRY._serialized_start=9464 + _FLUSHRESPONSE_COLLSEALTIMESENTRY._serialized_end=9516 + _QUERYREQUEST._serialized_start=9519 + _QUERYREQUEST._serialized_end=9930 + _QUERYRESULTS._serialized_start=9933 + _QUERYRESULTS._serialized_end=10093 + _VECTORIDS._serialized_start=10095 + _VECTORIDS._serialized_end=10220 + _VECTORSARRAY._serialized_start=10223 + _VECTORSARRAY._serialized_end=10354 + _CALCDISTANCEREQUEST._serialized_start=10357 + _CALCDISTANCEREQUEST._serialized_end=10578 + _CALCDISTANCERESULTS._serialized_start=10581 + _CALCDISTANCERESULTS._serialized_end=10762 + _FLUSHALLREQUEST._serialized_start=10764 + _FLUSHALLREQUEST._serialized_end=10781 + _FLUSHALLRESPONSE._serialized_start=10783 + _FLUSHALLRESPONSE._serialized_end=10868 + _PERSISTENTSEGMENTINFO._serialized_start=10871 + _PERSISTENTSEGMENTINFO._serialized_end=11024 + _GETPERSISTENTSEGMENTINFOREQUEST._serialized_start=11026 + _GETPERSISTENTSEGMENTINFOREQUEST._serialized_end=11143 + _GETPERSISTENTSEGMENTINFORESPONSE._serialized_start=11146 + _GETPERSISTENTSEGMENTINFORESPONSE._serialized_end=11284 + _QUERYSEGMENTINFO._serialized_start=11287 + _QUERYSEGMENTINFO._serialized_end=11523 + _GETQUERYSEGMENTINFOREQUEST._serialized_start=11525 + _GETQUERYSEGMENTINFOREQUEST._serialized_end=11637 + _GETQUERYSEGMENTINFORESPONSE._serialized_start=11640 + _GETQUERYSEGMENTINFORESPONSE._serialized_end=11768 + _DUMMYREQUEST._serialized_start=11770 + _DUMMYREQUEST._serialized_end=11806 + _DUMMYRESPONSE._serialized_start=11808 + _DUMMYRESPONSE._serialized_end=11841 + _REGISTERLINKREQUEST._serialized_start=11843 + _REGISTERLINKREQUEST._serialized_end=11864 + _REGISTERLINKRESPONSE._serialized_start=11866 + _REGISTERLINKRESPONSE._serialized_end=11980 + _GETMETRICSREQUEST._serialized_start=11982 + _GETMETRICSREQUEST._serialized_end=12062 + _GETMETRICSRESPONSE._serialized_start=12064 + _GETMETRICSRESPONSE._serialized_end=12171 + _COMPONENTINFO._serialized_start=12174 + _COMPONENTINFO._serialized_end=12326 + _COMPONENTSTATES._serialized_start=12329 + _COMPONENTSTATES._serialized_end=12507 + _GETCOMPONENTSTATESREQUEST._serialized_start=12509 + _GETCOMPONENTSTATESREQUEST._serialized_end=12536 + _LOADBALANCEREQUEST._serialized_start=12539 + _LOADBALANCEREQUEST._serialized_end=12704 + _MANUALCOMPACTIONREQUEST._serialized_start=12706 + _MANUALCOMPACTIONREQUEST._serialized_end=12782 + _MANUALCOMPACTIONRESPONSE._serialized_start=12784 + _MANUALCOMPACTIONRESPONSE._serialized_end=12906 + _GETCOMPACTIONSTATEREQUEST._serialized_start=12908 + _GETCOMPACTIONSTATEREQUEST._serialized_end=12957 + _GETCOMPACTIONSTATERESPONSE._serialized_start=12960 + _GETCOMPACTIONSTATERESPONSE._serialized_end=13181 + _GETCOMPACTIONPLANSREQUEST._serialized_start=13183 + _GETCOMPACTIONPLANSREQUEST._serialized_end=13232 + _GETCOMPACTIONPLANSRESPONSE._serialized_start=13235 + _GETCOMPACTIONPLANSRESPONSE._serialized_end=13423 + _COMPACTIONMERGEINFO._serialized_start=13425 + _COMPACTIONMERGEINFO._serialized_end=13479 + _GETFLUSHSTATEREQUEST._serialized_start=13481 + _GETFLUSHSTATEREQUEST._serialized_end=13523 + _GETFLUSHSTATERESPONSE._serialized_start=13525 + _GETFLUSHSTATERESPONSE._serialized_end=13610 + _GETFLUSHALLSTATEREQUEST._serialized_start=13612 + _GETFLUSHALLSTATEREQUEST._serialized_end=13703 + _GETFLUSHALLSTATERESPONSE._serialized_start=13705 + _GETFLUSHALLSTATERESPONSE._serialized_end=13793 + _IMPORTREQUEST._serialized_start=13796 + _IMPORTREQUEST._serialized_end=13978 + _IMPORTRESPONSE._serialized_start=13980 + _IMPORTRESPONSE._serialized_end=14056 + _GETIMPORTSTATEREQUEST._serialized_start=14058 + _GETIMPORTSTATEREQUEST._serialized_end=14095 + _GETIMPORTSTATERESPONSE._serialized_start=14098 + _GETIMPORTSTATERESPONSE._serialized_end=14377 + _LISTIMPORTTASKSREQUEST._serialized_start=14379 + _LISTIMPORTTASKSREQUEST._serialized_end=14443 + _LISTIMPORTTASKSRESPONSE._serialized_start=14446 + _LISTIMPORTTASKSRESPONSE._serialized_end=14576 + _GETREPLICASREQUEST._serialized_start=14579 + _GETREPLICASREQUEST._serialized_end=14716 + _GETREPLICASRESPONSE._serialized_start=14718 + _GETREPLICASRESPONSE._serialized_end=14836 + _REPLICAINFO._serialized_start=14839 + _REPLICAINFO._serialized_end=15160 + _REPLICAINFO_NUMOUTBOUNDNODEENTRY._serialized_start=15106 + _REPLICAINFO_NUMOUTBOUNDNODEENTRY._serialized_end=15160 + _SHARDREPLICA._serialized_start=15162 + _SHARDREPLICA._serialized_end=15258 + _CREATECREDENTIALREQUEST._serialized_start=15261 + _CREATECREDENTIALREQUEST._serialized_end=15451 + _UPDATECREDENTIALREQUEST._serialized_start=15454 + _UPDATECREDENTIALREQUEST._serialized_end=15659 + _DELETECREDENTIALREQUEST._serialized_start=15661 + _DELETECREDENTIALREQUEST._serialized_end=15768 + _LISTCREDUSERSRESPONSE._serialized_start=15770 + _LISTCREDUSERSRESPONSE._serialized_end=15857 + _LISTCREDUSERSREQUEST._serialized_start=15859 + _LISTCREDUSERSREQUEST._serialized_end=15945 + _ROLEENTITY._serialized_start=15947 + _ROLEENTITY._serialized_end=15973 + _USERENTITY._serialized_start=15975 + _USERENTITY._serialized_end=16001 + _CREATEROLEREQUEST._serialized_start=16004 + _CREATEROLEREQUEST._serialized_end=16136 + _DROPROLEREQUEST._serialized_start=16138 + _DROPROLEREQUEST._serialized_end=16238 + _OPERATEUSERROLEREQUEST._serialized_start=16241 + _OPERATEUSERROLEREQUEST._serialized_end=16422 + _SELECTROLEREQUEST._serialized_start=16425 + _SELECTROLEREQUEST._serialized_end=16582 + _ROLERESULT._serialized_start=16584 + _ROLERESULT._serialized_end=16691 + _SELECTROLERESPONSE._serialized_start=16693 + _SELECTROLERESPONSE._serialized_end=16808 + _SELECTUSERREQUEST._serialized_start=16811 + _SELECTUSERREQUEST._serialized_end=16959 + _USERRESULT._serialized_start=16961 + _USERRESULT._serialized_end=17068 + _SELECTUSERRESPONSE._serialized_start=17070 + _SELECTUSERRESPONSE._serialized_end=17185 + _OBJECTENTITY._serialized_start=17187 + _OBJECTENTITY._serialized_end=17215 + _PRIVILEGEENTITY._serialized_start=17217 + _PRIVILEGEENTITY._serialized_end=17248 + _GRANTORENTITY._serialized_start=17250 + _GRANTORENTITY._serialized_end=17369 + _GRANTPRIVILEGEENTITY._serialized_start=17371 + _GRANTPRIVILEGEENTITY._serialized_end=17447 + _GRANTENTITY._serialized_start=17450 + _GRANTENTITY._serialized_end=17635 + _SELECTGRANTREQUEST._serialized_start=17638 + _SELECTGRANTREQUEST._serialized_end=17772 + _SELECTGRANTRESPONSE._serialized_start=17774 + _SELECTGRANTRESPONSE._serialized_end=17892 + _OPERATEPRIVILEGEREQUEST._serialized_start=17895 + _OPERATEPRIVILEGEREQUEST._serialized_end=18091 + _GETLOADINGPROGRESSREQUEST._serialized_start=18094 + _GETLOADINGPROGRESSREQUEST._serialized_end=18224 + _GETLOADINGPROGRESSRESPONSE._serialized_start=18226 + _GETLOADINGPROGRESSRESPONSE._serialized_end=18343 + _GETLOADSTATEREQUEST._serialized_start=18345 + _GETLOADSTATEREQUEST._serialized_end=18469 + _GETLOADSTATERESPONSE._serialized_start=18471 + _GETLOADSTATERESPONSE._serialized_end=18585 + _MILVUSEXT._serialized_start=18587 + _MILVUSEXT._serialized_end=18615 + _GETVERSIONREQUEST._serialized_start=18617 + _GETVERSIONREQUEST._serialized_end=18636 + _GETVERSIONRESPONSE._serialized_start=18638 + _GETVERSIONRESPONSE._serialized_end=18720 + _CHECKHEALTHREQUEST._serialized_start=18722 + _CHECKHEALTHREQUEST._serialized_end=18742 + _CHECKHEALTHRESPONSE._serialized_start=18745 + _CHECKHEALTHRESPONSE._serialized_end=18902 + _CREATERESOURCEGROUPREQUEST._serialized_start=18904 + _CREATERESOURCEGROUPREQUEST._serialized_end=19020 + _DROPRESOURCEGROUPREQUEST._serialized_start=19022 + _DROPRESOURCEGROUPREQUEST._serialized_end=19136 + _TRANSFERNODEREQUEST._serialized_start=19139 + _TRANSFERNODEREQUEST._serialized_end=19304 + _TRANSFERREPLICAREQUEST._serialized_start=19307 + _TRANSFERREPLICAREQUEST._serialized_end=19503 + _LISTRESOURCEGROUPSREQUEST._serialized_start=19505 + _LISTRESOURCEGROUPSREQUEST._serialized_end=19596 + _LISTRESOURCEGROUPSRESPONSE._serialized_start=19598 + _LISTRESOURCEGROUPSRESPONSE._serialized_end=19696 + _DESCRIBERESOURCEGROUPREQUEST._serialized_start=19698 + _DESCRIBERESOURCEGROUPREQUEST._serialized_end=19816 + _DESCRIBERESOURCEGROUPRESPONSE._serialized_start=19819 + _DESCRIBERESOURCEGROUPRESPONSE._serialized_end=19955 + _RESOURCEGROUP._serialized_start=19958 + _RESOURCEGROUP._serialized_end=20456 + _RESOURCEGROUP_NUMLOADEDREPLICAENTRY._serialized_start=20289 + _RESOURCEGROUP_NUMLOADEDREPLICAENTRY._serialized_end=20344 + _RESOURCEGROUP_NUMOUTGOINGNODEENTRY._serialized_start=20346 + _RESOURCEGROUP_NUMOUTGOINGNODEENTRY._serialized_end=20400 + _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_start=20402 + _RESOURCEGROUP_NUMINCOMINGNODEENTRY._serialized_end=20456 + _RENAMECOLLECTIONREQUEST._serialized_start=20458 + _RENAMECOLLECTIONREQUEST._serialized_end=20573 + _GETINDEXSTATISTICSREQUEST._serialized_start=20576 + _GETINDEXSTATISTICSREQUEST._serialized_end=20718 + _GETINDEXSTATISTICSRESPONSE._serialized_start=20721 + _GETINDEXSTATISTICSRESPONSE._serialized_end=20861 + _CONNECTREQUEST._serialized_start=20863 + _CONNECTREQUEST._serialized_end=20977 + _CONNECTRESPONSE._serialized_start=20980 + _CONNECTRESPONSE._serialized_end=21116 + _MILVUSSERVICE._serialized_start=21362 + _MILVUSSERVICE._serialized_end=29114 + _PROXYSERVICE._serialized_start=29116 + _PROXYSERVICE._serialized_end=29233 # @@protoc_insertion_point(module_scope) diff --git a/pymilvus/grpc_gen/milvus_pb2.pyi b/pymilvus/grpc_gen/milvus_pb2.pyi index b3eab543e..0f59c4937 100644 --- a/pymilvus/grpc_gen/milvus_pb2.pyi +++ b/pymilvus/grpc_gen/milvus_pb2.pyi @@ -1203,9 +1203,10 @@ class PrivilegeEntity(_message.Message): def __init__(self, name: _Optional[str] = ...) -> None: ... class QueryRequest(_message.Message): - __slots__ = ["base", "collection_name", "db_name", "expr", "guarantee_timestamp", "not_return_all_meta", "output_fields", "partition_names", "query_params", "travel_timestamp"] + __slots__ = ["base", "collection_name", "consistency_level", "db_name", "expr", "guarantee_timestamp", "not_return_all_meta", "output_fields", "partition_names", "query_params", "travel_timestamp", "use_default_consistency"] BASE_FIELD_NUMBER: _ClassVar[int] COLLECTION_NAME_FIELD_NUMBER: _ClassVar[int] + CONSISTENCY_LEVEL_FIELD_NUMBER: _ClassVar[int] DB_NAME_FIELD_NUMBER: _ClassVar[int] EXPR_FIELD_NUMBER: _ClassVar[int] GUARANTEE_TIMESTAMP_FIELD_NUMBER: _ClassVar[int] @@ -1214,8 +1215,10 @@ class QueryRequest(_message.Message): PARTITION_NAMES_FIELD_NUMBER: _ClassVar[int] QUERY_PARAMS_FIELD_NUMBER: _ClassVar[int] TRAVEL_TIMESTAMP_FIELD_NUMBER: _ClassVar[int] + USE_DEFAULT_CONSISTENCY_FIELD_NUMBER: _ClassVar[int] base: _common_pb2.MsgBase collection_name: str + consistency_level: _common_pb2.ConsistencyLevel db_name: str expr: str guarantee_timestamp: int @@ -1224,7 +1227,8 @@ class QueryRequest(_message.Message): partition_names: _containers.RepeatedScalarFieldContainer[str] query_params: _containers.RepeatedCompositeFieldContainer[_common_pb2.KeyValuePair] travel_timestamp: int - def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., expr: _Optional[str] = ..., output_fields: _Optional[_Iterable[str]] = ..., partition_names: _Optional[_Iterable[str]] = ..., travel_timestamp: _Optional[int] = ..., guarantee_timestamp: _Optional[int] = ..., query_params: _Optional[_Iterable[_Union[_common_pb2.KeyValuePair, _Mapping]]] = ..., not_return_all_meta: bool = ...) -> None: ... + use_default_consistency: bool + def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., expr: _Optional[str] = ..., output_fields: _Optional[_Iterable[str]] = ..., partition_names: _Optional[_Iterable[str]] = ..., travel_timestamp: _Optional[int] = ..., guarantee_timestamp: _Optional[int] = ..., query_params: _Optional[_Iterable[_Union[_common_pb2.KeyValuePair, _Mapping]]] = ..., not_return_all_meta: bool = ..., consistency_level: _Optional[_Union[_common_pb2.ConsistencyLevel, str]] = ..., use_default_consistency: bool = ...) -> None: ... class QueryResults(_message.Message): __slots__ = ["collection_name", "fields_data", "output_fields", "status"] @@ -1385,9 +1389,10 @@ class RoleResult(_message.Message): def __init__(self, role: _Optional[_Union[RoleEntity, _Mapping]] = ..., users: _Optional[_Iterable[_Union[UserEntity, _Mapping]]] = ...) -> None: ... class SearchRequest(_message.Message): - __slots__ = ["base", "collection_name", "db_name", "dsl", "dsl_type", "guarantee_timestamp", "not_return_all_meta", "nq", "output_fields", "partition_names", "placeholder_group", "search_params", "travel_timestamp"] + __slots__ = ["base", "collection_name", "consistency_level", "db_name", "dsl", "dsl_type", "guarantee_timestamp", "not_return_all_meta", "nq", "output_fields", "partition_names", "placeholder_group", "search_params", "travel_timestamp", "use_default_consistency"] BASE_FIELD_NUMBER: _ClassVar[int] COLLECTION_NAME_FIELD_NUMBER: _ClassVar[int] + CONSISTENCY_LEVEL_FIELD_NUMBER: _ClassVar[int] DB_NAME_FIELD_NUMBER: _ClassVar[int] DSL_FIELD_NUMBER: _ClassVar[int] DSL_TYPE_FIELD_NUMBER: _ClassVar[int] @@ -1399,8 +1404,10 @@ class SearchRequest(_message.Message): PLACEHOLDER_GROUP_FIELD_NUMBER: _ClassVar[int] SEARCH_PARAMS_FIELD_NUMBER: _ClassVar[int] TRAVEL_TIMESTAMP_FIELD_NUMBER: _ClassVar[int] + USE_DEFAULT_CONSISTENCY_FIELD_NUMBER: _ClassVar[int] base: _common_pb2.MsgBase collection_name: str + consistency_level: _common_pb2.ConsistencyLevel db_name: str dsl: str dsl_type: _common_pb2.DslType @@ -1412,7 +1419,8 @@ class SearchRequest(_message.Message): placeholder_group: bytes search_params: _containers.RepeatedCompositeFieldContainer[_common_pb2.KeyValuePair] travel_timestamp: int - def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., partition_names: _Optional[_Iterable[str]] = ..., dsl: _Optional[str] = ..., placeholder_group: _Optional[bytes] = ..., dsl_type: _Optional[_Union[_common_pb2.DslType, str]] = ..., output_fields: _Optional[_Iterable[str]] = ..., search_params: _Optional[_Iterable[_Union[_common_pb2.KeyValuePair, _Mapping]]] = ..., travel_timestamp: _Optional[int] = ..., guarantee_timestamp: _Optional[int] = ..., nq: _Optional[int] = ..., not_return_all_meta: bool = ...) -> None: ... + use_default_consistency: bool + def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., partition_names: _Optional[_Iterable[str]] = ..., dsl: _Optional[str] = ..., placeholder_group: _Optional[bytes] = ..., dsl_type: _Optional[_Union[_common_pb2.DslType, str]] = ..., output_fields: _Optional[_Iterable[str]] = ..., search_params: _Optional[_Iterable[_Union[_common_pb2.KeyValuePair, _Mapping]]] = ..., travel_timestamp: _Optional[int] = ..., guarantee_timestamp: _Optional[int] = ..., nq: _Optional[int] = ..., not_return_all_meta: bool = ..., consistency_level: _Optional[_Union[_common_pb2.ConsistencyLevel, str]] = ..., use_default_consistency: bool = ...) -> None: ... class SearchResults(_message.Message): __slots__ = ["collection_name", "results", "status"]
[FEATURE]: Set consistency_level in search/query request ### Is there an existing issue for this? - [X] I have searched the existing issues ### Is your feature request related to a problem? Please describe. In our current implementation, we construct a guarantee_timestamp on the client side based on the consistency_level passed by the user in order to control different levels of consistency. It is our desire to include a consistency_level parameter in the request, allowing the server to calculate the final timestamp based on this parameter. ### Describe the solution you'd like _No response_ ### Describe alternatives you've considered _No response_ ### Anything else? _No response_
2023-05-30T02:20:20
0.0
[]
[]
milvus-io/pymilvus
milvus-io__pymilvus-1080
a5fb6918481b2920150031ee24999752bb03dd4a
diff --git a/.github/workflows/check_milvus_proto.yml b/.github/workflows/check_milvus_proto.yml index 526b56394..194e013a4 100644 --- a/.github/workflows/check_milvus_proto.yml +++ b/.github/workflows/check_milvus_proto.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install grpcio-tools==1.37.1 + python setup.py install - name: Try generate proto run: | diff --git a/pymilvus/__init__.py b/pymilvus/__init__.py index e4dc601cc..512a7a281 100644 --- a/pymilvus/__init__.py +++ b/pymilvus/__init__.py @@ -12,7 +12,7 @@ from .client.stub import Milvus from .client.prepare import Prepare -from .client.types import Status, DataType, RangeType, IndexType, Replica, Group, Shard, BulkLoadState +from .client.types import Status, DataType, RangeType, IndexType, Replica, Group, Shard from .exceptions import ( ParamError, ConnectError, @@ -20,7 +20,7 @@ RepeatingConnectError, VersionError, MilvusException, - MilvusUnavaliableException, + MilvusUnavailableException, ExceptionsMessage ) # comment for dup @@ -62,14 +62,14 @@ 'Collection', 'Index', 'Partition', 'connections', 'loading_progress', 'index_building_progress', 'wait_for_loading_complete', 'has_collection', 'has_partition', - 'list_collections', 'wait_for_loading_complete', 'wait_for_index_building_complete', 'drop_collection', 'bulk_load', 'get_bulk_load_state', + 'list_collections', 'wait_for_loading_complete', 'wait_for_index_building_complete', 'drop_collection', 'mkts_from_hybridts', 'mkts_from_unixtime', 'mkts_from_datetime', 'hybridts_to_unixtime', 'hybridts_to_datetime', 'reset_password', 'create_credential', 'update_credential', 'delete_credential', 'list_cred_users', - 'SearchResult', 'Hits', 'Hit', 'Replica', 'Group', 'Shard', 'BulkLoadState' + 'SearchResult', 'Hits', 'Hit', 'Replica', 'Group', 'Shard', 'FieldSchema', 'CollectionSchema', 'SearchFuture', 'MutationFuture', - 'utility', 'DefaultConfig', 'ExceptionsMessage', 'MilvusUnavaliableException' + 'utility', 'DefaultConfig', 'ExceptionsMessage', 'MilvusUnavailableException', # pymilvus old style APIs 'Milvus', 'Prepare', 'Status', 'DataType', diff --git a/pymilvus/decorators.py b/pymilvus/decorators.py index 547ca4dfa..de8504bc1 100644 --- a/pymilvus/decorators.py +++ b/pymilvus/decorators.py @@ -5,7 +5,7 @@ import grpc -from .exceptions import MilvusException, MilvusUnavaliableException +from .exceptions import MilvusException, MilvusUnavailableException from .client.types import Status LOGGER = logging.getLogger(__name__) @@ -61,7 +61,7 @@ def timeout(start_time) -> bool: if e.code() == grpc.StatusCode.DEADLINE_EXCEEDED: raise MilvusException(Status.UNEXPECTED_ERROR, f"rpc deadline exceeded: {timeout_msg}") if e.code() == grpc.StatusCode.UNAVAILABLE: - raise MilvusUnavaliableException(Status.UNEXPECTED_ERROR, f"server unavaliable: {timeout_msg}") + raise MilvusUnavailableException(Status.UNEXPECTED_ERROR, f"server Unavailable: {timeout_msg}") raise MilvusException(Status.UNEXPECTED_ERROR, str(e)) if counter > 3: diff --git a/pymilvus/exceptions.py b/pymilvus/exceptions.py index adc337684..3b1ad17e8 100644 --- a/pymilvus/exceptions.py +++ b/pymilvus/exceptions.py @@ -84,7 +84,7 @@ def __str__(self): return f"<{type(self).__name__}: (code={self._code}, message={self._message})>" -class MilvusUnavaliableException(MilvusException): +class MilvusUnavailableException(MilvusException): pass diff --git a/pymilvus/grpc_gen/common_pb2.py b/pymilvus/grpc_gen/common_pb2.py index 659bd6b54..ef871296f 100644 --- a/pymilvus/grpc_gen/common_pb2.py +++ b/pymilvus/grpc_gen/common_pb2.py @@ -4,6 +4,7 @@ """Generated protocol buffer code.""" from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -15,1036 +16,29 @@ from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='common.proto', - package='milvus.proto.common', - syntax='proto3', - serialized_options=b'\n\016io.milvus.grpcB\013CommonProtoP\001Z3github.com/milvus-io/milvus/internal/proto/commonpb\240\001\001', - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x0c\x63ommon.proto\x12\x13milvus.proto.common\x1a google/protobuf/descriptor.proto\"L\n\x06Status\x12\x32\n\nerror_code\x18\x01 \x01(\x0e\x32\x1e.milvus.proto.common.ErrorCode\x12\x0e\n\x06reason\x18\x02 \x01(\t\"*\n\x0cKeyValuePair\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"(\n\x0bKeyDataPair\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"\x15\n\x04\x42lob\x12\r\n\x05value\x18\x01 \x01(\x0c\"c\n\x10PlaceholderValue\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32$.milvus.proto.common.PlaceholderType\x12\x0e\n\x06values\x18\x03 \x03(\x0c\"O\n\x10PlaceholderGroup\x12;\n\x0cplaceholders\x18\x01 \x03(\x0b\x32%.milvus.proto.common.PlaceholderValue\"#\n\x07\x41\x64\x64ress\x12\n\n\x02ip\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x03\"m\n\x07MsgBase\x12.\n\x08msg_type\x18\x01 \x01(\x0e\x32\x1c.milvus.proto.common.MsgType\x12\r\n\x05msgID\x18\x02 \x01(\x03\x12\x11\n\ttimestamp\x18\x03 \x01(\x04\x12\x10\n\x08sourceID\x18\x04 \x01(\x03\"7\n\tMsgHeader\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\"M\n\x0c\x44MLMsgHeader\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\tshardName\x18\x02 \x01(\t\"\xa9\x01\n\x0cPrivilegeExt\x12\x38\n\rresource_type\x18\x01 \x01(\x0e\x32!.milvus.proto.common.ResourceType\x12\x42\n\x12resource_privilege\x18\x02 \x01(\x0e\x32&.milvus.proto.common.ResourcePrivilege\x12\x1b\n\x13resource_name_index\x18\x03 \x01(\x05*\xbe\x08\n\tErrorCode\x12\x0b\n\x07Success\x10\x00\x12\x13\n\x0fUnexpectedError\x10\x01\x12\x11\n\rConnectFailed\x10\x02\x12\x14\n\x10PermissionDenied\x10\x03\x12\x17\n\x13\x43ollectionNotExists\x10\x04\x12\x13\n\x0fIllegalArgument\x10\x05\x12\x14\n\x10IllegalDimension\x10\x07\x12\x14\n\x10IllegalIndexType\x10\x08\x12\x19\n\x15IllegalCollectionName\x10\t\x12\x0f\n\x0bIllegalTOPK\x10\n\x12\x14\n\x10IllegalRowRecord\x10\x0b\x12\x13\n\x0fIllegalVectorID\x10\x0c\x12\x17\n\x13IllegalSearchResult\x10\r\x12\x10\n\x0c\x46ileNotFound\x10\x0e\x12\x0e\n\nMetaFailed\x10\x0f\x12\x0f\n\x0b\x43\x61\x63heFailed\x10\x10\x12\x16\n\x12\x43\x61nnotCreateFolder\x10\x11\x12\x14\n\x10\x43\x61nnotCreateFile\x10\x12\x12\x16\n\x12\x43\x61nnotDeleteFolder\x10\x13\x12\x14\n\x10\x43\x61nnotDeleteFile\x10\x14\x12\x13\n\x0f\x42uildIndexError\x10\x15\x12\x10\n\x0cIllegalNLIST\x10\x16\x12\x15\n\x11IllegalMetricType\x10\x17\x12\x0f\n\x0bOutOfMemory\x10\x18\x12\x11\n\rIndexNotExist\x10\x19\x12\x13\n\x0f\x45mptyCollection\x10\x1a\x12\x1b\n\x17UpdateImportTaskFailure\x10\x1b\x12\x1a\n\x16\x43ollectionNameNotFound\x10\x1c\x12\x1b\n\x17\x43reateCredentialFailure\x10\x1d\x12\x1b\n\x17UpdateCredentialFailure\x10\x1e\x12\x1b\n\x17\x44\x65leteCredentialFailure\x10\x1f\x12\x18\n\x14GetCredentialFailure\x10 \x12\x18\n\x14ListCredUsersFailure\x10!\x12\x12\n\x0eGetUserFailure\x10\"\x12\x15\n\x11\x43reateRoleFailure\x10#\x12\x13\n\x0f\x44ropRoleFailure\x10$\x12\x1a\n\x16OperateUserRoleFailure\x10%\x12\x15\n\x11SelectRoleFailure\x10&\x12\x15\n\x11SelectUserFailure\x10\'\x12\x19\n\x15SelectResourceFailure\x10(\x12\x1b\n\x17OperatePrivilegeFailure\x10)\x12\x16\n\x12SelectGrantFailure\x10*\x12!\n\x1dRefreshPolicyInfoCacheFailure\x10+\x12\x15\n\x11ListPolicyFailure\x10,\x12\x12\n\x0eNotShardLeader\x10-\x12\x16\n\x12NoReplicaAvailable\x10.\x12\x12\n\rDDRequestRace\x10\xe8\x07*X\n\nIndexState\x12\x12\n\x0eIndexStateNone\x10\x00\x12\x0c\n\x08Unissued\x10\x01\x12\x0e\n\nInProgress\x10\x02\x12\x0c\n\x08\x46inished\x10\x03\x12\n\n\x06\x46\x61iled\x10\x04*\x82\x01\n\x0cSegmentState\x12\x14\n\x10SegmentStateNone\x10\x00\x12\x0c\n\x08NotExist\x10\x01\x12\x0b\n\x07Growing\x10\x02\x12\n\n\x06Sealed\x10\x03\x12\x0b\n\x07\x46lushed\x10\x04\x12\x0c\n\x08\x46lushing\x10\x05\x12\x0b\n\x07\x44ropped\x10\x06\x12\r\n\tImporting\x10\x07*>\n\x0fPlaceholderType\x12\x08\n\x04None\x10\x00\x12\x10\n\x0c\x42inaryVector\x10\x64\x12\x0f\n\x0b\x46loatVector\x10\x65*\xb6\x0c\n\x07MsgType\x12\r\n\tUndefined\x10\x00\x12\x14\n\x10\x43reateCollection\x10\x64\x12\x12\n\x0e\x44ropCollection\x10\x65\x12\x11\n\rHasCollection\x10\x66\x12\x16\n\x12\x44\x65scribeCollection\x10g\x12\x13\n\x0fShowCollections\x10h\x12\x14\n\x10GetSystemConfigs\x10i\x12\x12\n\x0eLoadCollection\x10j\x12\x15\n\x11ReleaseCollection\x10k\x12\x0f\n\x0b\x43reateAlias\x10l\x12\r\n\tDropAlias\x10m\x12\x0e\n\nAlterAlias\x10n\x12\x14\n\x0f\x43reatePartition\x10\xc8\x01\x12\x12\n\rDropPartition\x10\xc9\x01\x12\x11\n\x0cHasPartition\x10\xca\x01\x12\x16\n\x11\x44\x65scribePartition\x10\xcb\x01\x12\x13\n\x0eShowPartitions\x10\xcc\x01\x12\x13\n\x0eLoadPartitions\x10\xcd\x01\x12\x16\n\x11ReleasePartitions\x10\xce\x01\x12\x11\n\x0cShowSegments\x10\xfa\x01\x12\x14\n\x0f\x44\x65scribeSegment\x10\xfb\x01\x12\x11\n\x0cLoadSegments\x10\xfc\x01\x12\x14\n\x0fReleaseSegments\x10\xfd\x01\x12\x14\n\x0fHandoffSegments\x10\xfe\x01\x12\x18\n\x13LoadBalanceSegments\x10\xff\x01\x12\x15\n\x10\x44\x65scribeSegments\x10\x80\x02\x12\x10\n\x0b\x43reateIndex\x10\xac\x02\x12\x12\n\rDescribeIndex\x10\xad\x02\x12\x0e\n\tDropIndex\x10\xae\x02\x12\x0b\n\x06Insert\x10\x90\x03\x12\x0b\n\x06\x44\x65lete\x10\x91\x03\x12\n\n\x05\x46lush\x10\x92\x03\x12\x17\n\x12ResendSegmentStats\x10\x93\x03\x12\x0b\n\x06Search\x10\xf4\x03\x12\x11\n\x0cSearchResult\x10\xf5\x03\x12\x12\n\rGetIndexState\x10\xf6\x03\x12\x1a\n\x15GetIndexBuildProgress\x10\xf7\x03\x12\x1c\n\x17GetCollectionStatistics\x10\xf8\x03\x12\x1b\n\x16GetPartitionStatistics\x10\xf9\x03\x12\r\n\x08Retrieve\x10\xfa\x03\x12\x13\n\x0eRetrieveResult\x10\xfb\x03\x12\x14\n\x0fWatchDmChannels\x10\xfc\x03\x12\x15\n\x10RemoveDmChannels\x10\xfd\x03\x12\x17\n\x12WatchQueryChannels\x10\xfe\x03\x12\x18\n\x13RemoveQueryChannels\x10\xff\x03\x12\x1d\n\x18SealedSegmentsChangeInfo\x10\x80\x04\x12\x17\n\x12WatchDeltaChannels\x10\x81\x04\x12\x14\n\x0fGetShardLeaders\x10\x82\x04\x12\x10\n\x0bGetReplicas\x10\x83\x04\x12\x10\n\x0bSegmentInfo\x10\xd8\x04\x12\x0f\n\nSystemInfo\x10\xd9\x04\x12\x14\n\x0fGetRecoveryInfo\x10\xda\x04\x12\x14\n\x0fGetSegmentState\x10\xdb\x04\x12\r\n\x08TimeTick\x10\xb0\t\x12\x13\n\x0eQueryNodeStats\x10\xb1\t\x12\x0e\n\tLoadIndex\x10\xb2\t\x12\x0e\n\tRequestID\x10\xb3\t\x12\x0f\n\nRequestTSO\x10\xb4\t\x12\x14\n\x0f\x41llocateSegment\x10\xb5\t\x12\x16\n\x11SegmentStatistics\x10\xb6\t\x12\x15\n\x10SegmentFlushDone\x10\xb7\t\x12\x0f\n\nDataNodeTt\x10\xb8\t\x12\x15\n\x10\x43reateCredential\x10\xdc\x0b\x12\x12\n\rGetCredential\x10\xdd\x0b\x12\x15\n\x10\x44\x65leteCredential\x10\xde\x0b\x12\x15\n\x10UpdateCredential\x10\xdf\x0b\x12\x16\n\x11ListCredUsernames\x10\xe0\x0b\x12\x0f\n\nCreateRole\x10\xc0\x0c\x12\r\n\x08\x44ropRole\x10\xc1\x0c\x12\x14\n\x0fOperateUserRole\x10\xc2\x0c\x12\x0f\n\nSelectRole\x10\xc3\x0c\x12\x0f\n\nSelectUser\x10\xc4\x0c\x12\x13\n\x0eSelectResource\x10\xc5\x0c\x12\x15\n\x10OperatePrivilege\x10\xc6\x0c\x12\x10\n\x0bSelectGrant\x10\xc7\x0c\x12\x1b\n\x16RefreshPolicyInfoCache\x10\xc8\x0c\x12\x0f\n\nListPolicy\x10\xc9\x0c*\"\n\x07\x44slType\x12\x07\n\x03\x44sl\x10\x00\x12\x0e\n\nBoolExprV1\x10\x01*B\n\x0f\x43ompactionState\x12\x11\n\rUndefiedState\x10\x00\x12\r\n\tExecuting\x10\x01\x12\r\n\tCompleted\x10\x02*X\n\x10\x43onsistencyLevel\x12\n\n\x06Strong\x10\x00\x12\x0b\n\x07Session\x10\x01\x12\x0b\n\x07\x42ounded\x10\x02\x12\x0e\n\nEventually\x10\x03\x12\x0e\n\nCustomized\x10\x04*\xaf\x01\n\x0bImportState\x12\x11\n\rImportPending\x10\x00\x12\x10\n\x0cImportFailed\x10\x01\x12\x11\n\rImportStarted\x10\x02\x12\x14\n\x10ImportDownloaded\x10\x03\x12\x10\n\x0cImportParsed\x10\x04\x12\x13\n\x0fImportPersisted\x10\x05\x12\x13\n\x0fImportCompleted\x10\x06\x12\x16\n\x12ImportAllocSegment\x10\n*\x1e\n\x0cResourceType\x12\x0e\n\nCollection\x10\x00*\xdd\x01\n\x11ResourcePrivilege\x12\x10\n\x0cPrivilegeAll\x10\x00\x12\x13\n\x0fPrivilegeCreate\x10\x01\x12\x11\n\rPrivilegeDrop\x10\x02\x12\x12\n\x0ePrivilegeAlter\x10\x03\x12\x11\n\rPrivilegeRead\x10\x04\x12\x11\n\rPrivilegeLoad\x10\x05\x12\x14\n\x10PrivilegeRelease\x10\x06\x12\x14\n\x10PrivilegeCompact\x10\x07\x12\x13\n\x0fPrivilegeInsert\x10\x08\x12\x13\n\x0fPrivilegeDelete\x10\t:^\n\x11privilege_ext_obj\x12\x1f.google.protobuf.MessageOptions\x18\xe9\x07 \x01(\x0b\x32!.milvus.proto.common.PrivilegeExtBW\n\x0eio.milvus.grpcB\x0b\x43ommonProtoP\x01Z3github.com/milvus-io/milvus/internal/proto/commonpb\xa0\x01\x01\x62\x06proto3' - , - dependencies=[google_dot_protobuf_dot_descriptor__pb2.DESCRIPTOR,]) - -_ERRORCODE = _descriptor.EnumDescriptor( - name='ErrorCode', - full_name='milvus.proto.common.ErrorCode', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='Success', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='UnexpectedError', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ConnectFailed', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PermissionDenied', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CollectionNotExists', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalArgument', index=5, number=5, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalDimension', index=6, number=7, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalIndexType', index=7, number=8, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalCollectionName', index=8, number=9, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalTOPK', index=9, number=10, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalRowRecord', index=10, number=11, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalVectorID', index=11, number=12, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalSearchResult', index=12, number=13, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FileNotFound', index=13, number=14, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='MetaFailed', index=14, number=15, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CacheFailed', index=15, number=16, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CannotCreateFolder', index=16, number=17, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CannotCreateFile', index=17, number=18, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CannotDeleteFolder', index=18, number=19, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CannotDeleteFile', index=19, number=20, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='BuildIndexError', index=20, number=21, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalNLIST', index=21, number=22, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IllegalMetricType', index=22, number=23, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='OutOfMemory', index=23, number=24, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='IndexNotExist', index=24, number=25, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='EmptyCollection', index=25, number=26, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='UpdateImportTaskFailure', index=26, number=27, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CollectionNameNotFound', index=27, number=28, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CreateCredentialFailure', index=28, number=29, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='UpdateCredentialFailure', index=29, number=30, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DeleteCredentialFailure', index=30, number=31, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetCredentialFailure', index=31, number=32, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ListCredUsersFailure', index=32, number=33, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetUserFailure', index=33, number=34, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CreateRoleFailure', index=34, number=35, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DropRoleFailure', index=35, number=36, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='OperateUserRoleFailure', index=36, number=37, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SelectRoleFailure', index=37, number=38, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SelectUserFailure', index=38, number=39, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SelectResourceFailure', index=39, number=40, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='OperatePrivilegeFailure', index=40, number=41, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SelectGrantFailure', index=41, number=42, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RefreshPolicyInfoCacheFailure', index=42, number=43, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ListPolicyFailure', index=43, number=44, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='NotShardLeader', index=44, number=45, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='NoReplicaAvailable', index=45, number=46, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DDRequestRace', index=46, number=1000, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=897, - serialized_end=1983, -) -_sym_db.RegisterEnumDescriptor(_ERRORCODE) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63ommon.proto\x12\x13milvus.proto.common\x1a google/protobuf/descriptor.proto\"L\n\x06Status\x12\x32\n\nerror_code\x18\x01 \x01(\x0e\x32\x1e.milvus.proto.common.ErrorCode\x12\x0e\n\x06reason\x18\x02 \x01(\t\"*\n\x0cKeyValuePair\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"(\n\x0bKeyDataPair\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"\x15\n\x04\x42lob\x12\r\n\x05value\x18\x01 \x01(\x0c\"c\n\x10PlaceholderValue\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32$.milvus.proto.common.PlaceholderType\x12\x0e\n\x06values\x18\x03 \x03(\x0c\"O\n\x10PlaceholderGroup\x12;\n\x0cplaceholders\x18\x01 \x03(\x0b\x32%.milvus.proto.common.PlaceholderValue\"#\n\x07\x41\x64\x64ress\x12\n\n\x02ip\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x03\"m\n\x07MsgBase\x12.\n\x08msg_type\x18\x01 \x01(\x0e\x32\x1c.milvus.proto.common.MsgType\x12\r\n\x05msgID\x18\x02 \x01(\x03\x12\x11\n\ttimestamp\x18\x03 \x01(\x04\x12\x10\n\x08sourceID\x18\x04 \x01(\x03\"7\n\tMsgHeader\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\"M\n\x0c\x44MLMsgHeader\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\tshardName\x18\x02 \x01(\t\"\xa9\x01\n\x0cPrivilegeExt\x12\x38\n\rresource_type\x18\x01 \x01(\x0e\x32!.milvus.proto.common.ResourceType\x12\x42\n\x12resource_privilege\x18\x02 \x01(\x0e\x32&.milvus.proto.common.ResourcePrivilege\x12\x1b\n\x13resource_name_index\x18\x03 \x01(\x05*\xbe\x08\n\tErrorCode\x12\x0b\n\x07Success\x10\x00\x12\x13\n\x0fUnexpectedError\x10\x01\x12\x11\n\rConnectFailed\x10\x02\x12\x14\n\x10PermissionDenied\x10\x03\x12\x17\n\x13\x43ollectionNotExists\x10\x04\x12\x13\n\x0fIllegalArgument\x10\x05\x12\x14\n\x10IllegalDimension\x10\x07\x12\x14\n\x10IllegalIndexType\x10\x08\x12\x19\n\x15IllegalCollectionName\x10\t\x12\x0f\n\x0bIllegalTOPK\x10\n\x12\x14\n\x10IllegalRowRecord\x10\x0b\x12\x13\n\x0fIllegalVectorID\x10\x0c\x12\x17\n\x13IllegalSearchResult\x10\r\x12\x10\n\x0c\x46ileNotFound\x10\x0e\x12\x0e\n\nMetaFailed\x10\x0f\x12\x0f\n\x0b\x43\x61\x63heFailed\x10\x10\x12\x16\n\x12\x43\x61nnotCreateFolder\x10\x11\x12\x14\n\x10\x43\x61nnotCreateFile\x10\x12\x12\x16\n\x12\x43\x61nnotDeleteFolder\x10\x13\x12\x14\n\x10\x43\x61nnotDeleteFile\x10\x14\x12\x13\n\x0f\x42uildIndexError\x10\x15\x12\x10\n\x0cIllegalNLIST\x10\x16\x12\x15\n\x11IllegalMetricType\x10\x17\x12\x0f\n\x0bOutOfMemory\x10\x18\x12\x11\n\rIndexNotExist\x10\x19\x12\x13\n\x0f\x45mptyCollection\x10\x1a\x12\x1b\n\x17UpdateImportTaskFailure\x10\x1b\x12\x1a\n\x16\x43ollectionNameNotFound\x10\x1c\x12\x1b\n\x17\x43reateCredentialFailure\x10\x1d\x12\x1b\n\x17UpdateCredentialFailure\x10\x1e\x12\x1b\n\x17\x44\x65leteCredentialFailure\x10\x1f\x12\x18\n\x14GetCredentialFailure\x10 \x12\x18\n\x14ListCredUsersFailure\x10!\x12\x12\n\x0eGetUserFailure\x10\"\x12\x15\n\x11\x43reateRoleFailure\x10#\x12\x13\n\x0f\x44ropRoleFailure\x10$\x12\x1a\n\x16OperateUserRoleFailure\x10%\x12\x15\n\x11SelectRoleFailure\x10&\x12\x15\n\x11SelectUserFailure\x10\'\x12\x19\n\x15SelectResourceFailure\x10(\x12\x1b\n\x17OperatePrivilegeFailure\x10)\x12\x16\n\x12SelectGrantFailure\x10*\x12!\n\x1dRefreshPolicyInfoCacheFailure\x10+\x12\x15\n\x11ListPolicyFailure\x10,\x12\x12\n\x0eNotShardLeader\x10-\x12\x16\n\x12NoReplicaAvailable\x10.\x12\x12\n\rDDRequestRace\x10\xe8\x07*X\n\nIndexState\x12\x12\n\x0eIndexStateNone\x10\x00\x12\x0c\n\x08Unissued\x10\x01\x12\x0e\n\nInProgress\x10\x02\x12\x0c\n\x08\x46inished\x10\x03\x12\n\n\x06\x46\x61iled\x10\x04*\x82\x01\n\x0cSegmentState\x12\x14\n\x10SegmentStateNone\x10\x00\x12\x0c\n\x08NotExist\x10\x01\x12\x0b\n\x07Growing\x10\x02\x12\n\n\x06Sealed\x10\x03\x12\x0b\n\x07\x46lushed\x10\x04\x12\x0c\n\x08\x46lushing\x10\x05\x12\x0b\n\x07\x44ropped\x10\x06\x12\r\n\tImporting\x10\x07*>\n\x0fPlaceholderType\x12\x08\n\x04None\x10\x00\x12\x10\n\x0c\x42inaryVector\x10\x64\x12\x0f\n\x0b\x46loatVector\x10\x65*\xb6\x0c\n\x07MsgType\x12\r\n\tUndefined\x10\x00\x12\x14\n\x10\x43reateCollection\x10\x64\x12\x12\n\x0e\x44ropCollection\x10\x65\x12\x11\n\rHasCollection\x10\x66\x12\x16\n\x12\x44\x65scribeCollection\x10g\x12\x13\n\x0fShowCollections\x10h\x12\x14\n\x10GetSystemConfigs\x10i\x12\x12\n\x0eLoadCollection\x10j\x12\x15\n\x11ReleaseCollection\x10k\x12\x0f\n\x0b\x43reateAlias\x10l\x12\r\n\tDropAlias\x10m\x12\x0e\n\nAlterAlias\x10n\x12\x14\n\x0f\x43reatePartition\x10\xc8\x01\x12\x12\n\rDropPartition\x10\xc9\x01\x12\x11\n\x0cHasPartition\x10\xca\x01\x12\x16\n\x11\x44\x65scribePartition\x10\xcb\x01\x12\x13\n\x0eShowPartitions\x10\xcc\x01\x12\x13\n\x0eLoadPartitions\x10\xcd\x01\x12\x16\n\x11ReleasePartitions\x10\xce\x01\x12\x11\n\x0cShowSegments\x10\xfa\x01\x12\x14\n\x0f\x44\x65scribeSegment\x10\xfb\x01\x12\x11\n\x0cLoadSegments\x10\xfc\x01\x12\x14\n\x0fReleaseSegments\x10\xfd\x01\x12\x14\n\x0fHandoffSegments\x10\xfe\x01\x12\x18\n\x13LoadBalanceSegments\x10\xff\x01\x12\x15\n\x10\x44\x65scribeSegments\x10\x80\x02\x12\x10\n\x0b\x43reateIndex\x10\xac\x02\x12\x12\n\rDescribeIndex\x10\xad\x02\x12\x0e\n\tDropIndex\x10\xae\x02\x12\x0b\n\x06Insert\x10\x90\x03\x12\x0b\n\x06\x44\x65lete\x10\x91\x03\x12\n\n\x05\x46lush\x10\x92\x03\x12\x17\n\x12ResendSegmentStats\x10\x93\x03\x12\x0b\n\x06Search\x10\xf4\x03\x12\x11\n\x0cSearchResult\x10\xf5\x03\x12\x12\n\rGetIndexState\x10\xf6\x03\x12\x1a\n\x15GetIndexBuildProgress\x10\xf7\x03\x12\x1c\n\x17GetCollectionStatistics\x10\xf8\x03\x12\x1b\n\x16GetPartitionStatistics\x10\xf9\x03\x12\r\n\x08Retrieve\x10\xfa\x03\x12\x13\n\x0eRetrieveResult\x10\xfb\x03\x12\x14\n\x0fWatchDmChannels\x10\xfc\x03\x12\x15\n\x10RemoveDmChannels\x10\xfd\x03\x12\x17\n\x12WatchQueryChannels\x10\xfe\x03\x12\x18\n\x13RemoveQueryChannels\x10\xff\x03\x12\x1d\n\x18SealedSegmentsChangeInfo\x10\x80\x04\x12\x17\n\x12WatchDeltaChannels\x10\x81\x04\x12\x14\n\x0fGetShardLeaders\x10\x82\x04\x12\x10\n\x0bGetReplicas\x10\x83\x04\x12\x10\n\x0bSegmentInfo\x10\xd8\x04\x12\x0f\n\nSystemInfo\x10\xd9\x04\x12\x14\n\x0fGetRecoveryInfo\x10\xda\x04\x12\x14\n\x0fGetSegmentState\x10\xdb\x04\x12\r\n\x08TimeTick\x10\xb0\t\x12\x13\n\x0eQueryNodeStats\x10\xb1\t\x12\x0e\n\tLoadIndex\x10\xb2\t\x12\x0e\n\tRequestID\x10\xb3\t\x12\x0f\n\nRequestTSO\x10\xb4\t\x12\x14\n\x0f\x41llocateSegment\x10\xb5\t\x12\x16\n\x11SegmentStatistics\x10\xb6\t\x12\x15\n\x10SegmentFlushDone\x10\xb7\t\x12\x0f\n\nDataNodeTt\x10\xb8\t\x12\x15\n\x10\x43reateCredential\x10\xdc\x0b\x12\x12\n\rGetCredential\x10\xdd\x0b\x12\x15\n\x10\x44\x65leteCredential\x10\xde\x0b\x12\x15\n\x10UpdateCredential\x10\xdf\x0b\x12\x16\n\x11ListCredUsernames\x10\xe0\x0b\x12\x0f\n\nCreateRole\x10\xc0\x0c\x12\r\n\x08\x44ropRole\x10\xc1\x0c\x12\x14\n\x0fOperateUserRole\x10\xc2\x0c\x12\x0f\n\nSelectRole\x10\xc3\x0c\x12\x0f\n\nSelectUser\x10\xc4\x0c\x12\x13\n\x0eSelectResource\x10\xc5\x0c\x12\x15\n\x10OperatePrivilege\x10\xc6\x0c\x12\x10\n\x0bSelectGrant\x10\xc7\x0c\x12\x1b\n\x16RefreshPolicyInfoCache\x10\xc8\x0c\x12\x0f\n\nListPolicy\x10\xc9\x0c*\"\n\x07\x44slType\x12\x07\n\x03\x44sl\x10\x00\x12\x0e\n\nBoolExprV1\x10\x01*B\n\x0f\x43ompactionState\x12\x11\n\rUndefiedState\x10\x00\x12\r\n\tExecuting\x10\x01\x12\r\n\tCompleted\x10\x02*X\n\x10\x43onsistencyLevel\x12\n\n\x06Strong\x10\x00\x12\x0b\n\x07Session\x10\x01\x12\x0b\n\x07\x42ounded\x10\x02\x12\x0e\n\nEventually\x10\x03\x12\x0e\n\nCustomized\x10\x04*\xaf\x01\n\x0bImportState\x12\x11\n\rImportPending\x10\x00\x12\x10\n\x0cImportFailed\x10\x01\x12\x11\n\rImportStarted\x10\x02\x12\x14\n\x10ImportDownloaded\x10\x03\x12\x10\n\x0cImportParsed\x10\x04\x12\x13\n\x0fImportPersisted\x10\x05\x12\x13\n\x0fImportCompleted\x10\x06\x12\x16\n\x12ImportAllocSegment\x10\n*\x1e\n\x0cResourceType\x12\x0e\n\nCollection\x10\x00*\xdd\x01\n\x11ResourcePrivilege\x12\x10\n\x0cPrivilegeAll\x10\x00\x12\x13\n\x0fPrivilegeCreate\x10\x01\x12\x11\n\rPrivilegeDrop\x10\x02\x12\x12\n\x0ePrivilegeAlter\x10\x03\x12\x11\n\rPrivilegeRead\x10\x04\x12\x11\n\rPrivilegeLoad\x10\x05\x12\x14\n\x10PrivilegeRelease\x10\x06\x12\x14\n\x10PrivilegeCompact\x10\x07\x12\x13\n\x0fPrivilegeInsert\x10\x08\x12\x13\n\x0fPrivilegeDelete\x10\t:^\n\x11privilege_ext_obj\x12\x1f.google.protobuf.MessageOptions\x18\xe9\x07 \x01(\x0b\x32!.milvus.proto.common.PrivilegeExtBW\n\x0eio.milvus.grpcB\x0b\x43ommonProtoP\x01Z3github.com/milvus-io/milvus/internal/proto/commonpb\xa0\x01\x01\x62\x06proto3') +_ERRORCODE = DESCRIPTOR.enum_types_by_name['ErrorCode'] ErrorCode = enum_type_wrapper.EnumTypeWrapper(_ERRORCODE) -_INDEXSTATE = _descriptor.EnumDescriptor( - name='IndexState', - full_name='milvus.proto.common.IndexState', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='IndexStateNone', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Unissued', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='InProgress', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Finished', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Failed', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=1985, - serialized_end=2073, -) -_sym_db.RegisterEnumDescriptor(_INDEXSTATE) - +_INDEXSTATE = DESCRIPTOR.enum_types_by_name['IndexState'] IndexState = enum_type_wrapper.EnumTypeWrapper(_INDEXSTATE) -_SEGMENTSTATE = _descriptor.EnumDescriptor( - name='SegmentState', - full_name='milvus.proto.common.SegmentState', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='SegmentStateNone', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='NotExist', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Growing', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Sealed', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Flushed', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Flushing', index=5, number=5, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Dropped', index=6, number=6, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Importing', index=7, number=7, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=2076, - serialized_end=2206, -) -_sym_db.RegisterEnumDescriptor(_SEGMENTSTATE) - +_SEGMENTSTATE = DESCRIPTOR.enum_types_by_name['SegmentState'] SegmentState = enum_type_wrapper.EnumTypeWrapper(_SEGMENTSTATE) -_PLACEHOLDERTYPE = _descriptor.EnumDescriptor( - name='PlaceholderType', - full_name='milvus.proto.common.PlaceholderType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='None', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='BinaryVector', index=1, number=100, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FloatVector', index=2, number=101, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=2208, - serialized_end=2270, -) -_sym_db.RegisterEnumDescriptor(_PLACEHOLDERTYPE) - +_PLACEHOLDERTYPE = DESCRIPTOR.enum_types_by_name['PlaceholderType'] PlaceholderType = enum_type_wrapper.EnumTypeWrapper(_PLACEHOLDERTYPE) -_MSGTYPE = _descriptor.EnumDescriptor( - name='MsgType', - full_name='milvus.proto.common.MsgType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='Undefined', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CreateCollection', index=1, number=100, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DropCollection', index=2, number=101, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='HasCollection', index=3, number=102, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DescribeCollection', index=4, number=103, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ShowCollections', index=5, number=104, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetSystemConfigs', index=6, number=105, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='LoadCollection', index=7, number=106, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ReleaseCollection', index=8, number=107, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CreateAlias', index=9, number=108, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DropAlias', index=10, number=109, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='AlterAlias', index=11, number=110, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CreatePartition', index=12, number=200, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DropPartition', index=13, number=201, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='HasPartition', index=14, number=202, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DescribePartition', index=15, number=203, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ShowPartitions', index=16, number=204, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='LoadPartitions', index=17, number=205, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ReleasePartitions', index=18, number=206, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ShowSegments', index=19, number=250, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DescribeSegment', index=20, number=251, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='LoadSegments', index=21, number=252, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ReleaseSegments', index=22, number=253, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='HandoffSegments', index=23, number=254, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='LoadBalanceSegments', index=24, number=255, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DescribeSegments', index=25, number=256, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CreateIndex', index=26, number=300, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DescribeIndex', index=27, number=301, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DropIndex', index=28, number=302, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Insert', index=29, number=400, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Delete', index=30, number=401, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Flush', index=31, number=402, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ResendSegmentStats', index=32, number=403, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Search', index=33, number=500, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SearchResult', index=34, number=501, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetIndexState', index=35, number=502, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetIndexBuildProgress', index=36, number=503, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetCollectionStatistics', index=37, number=504, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetPartitionStatistics', index=38, number=505, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Retrieve', index=39, number=506, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RetrieveResult', index=40, number=507, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='WatchDmChannels', index=41, number=508, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RemoveDmChannels', index=42, number=509, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='WatchQueryChannels', index=43, number=510, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RemoveQueryChannels', index=44, number=511, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SealedSegmentsChangeInfo', index=45, number=512, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='WatchDeltaChannels', index=46, number=513, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetShardLeaders', index=47, number=514, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetReplicas', index=48, number=515, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SegmentInfo', index=49, number=600, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SystemInfo', index=50, number=601, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetRecoveryInfo', index=51, number=602, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetSegmentState', index=52, number=603, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='TimeTick', index=53, number=1200, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='QueryNodeStats', index=54, number=1201, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='LoadIndex', index=55, number=1202, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RequestID', index=56, number=1203, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RequestTSO', index=57, number=1204, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='AllocateSegment', index=58, number=1205, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SegmentStatistics', index=59, number=1206, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SegmentFlushDone', index=60, number=1207, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DataNodeTt', index=61, number=1208, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CreateCredential', index=62, number=1500, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='GetCredential', index=63, number=1501, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DeleteCredential', index=64, number=1502, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='UpdateCredential', index=65, number=1503, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ListCredUsernames', index=66, number=1504, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='CreateRole', index=67, number=1600, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='DropRole', index=68, number=1601, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='OperateUserRole', index=69, number=1602, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SelectRole', index=70, number=1603, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SelectUser', index=71, number=1604, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SelectResource', index=72, number=1605, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='OperatePrivilege', index=73, number=1606, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='SelectGrant', index=74, number=1607, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RefreshPolicyInfoCache', index=75, number=1608, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ListPolicy', index=76, number=1609, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=2273, - serialized_end=3863, -) -_sym_db.RegisterEnumDescriptor(_MSGTYPE) - +_MSGTYPE = DESCRIPTOR.enum_types_by_name['MsgType'] MsgType = enum_type_wrapper.EnumTypeWrapper(_MSGTYPE) -_DSLTYPE = _descriptor.EnumDescriptor( - name='DslType', - full_name='milvus.proto.common.DslType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='Dsl', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='BoolExprV1', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=3865, - serialized_end=3899, -) -_sym_db.RegisterEnumDescriptor(_DSLTYPE) - +_DSLTYPE = DESCRIPTOR.enum_types_by_name['DslType'] DslType = enum_type_wrapper.EnumTypeWrapper(_DSLTYPE) -_COMPACTIONSTATE = _descriptor.EnumDescriptor( - name='CompactionState', - full_name='milvus.proto.common.CompactionState', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='UndefiedState', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Executing', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Completed', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=3901, - serialized_end=3967, -) -_sym_db.RegisterEnumDescriptor(_COMPACTIONSTATE) - +_COMPACTIONSTATE = DESCRIPTOR.enum_types_by_name['CompactionState'] CompactionState = enum_type_wrapper.EnumTypeWrapper(_COMPACTIONSTATE) -_CONSISTENCYLEVEL = _descriptor.EnumDescriptor( - name='ConsistencyLevel', - full_name='milvus.proto.common.ConsistencyLevel', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='Strong', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Session', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Bounded', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Eventually', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Customized', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=3969, - serialized_end=4057, -) -_sym_db.RegisterEnumDescriptor(_CONSISTENCYLEVEL) - +_CONSISTENCYLEVEL = DESCRIPTOR.enum_types_by_name['ConsistencyLevel'] ConsistencyLevel = enum_type_wrapper.EnumTypeWrapper(_CONSISTENCYLEVEL) -_IMPORTSTATE = _descriptor.EnumDescriptor( - name='ImportState', - full_name='milvus.proto.common.ImportState', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='ImportPending', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ImportFailed', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ImportStarted', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ImportDownloaded', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ImportParsed', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ImportPersisted', index=5, number=5, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ImportCompleted', index=6, number=6, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ImportAllocSegment', index=7, number=10, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=4060, - serialized_end=4235, -) -_sym_db.RegisterEnumDescriptor(_IMPORTSTATE) - +_IMPORTSTATE = DESCRIPTOR.enum_types_by_name['ImportState'] ImportState = enum_type_wrapper.EnumTypeWrapper(_IMPORTSTATE) -_RESOURCETYPE = _descriptor.EnumDescriptor( - name='ResourceType', - full_name='milvus.proto.common.ResourceType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='Collection', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=4237, - serialized_end=4267, -) -_sym_db.RegisterEnumDescriptor(_RESOURCETYPE) - +_RESOURCETYPE = DESCRIPTOR.enum_types_by_name['ResourceType'] ResourceType = enum_type_wrapper.EnumTypeWrapper(_RESOURCETYPE) -_RESOURCEPRIVILEGE = _descriptor.EnumDescriptor( - name='ResourcePrivilege', - full_name='milvus.proto.common.ResourcePrivilege', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='PrivilegeAll', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeCreate', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeDrop', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeAlter', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeRead', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeLoad', index=5, number=5, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeRelease', index=6, number=6, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeCompact', index=7, number=7, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeInsert', index=8, number=8, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='PrivilegeDelete', index=9, number=9, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=4270, - serialized_end=4491, -) -_sym_db.RegisterEnumDescriptor(_RESOURCEPRIVILEGE) - +_RESOURCEPRIVILEGE = DESCRIPTOR.enum_types_by_name['ResourcePrivilege'] ResourcePrivilege = enum_type_wrapper.EnumTypeWrapper(_RESOURCEPRIVILEGE) Success = 0 UnexpectedError = 1 @@ -1217,483 +211,19 @@ PrivilegeDelete = 9 PRIVILEGE_EXT_OBJ_FIELD_NUMBER = 1001 -privilege_ext_obj = _descriptor.FieldDescriptor( - name='privilege_ext_obj', full_name='milvus.proto.common.privilege_ext_obj', index=0, - number=1001, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=True, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key) - - -_STATUS = _descriptor.Descriptor( - name='Status', - full_name='milvus.proto.common.Status', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='error_code', full_name='milvus.proto.common.Status.error_code', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='reason', full_name='milvus.proto.common.Status.reason', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=71, - serialized_end=147, -) - - -_KEYVALUEPAIR = _descriptor.Descriptor( - name='KeyValuePair', - full_name='milvus.proto.common.KeyValuePair', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='key', full_name='milvus.proto.common.KeyValuePair.key', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='value', full_name='milvus.proto.common.KeyValuePair.value', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=149, - serialized_end=191, -) - - -_KEYDATAPAIR = _descriptor.Descriptor( - name='KeyDataPair', - full_name='milvus.proto.common.KeyDataPair', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='key', full_name='milvus.proto.common.KeyDataPair.key', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='data', full_name='milvus.proto.common.KeyDataPair.data', index=1, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=193, - serialized_end=233, -) - - -_BLOB = _descriptor.Descriptor( - name='Blob', - full_name='milvus.proto.common.Blob', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='value', full_name='milvus.proto.common.Blob.value', index=0, - number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=235, - serialized_end=256, -) - - -_PLACEHOLDERVALUE = _descriptor.Descriptor( - name='PlaceholderValue', - full_name='milvus.proto.common.PlaceholderValue', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='tag', full_name='milvus.proto.common.PlaceholderValue.tag', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='type', full_name='milvus.proto.common.PlaceholderValue.type', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='values', full_name='milvus.proto.common.PlaceholderValue.values', index=2, - number=3, type=12, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=258, - serialized_end=357, -) - - -_PLACEHOLDERGROUP = _descriptor.Descriptor( - name='PlaceholderGroup', - full_name='milvus.proto.common.PlaceholderGroup', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='placeholders', full_name='milvus.proto.common.PlaceholderGroup.placeholders', index=0, - number=1, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=359, - serialized_end=438, -) - - -_ADDRESS = _descriptor.Descriptor( - name='Address', - full_name='milvus.proto.common.Address', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='ip', full_name='milvus.proto.common.Address.ip', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='port', full_name='milvus.proto.common.Address.port', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=440, - serialized_end=475, -) - - -_MSGBASE = _descriptor.Descriptor( - name='MsgBase', - full_name='milvus.proto.common.MsgBase', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='msg_type', full_name='milvus.proto.common.MsgBase.msg_type', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='msgID', full_name='milvus.proto.common.MsgBase.msgID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='timestamp', full_name='milvus.proto.common.MsgBase.timestamp', index=2, - number=3, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='sourceID', full_name='milvus.proto.common.MsgBase.sourceID', index=3, - number=4, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=477, - serialized_end=586, -) - - -_MSGHEADER = _descriptor.Descriptor( - name='MsgHeader', - full_name='milvus.proto.common.MsgHeader', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.common.MsgHeader.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=588, - serialized_end=643, -) - - -_DMLMSGHEADER = _descriptor.Descriptor( - name='DMLMsgHeader', - full_name='milvus.proto.common.DMLMsgHeader', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.common.DMLMsgHeader.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='shardName', full_name='milvus.proto.common.DMLMsgHeader.shardName', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=645, - serialized_end=722, -) - - -_PRIVILEGEEXT = _descriptor.Descriptor( - name='PrivilegeExt', - full_name='milvus.proto.common.PrivilegeExt', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='resource_type', full_name='milvus.proto.common.PrivilegeExt.resource_type', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='resource_privilege', full_name='milvus.proto.common.PrivilegeExt.resource_privilege', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='resource_name_index', full_name='milvus.proto.common.PrivilegeExt.resource_name_index', index=2, - number=3, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=725, - serialized_end=894, -) - -_STATUS.fields_by_name['error_code'].enum_type = _ERRORCODE -_PLACEHOLDERVALUE.fields_by_name['type'].enum_type = _PLACEHOLDERTYPE -_PLACEHOLDERGROUP.fields_by_name['placeholders'].message_type = _PLACEHOLDERVALUE -_MSGBASE.fields_by_name['msg_type'].enum_type = _MSGTYPE -_MSGHEADER.fields_by_name['base'].message_type = _MSGBASE -_DMLMSGHEADER.fields_by_name['base'].message_type = _MSGBASE -_PRIVILEGEEXT.fields_by_name['resource_type'].enum_type = _RESOURCETYPE -_PRIVILEGEEXT.fields_by_name['resource_privilege'].enum_type = _RESOURCEPRIVILEGE -DESCRIPTOR.message_types_by_name['Status'] = _STATUS -DESCRIPTOR.message_types_by_name['KeyValuePair'] = _KEYVALUEPAIR -DESCRIPTOR.message_types_by_name['KeyDataPair'] = _KEYDATAPAIR -DESCRIPTOR.message_types_by_name['Blob'] = _BLOB -DESCRIPTOR.message_types_by_name['PlaceholderValue'] = _PLACEHOLDERVALUE -DESCRIPTOR.message_types_by_name['PlaceholderGroup'] = _PLACEHOLDERGROUP -DESCRIPTOR.message_types_by_name['Address'] = _ADDRESS -DESCRIPTOR.message_types_by_name['MsgBase'] = _MSGBASE -DESCRIPTOR.message_types_by_name['MsgHeader'] = _MSGHEADER -DESCRIPTOR.message_types_by_name['DMLMsgHeader'] = _DMLMSGHEADER -DESCRIPTOR.message_types_by_name['PrivilegeExt'] = _PRIVILEGEEXT -DESCRIPTOR.enum_types_by_name['ErrorCode'] = _ERRORCODE -DESCRIPTOR.enum_types_by_name['IndexState'] = _INDEXSTATE -DESCRIPTOR.enum_types_by_name['SegmentState'] = _SEGMENTSTATE -DESCRIPTOR.enum_types_by_name['PlaceholderType'] = _PLACEHOLDERTYPE -DESCRIPTOR.enum_types_by_name['MsgType'] = _MSGTYPE -DESCRIPTOR.enum_types_by_name['DslType'] = _DSLTYPE -DESCRIPTOR.enum_types_by_name['CompactionState'] = _COMPACTIONSTATE -DESCRIPTOR.enum_types_by_name['ConsistencyLevel'] = _CONSISTENCYLEVEL -DESCRIPTOR.enum_types_by_name['ImportState'] = _IMPORTSTATE -DESCRIPTOR.enum_types_by_name['ResourceType'] = _RESOURCETYPE -DESCRIPTOR.enum_types_by_name['ResourcePrivilege'] = _RESOURCEPRIVILEGE -DESCRIPTOR.extensions_by_name['privilege_ext_obj'] = privilege_ext_obj -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - +privilege_ext_obj = DESCRIPTOR.extensions_by_name['privilege_ext_obj'] + +_STATUS = DESCRIPTOR.message_types_by_name['Status'] +_KEYVALUEPAIR = DESCRIPTOR.message_types_by_name['KeyValuePair'] +_KEYDATAPAIR = DESCRIPTOR.message_types_by_name['KeyDataPair'] +_BLOB = DESCRIPTOR.message_types_by_name['Blob'] +_PLACEHOLDERVALUE = DESCRIPTOR.message_types_by_name['PlaceholderValue'] +_PLACEHOLDERGROUP = DESCRIPTOR.message_types_by_name['PlaceholderGroup'] +_ADDRESS = DESCRIPTOR.message_types_by_name['Address'] +_MSGBASE = DESCRIPTOR.message_types_by_name['MsgBase'] +_MSGHEADER = DESCRIPTOR.message_types_by_name['MsgHeader'] +_DMLMSGHEADER = DESCRIPTOR.message_types_by_name['DMLMsgHeader'] +_PRIVILEGEEXT = DESCRIPTOR.message_types_by_name['PrivilegeExt'] Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), { 'DESCRIPTOR' : _STATUS, '__module__' : 'common_pb2' @@ -1771,8 +301,53 @@ }) _sym_db.RegisterMessage(PrivilegeExt) -privilege_ext_obj.message_type = _PRIVILEGEEXT -google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(privilege_ext_obj) - -DESCRIPTOR._options = None +if _descriptor._USE_C_DESCRIPTORS == False: + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(privilege_ext_obj) + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\016io.milvus.grpcB\013CommonProtoP\001Z3github.com/milvus-io/milvus/internal/proto/commonpb\240\001\001' + _ERRORCODE._serialized_start=897 + _ERRORCODE._serialized_end=1983 + _INDEXSTATE._serialized_start=1985 + _INDEXSTATE._serialized_end=2073 + _SEGMENTSTATE._serialized_start=2076 + _SEGMENTSTATE._serialized_end=2206 + _PLACEHOLDERTYPE._serialized_start=2208 + _PLACEHOLDERTYPE._serialized_end=2270 + _MSGTYPE._serialized_start=2273 + _MSGTYPE._serialized_end=3863 + _DSLTYPE._serialized_start=3865 + _DSLTYPE._serialized_end=3899 + _COMPACTIONSTATE._serialized_start=3901 + _COMPACTIONSTATE._serialized_end=3967 + _CONSISTENCYLEVEL._serialized_start=3969 + _CONSISTENCYLEVEL._serialized_end=4057 + _IMPORTSTATE._serialized_start=4060 + _IMPORTSTATE._serialized_end=4235 + _RESOURCETYPE._serialized_start=4237 + _RESOURCETYPE._serialized_end=4267 + _RESOURCEPRIVILEGE._serialized_start=4270 + _RESOURCEPRIVILEGE._serialized_end=4491 + _STATUS._serialized_start=71 + _STATUS._serialized_end=147 + _KEYVALUEPAIR._serialized_start=149 + _KEYVALUEPAIR._serialized_end=191 + _KEYDATAPAIR._serialized_start=193 + _KEYDATAPAIR._serialized_end=233 + _BLOB._serialized_start=235 + _BLOB._serialized_end=256 + _PLACEHOLDERVALUE._serialized_start=258 + _PLACEHOLDERVALUE._serialized_end=357 + _PLACEHOLDERGROUP._serialized_start=359 + _PLACEHOLDERGROUP._serialized_end=438 + _ADDRESS._serialized_start=440 + _ADDRESS._serialized_end=475 + _MSGBASE._serialized_start=477 + _MSGBASE._serialized_end=586 + _MSGHEADER._serialized_start=588 + _MSGHEADER._serialized_end=643 + _DMLMSGHEADER._serialized_start=645 + _DMLMSGHEADER._serialized_end=722 + _PRIVILEGEEXT._serialized_start=725 + _PRIVILEGEEXT._serialized_end=894 # @@protoc_insertion_point(module_scope) diff --git a/pymilvus/grpc_gen/milvus_pb2.py b/pymilvus/grpc_gen/milvus_pb2.py index 7cdd850e6..65cd4b06d 100644 --- a/pymilvus/grpc_gen/milvus_pb2.py +++ b/pymilvus/grpc_gen/milvus_pb2.py @@ -4,6 +4,7 @@ """Generated protocol buffer code.""" from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -17,93 +18,13 @@ from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='milvus.proto', - package='milvus.proto.milvus', - syntax='proto3', - serialized_options=b'\n\016io.milvus.grpcB\013MilvusProtoP\001Z3github.com/milvus-io/milvus/internal/proto/milvuspb\240\001\001\312>\007\n\0052.1.0', - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x0cmilvus.proto\x12\x13milvus.proto.milvus\x1a\x0c\x63ommon.proto\x1a\x0cschema.proto\x1a google/protobuf/descriptor.proto\"y\n\x12\x43reateAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"^\n\x10\x44ropAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\"x\n\x11\x41lterAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"\xde\x01\n\x17\x43reateCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0e\n\x06schema\x18\x04 \x01(\x0c\x12\x12\n\nshards_num\x18\x05 \x01(\x05\x12@\n\x11\x63onsistency_level\x18\x06 \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel:\x07\xca>\x04\x10\x01\x18\x03\"v\n\x15\x44ropCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x02\x18\x03\"\x89\x01\n\x14HasCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\ntime_stamp\x18\x04 \x01(\x04:\x07\xca>\x04\x10\x04\x18\x03\"J\n\x0c\x42oolResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\x08\"L\n\x0eStringResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\t\"\xa4\x01\n\x19\x44\x65scribeCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x12\n\ntime_stamp\x18\x05 \x01(\x04:\x07\xca>\x04\x10\x04\x18\x03\"\xca\x03\n\x1a\x44\x65scribeCollectionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x35\n\x06schema\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.CollectionSchema\x12\x14\n\x0c\x63ollectionID\x18\x03 \x01(\x03\x12\x1d\n\x15virtual_channel_names\x18\x04 \x03(\t\x12\x1e\n\x16physical_channel_names\x18\x05 \x03(\t\x12\x19\n\x11\x63reated_timestamp\x18\x06 \x01(\x04\x12\x1d\n\x15\x63reated_utc_timestamp\x18\x07 \x01(\x04\x12\x12\n\nshards_num\x18\x08 \x01(\x05\x12\x0f\n\x07\x61liases\x18\t \x03(\t\x12\x39\n\x0fstart_positions\x18\n \x03(\x0b\x32 .milvus.proto.common.KeyDataPair\x12@\n\x11\x63onsistency_level\x18\x0b \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x17\n\x0f\x63ollection_name\x18\x0c \x01(\t\"\x8e\x01\n\x15LoadCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0ereplica_number\x18\x04 \x01(\x05:\x07\xca>\x04\x10\x05\x18\x03\"y\n\x18ReleaseCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x06\x18\x03\"\x7f\n\x1eGetCollectionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x04\x18\x03\"\x80\x01\n\x1fGetCollectionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb7\x01\n\x16ShowCollectionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x12\n\ntime_stamp\x18\x03 \x01(\x04\x12+\n\x04type\x18\x04 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\x12\x18\n\x10\x63ollection_names\x18\x05 \x03(\t:\x05\xca>\x02\x10\x04\"\xf3\x01\n\x17ShowCollectionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x18\n\x10\x63ollection_names\x18\x02 \x03(\t\x12\x16\n\x0e\x63ollection_ids\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\x12\x1f\n\x17query_service_available\x18\x07 \x03(\x08\"\x86\x01\n\x16\x43reatePartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x84\x01\n\x14\x44ropPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x83\x01\n\x13HasPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x9e\x01\n\x15LoadPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x16\n\x0ereplica_number\x18\x05 \x01(\x05\"\x89\x01\n\x18ReleasePartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x8d\x01\n\x1dGetPartitionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x7f\n\x1eGetPartitionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc9\x01\n\x15ShowPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x17\n\x0fpartition_names\x18\x05 \x03(\t\x12+\n\x04type\x18\x06 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\"\xce\x01\n\x16ShowPartitionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fpartition_names\x18\x02 \x03(\t\x12\x14\n\x0cpartitionIDs\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\"m\n\x16\x44\x65scribeSegmentRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x11\n\tsegmentID\x18\x03 \x01(\x03\"\x8f\x01\n\x17\x44\x65scribeSegmentResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x0f\n\x07\x62uildID\x18\x03 \x01(\x03\x12\x14\n\x0c\x65nable_index\x18\x04 \x01(\x08\x12\x0f\n\x07\x66ieldID\x18\x05 \x01(\x03\"l\n\x13ShowSegmentsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\"W\n\x14ShowSegmentsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x12\n\nsegmentIDs\x18\x02 \x03(\x03\"\xcb\x01\n\x12\x43reateIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x37\n\x0c\x65xtra_params\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nindex_name\x18\x06 \x01(\t\"\x94\x01\n\x14\x44\x65scribeIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t\"~\n\x10IndexDescription\x12\x12\n\nindex_name\x18\x01 \x01(\t\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x31\n\x06params\x18\x03 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nfield_name\x18\x04 \x01(\t\"\x87\x01\n\x15\x44\x65scribeIndexResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"\x9c\x01\n\x1cGetIndexBuildProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t\"v\n\x1dGetIndexBuildProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0cindexed_rows\x18\x02 \x01(\x03\x12\x12\n\ntotal_rows\x18\x03 \x01(\x03\"\x94\x01\n\x14GetIndexStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t\"\x89\x01\n\x15GetIndexStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12.\n\x05state\x18\x02 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x13\n\x0b\x66\x61il_reason\x18\x03 \x01(\t\"\x90\x01\n\x10\x44ropIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t\"\xd7\x01\n\rInsertRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x33\n\x0b\x66ields_data\x18\x05 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x11\n\thash_keys\x18\x06 \x03(\r\x12\x10\n\x08num_rows\x18\x07 \x01(\r\"\xf0\x01\n\x0eMutationResult\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12%\n\x03IDs\x18\x02 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x12\n\nsucc_index\x18\x03 \x03(\r\x12\x11\n\terr_index\x18\x04 \x03(\r\x12\x14\n\x0c\x61\x63knowledged\x18\x05 \x01(\x08\x12\x12\n\ninsert_cnt\x18\x06 \x01(\x03\x12\x12\n\ndelete_cnt\x18\x07 \x01(\x03\x12\x12\n\nupsert_cnt\x18\x08 \x01(\x03\x12\x11\n\ttimestamp\x18\t \x01(\x04\"\x9e\x01\n\rDeleteRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x05 \x01(\t\x12\x11\n\thash_keys\x18\x06 \x03(\r\"\xea\x02\n\rSearchRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x0b\n\x03\x64sl\x18\x05 \x01(\t\x12\x19\n\x11placeholder_group\x18\x06 \x01(\x0c\x12.\n\x08\x64sl_type\x18\x07 \x01(\x0e\x32\x1c.milvus.proto.common.DslType\x12\x15\n\routput_fields\x18\x08 \x03(\t\x12\x38\n\rsearch_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x18\n\x10travel_timestamp\x18\n \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x0b \x01(\x04\x12\n\n\x02nq\x18\x0c \x01(\x03\"5\n\x04Hits\x12\x0b\n\x03IDs\x18\x01 \x03(\x03\x12\x10\n\x08row_data\x18\x02 \x03(\x0c\x12\x0e\n\x06scores\x18\x03 \x03(\x02\"\x8d\x01\n\rSearchResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x36\n\x07results\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.SearchResultData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"e\n\x0c\x46lushRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x18\n\x10\x63ollection_names\x18\x03 \x03(\t\"\xe9\x01\n\rFlushResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12G\n\x0b\x63oll_segIDs\x18\x03 \x03(\x0b\x32\x32.milvus.proto.milvus.FlushResponse.CollSegIDsEntry\x1aQ\n\x0f\x43ollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\"\xd9\x01\n\x0cQueryRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x04 \x01(\t\x12\x15\n\routput_fields\x18\x05 \x03(\t\x12\x17\n\x0fpartition_names\x18\x06 \x03(\t\x12\x18\n\x10travel_timestamp\x18\x07 \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x08 \x01(\x04\"\x89\x01\n\x0cQueryResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x0b\x66ields_data\x18\x02 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"}\n\tVectorIDs\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12*\n\x08id_array\x18\x03 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x83\x01\n\x0cVectorsArray\x12\x32\n\x08id_array\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.milvus.VectorIDsH\x00\x12\x36\n\ndata_array\x18\x02 \x01(\x0b\x32 .milvus.proto.schema.VectorFieldH\x00\x42\x07\n\x05\x61rray\"\xdd\x01\n\x13\x43\x61lcDistanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x32\n\x07op_left\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x33\n\x08op_right\x18\x03 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x31\n\x06params\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb5\x01\n\x13\x43\x61lcDistanceResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x31\n\x08int_dist\x18\x02 \x01(\x0b\x32\x1d.milvus.proto.schema.IntArrayH\x00\x12\x35\n\nfloat_dist\x18\x03 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x42\x07\n\x05\x61rray\"\x99\x01\n\x15PersistentSegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08num_rows\x18\x04 \x01(\x03\x12\x30\n\x05state\x18\x05 \x01(\x0e\x32!.milvus.proto.common.SegmentState\"u\n\x1fGetPersistentSegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x8a\x01\n GetPersistentSegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x39\n\x05infos\x18\x02 \x03(\x0b\x32*.milvus.proto.milvus.PersistentSegmentInfo\"\xec\x01\n\x10QuerySegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08mem_size\x18\x04 \x01(\x03\x12\x10\n\x08num_rows\x18\x05 \x01(\x03\x12\x12\n\nindex_name\x18\x06 \x01(\t\x12\x0f\n\x07indexID\x18\x07 \x01(\x03\x12\x0e\n\x06nodeID\x18\x08 \x01(\x03\x12\x30\n\x05state\x18\t \x01(\x0e\x32!.milvus.proto.common.SegmentState\x12\x0f\n\x07nodeIds\x18\n \x03(\x03\"p\n\x1aGetQuerySegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x80\x01\n\x1bGetQuerySegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x05infos\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.QuerySegmentInfo\"$\n\x0c\x44ummyRequest\x12\x14\n\x0crequest_type\x18\x01 \x01(\t\"!\n\rDummyResponse\x12\x10\n\x08response\x18\x01 \x01(\t\"\x15\n\x13RegisterLinkRequest\"r\n\x14RegisterLinkResponse\x12-\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.Address\x12+\n\x06status\x18\x02 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"P\n\x11GetMetricsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07request\x18\x02 \x01(\t\"k\n\x12GetMetricsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08response\x18\x02 \x01(\t\x12\x16\n\x0e\x63omponent_name\x18\x03 \x01(\t\"\x9c\x01\n\x12LoadBalanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x12\n\nsrc_nodeID\x18\x02 \x01(\x03\x12\x13\n\x0b\x64st_nodeIDs\x18\x03 \x03(\x03\x12\x19\n\x11sealed_segmentIDs\x18\x04 \x03(\x03\x12\x16\n\x0e\x63ollectionName\x18\x05 \x01(\t\"C\n\x17ManualCompactionRequest\x12\x14\n\x0c\x63ollectionID\x18\x01 \x01(\x03\x12\x12\n\ntimetravel\x18\x02 \x01(\x04\"]\n\x18ManualCompactionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x63ompactionID\x18\x02 \x01(\x03\"1\n\x19GetCompactionStateRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xc7\x01\n\x1aGetCompactionStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12\x17\n\x0f\x65xecutingPlanNo\x18\x03 \x01(\x03\x12\x15\n\rtimeoutPlanNo\x18\x04 \x01(\x03\x12\x17\n\x0f\x63ompletedPlanNo\x18\x05 \x01(\x03\"1\n\x19GetCompactionPlansRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xbc\x01\n\x1aGetCompactionPlansResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12<\n\nmergeInfos\x18\x03 \x03(\x0b\x32(.milvus.proto.milvus.CompactionMergeInfo\"6\n\x13\x43ompactionMergeInfo\x12\x0f\n\x07sources\x18\x01 \x03(\x03\x12\x0e\n\x06target\x18\x02 \x01(\x03\"*\n\x14GetFlushStateRequest\x12\x12\n\nsegmentIDs\x18\x01 \x03(\x03\"U\n\x15GetFlushStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"\xad\x01\n\rImportRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x16\n\x0epartition_name\x18\x02 \x01(\t\x12\x15\n\rchannel_names\x18\x03 \x03(\t\x12\x11\n\trow_based\x18\x04 \x01(\x08\x12\r\n\x05\x66iles\x18\x05 \x03(\t\x12\x32\n\x07options\x18\x06 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"L\n\x0eImportResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05tasks\x18\x02 \x03(\x03\"%\n\x15GetImportStateRequest\x12\x0c\n\x04task\x18\x01 \x01(\x03\"\x86\x02\n\x16GetImportStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12/\n\x05state\x18\x02 \x01(\x0e\x32 .milvus.proto.common.ImportState\x12\x11\n\trow_count\x18\x03 \x01(\x03\x12\x0f\n\x07id_list\x18\x04 \x03(\x03\x12\x30\n\x05infos\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\n\n\x02id\x18\x06 \x01(\x03\x12\x16\n\x0e\x64\x61ta_queryable\x18\x07 \x01(\x08\x12\x14\n\x0c\x64\x61ta_indexed\x18\x08 \x01(\x08\"\x18\n\x16ListImportTasksRequest\"\x82\x01\n\x17ListImportTasksResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x05tasks\x18\x02 \x03(\x0b\x32+.milvus.proto.milvus.GetImportStateResponse\"p\n\x12GetReplicasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x18\n\x10with_shard_nodes\x18\x03 \x01(\x08\"v\n\x13GetReplicasResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08replicas\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.ReplicaInfo\"\x9a\x01\n\x0bReplicaInfo\x12\x11\n\treplicaID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x15\n\rpartition_ids\x18\x03 \x03(\x03\x12\x39\n\x0eshard_replicas\x18\x04 \x03(\x0b\x32!.milvus.proto.milvus.ShardReplica\x12\x10\n\x08node_ids\x18\x05 \x03(\x03\"`\n\x0cShardReplica\x12\x10\n\x08leaderID\x18\x01 \x01(\x03\x12\x13\n\x0bleader_addr\x18\x02 \x01(\t\x12\x17\n\x0f\x64m_channel_name\x18\x03 \x01(\t\x12\x10\n\x08node_ids\x18\x04 \x03(\x03\"\xaa\x01\n\x17\x43reateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x10\n\x08password\x18\x03 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x04 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x05 \x01(\x04\"\xc2\x01\n\x17UpdateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boldPassword\x18\x03 \x01(\t\x12\x13\n\x0bnewPassword\x18\x04 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x06 \x01(\x04\"W\n\x17\x44\x65leteCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\"W\n\x15ListCredUsersResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tusernames\x18\x02 \x03(\t\"B\n\x14ListCredUsersRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\"\x1a\n\nRoleEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1a\n\nUserEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"p\n\x11\x43reateRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12/\n\x06\x65ntity\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\"P\n\x0f\x44ropRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\trole_name\x18\x02 \x01(\t\"\xa1\x01\n\x16OperateUserRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x11\n\trole_name\x18\x03 \x01(\t\x12\x36\n\x04type\x18\x04 \x01(\x0e\x32(.milvus.proto.milvus.OperateUserRoleType\"\x89\x01\n\x11SelectRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04role\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x19\n\x11include_user_info\x18\x03 \x01(\x08\"k\n\nRoleResult\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12.\n\x05users\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\"s\n\x12SelectRoleResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleResult\"\x89\x01\n\x11SelectUserRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04user\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x19\n\x11include_role_info\x18\x03 \x01(\x08\"k\n\nUserResult\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12.\n\x05roles\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\"r\n\x12SelectUserResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12/\n\x06result\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserResult\"\x1e\n\x0eResourceEntity\x12\x0c\n\x04type\x18\x01 \x01(\t\"\x1f\n\x0fPrivilegeEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x98\x01\n\x15SelectResourceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x33\n\x06\x65ntity\x18\x02 \x01(\x0b\x32#.milvus.proto.milvus.ResourceEntity\x12\x1e\n\x16include_privilege_info\x18\x03 \x01(\x08\"\x81\x01\n\x0eResourceResult\x12\x35\n\x08resource\x18\x01 \x01(\x0b\x32#.milvus.proto.milvus.ResourceEntity\x12\x38\n\nprivileges\x18\x02 \x03(\x0b\x32$.milvus.proto.milvus.PrivilegeEntity\"{\n\x16SelectResourceResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x07results\x18\x02 \x03(\x0b\x32#.milvus.proto.milvus.ResourceResult\"\x98\x01\n\x0fPrincipalEntity\x12\x16\n\x0eprincipal_type\x18\x01 \x01(\t\x12/\n\x04user\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntityH\x00\x12/\n\x04role\x18\x03 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntityH\x00\x42\x0b\n\tprincipal\"w\n\rGrantorEntity\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x37\n\tprivilege\x18\x02 \x01(\x0b\x32$.milvus.proto.milvus.PrivilegeEntity\"\xc9\x01\n\x0bGrantEntity\x12\x37\n\tprincipal\x18\x01 \x01(\x0b\x32$.milvus.proto.milvus.PrincipalEntity\x12\x35\n\x08resource\x18\x02 \x01(\x0b\x32#.milvus.proto.milvus.ResourceEntity\x12\x15\n\rresource_name\x18\x03 \x01(\t\x12\x33\n\x07grantor\x18\x04 \x01(\x0b\x32\".milvus.proto.milvus.GrantorEntity\"r\n\x12SelectGrantRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity\"v\n\x13SelectGrantResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08\x65ntities\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.GrantEntity\"\xb0\x01\n\x17OperatePrivilegeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity\x12\x37\n\x04type\x18\x03 \x01(\x0e\x32).milvus.proto.milvus.OperatePrivilegeType\"\x1c\n\tMilvusExt\x12\x0f\n\x07version\x18\x01 \x01(\t*!\n\x08ShowType\x12\x07\n\x03\x41ll\x10\x00\x12\x0c\n\x08InMemory\x10\x01*@\n\x13OperateUserRoleType\x12\x11\n\rAddUserToRole\x10\x00\x12\x16\n\x12RemoveUserFromRole\x10\x01*-\n\x14OperatePrivilegeType\x12\t\n\x05Grant\x10\x00\x12\n\n\x06Revoke\x10\x01\x32\xa1+\n\rMilvusService\x12_\n\x10\x43reateCollection\x12,.milvus.proto.milvus.CreateCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12[\n\x0e\x44ropCollection\x12*.milvus.proto.milvus.DropCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\rHasCollection\x12).milvus.proto.milvus.HasCollectionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadCollection\x12*.milvus.proto.milvus.LoadCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleaseCollection\x12-.milvus.proto.milvus.ReleaseCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12\x44\x65scribeCollection\x12..milvus.proto.milvus.DescribeCollectionRequest\x1a/.milvus.proto.milvus.DescribeCollectionResponse\"\x00\x12\x86\x01\n\x17GetCollectionStatistics\x12\x33.milvus.proto.milvus.GetCollectionStatisticsRequest\x1a\x34.milvus.proto.milvus.GetCollectionStatisticsResponse\"\x00\x12n\n\x0fShowCollections\x12+.milvus.proto.milvus.ShowCollectionsRequest\x1a,.milvus.proto.milvus.ShowCollectionsResponse\"\x00\x12]\n\x0f\x43reatePartition\x12+.milvus.proto.milvus.CreatePartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Y\n\rDropPartition\x12).milvus.proto.milvus.DropPartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0cHasPartition\x12(.milvus.proto.milvus.HasPartitionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadPartitions\x12*.milvus.proto.milvus.LoadPartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleasePartitions\x12-.milvus.proto.milvus.ReleasePartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x83\x01\n\x16GetPartitionStatistics\x12\x32.milvus.proto.milvus.GetPartitionStatisticsRequest\x1a\x33.milvus.proto.milvus.GetPartitionStatisticsResponse\"\x00\x12k\n\x0eShowPartitions\x12*.milvus.proto.milvus.ShowPartitionsRequest\x1a+.milvus.proto.milvus.ShowPartitionsResponse\"\x00\x12U\n\x0b\x43reateAlias\x12\'.milvus.proto.milvus.CreateAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Q\n\tDropAlias\x12%.milvus.proto.milvus.DropAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\nAlterAlias\x12&.milvus.proto.milvus.AlterAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12U\n\x0b\x43reateIndex\x12\'.milvus.proto.milvus.CreateIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rDescribeIndex\x12).milvus.proto.milvus.DescribeIndexRequest\x1a*.milvus.proto.milvus.DescribeIndexResponse\"\x00\x12h\n\rGetIndexState\x12).milvus.proto.milvus.GetIndexStateRequest\x1a*.milvus.proto.milvus.GetIndexStateResponse\"\x00\x12\x80\x01\n\x15GetIndexBuildProgress\x12\x31.milvus.proto.milvus.GetIndexBuildProgressRequest\x1a\x32.milvus.proto.milvus.GetIndexBuildProgressResponse\"\x00\x12Q\n\tDropIndex\x12%.milvus.proto.milvus.DropIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\x06Insert\x12\".milvus.proto.milvus.InsertRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12S\n\x06\x44\x65lete\x12\".milvus.proto.milvus.DeleteRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12R\n\x06Search\x12\".milvus.proto.milvus.SearchRequest\x1a\".milvus.proto.milvus.SearchResults\"\x00\x12P\n\x05\x46lush\x12!.milvus.proto.milvus.FlushRequest\x1a\".milvus.proto.milvus.FlushResponse\"\x00\x12O\n\x05Query\x12!.milvus.proto.milvus.QueryRequest\x1a!.milvus.proto.milvus.QueryResults\"\x00\x12\x64\n\x0c\x43\x61lcDistance\x12(.milvus.proto.milvus.CalcDistanceRequest\x1a(.milvus.proto.milvus.CalcDistanceResults\"\x00\x12h\n\rGetFlushState\x12).milvus.proto.milvus.GetFlushStateRequest\x1a*.milvus.proto.milvus.GetFlushStateResponse\"\x00\x12\x89\x01\n\x18GetPersistentSegmentInfo\x12\x34.milvus.proto.milvus.GetPersistentSegmentInfoRequest\x1a\x35.milvus.proto.milvus.GetPersistentSegmentInfoResponse\"\x00\x12z\n\x13GetQuerySegmentInfo\x12/.milvus.proto.milvus.GetQuerySegmentInfoRequest\x1a\x30.milvus.proto.milvus.GetQuerySegmentInfoResponse\"\x00\x12\x62\n\x0bGetReplicas\x12\'.milvus.proto.milvus.GetReplicasRequest\x1a(.milvus.proto.milvus.GetReplicasResponse\"\x00\x12P\n\x05\x44ummy\x12!.milvus.proto.milvus.DummyRequest\x1a\".milvus.proto.milvus.DummyResponse\"\x00\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00\x12_\n\nGetMetrics\x12&.milvus.proto.milvus.GetMetricsRequest\x1a\'.milvus.proto.milvus.GetMetricsResponse\"\x00\x12U\n\x0bLoadBalance\x12\'.milvus.proto.milvus.LoadBalanceRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12GetCompactionState\x12..milvus.proto.milvus.GetCompactionStateRequest\x1a/.milvus.proto.milvus.GetCompactionStateResponse\"\x00\x12q\n\x10ManualCompaction\x12,.milvus.proto.milvus.ManualCompactionRequest\x1a-.milvus.proto.milvus.ManualCompactionResponse\"\x00\x12\x80\x01\n\x1bGetCompactionStateWithPlans\x12..milvus.proto.milvus.GetCompactionPlansRequest\x1a/.milvus.proto.milvus.GetCompactionPlansResponse\"\x00\x12S\n\x06Import\x12\".milvus.proto.milvus.ImportRequest\x1a#.milvus.proto.milvus.ImportResponse\"\x00\x12k\n\x0eGetImportState\x12*.milvus.proto.milvus.GetImportStateRequest\x1a+.milvus.proto.milvus.GetImportStateResponse\"\x00\x12n\n\x0fListImportTasks\x12+.milvus.proto.milvus.ListImportTasksRequest\x1a,.milvus.proto.milvus.ListImportTasksResponse\"\x00\x12_\n\x10\x43reateCredential\x12,.milvus.proto.milvus.CreateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10UpdateCredential\x12,.milvus.proto.milvus.UpdateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10\x44\x65leteCredential\x12,.milvus.proto.milvus.DeleteCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rListCredUsers\x12).milvus.proto.milvus.ListCredUsersRequest\x1a*.milvus.proto.milvus.ListCredUsersResponse\"\x00\x12S\n\nCreateRole\x12&.milvus.proto.milvus.CreateRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12O\n\x08\x44ropRole\x12$.milvus.proto.milvus.DropRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fOperateUserRole\x12+.milvus.proto.milvus.OperateUserRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\nSelectRole\x12&.milvus.proto.milvus.SelectRoleRequest\x1a\'.milvus.proto.milvus.SelectRoleResponse\"\x00\x12_\n\nSelectUser\x12&.milvus.proto.milvus.SelectUserRequest\x1a\'.milvus.proto.milvus.SelectUserResponse\"\x00\x12k\n\x0eSelectResource\x12*.milvus.proto.milvus.SelectResourceRequest\x1a+.milvus.proto.milvus.SelectResourceResponse\"\x00\x12_\n\x10OperatePrivilege\x12,.milvus.proto.milvus.OperatePrivilegeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x62\n\x0bSelectGrant\x12\'.milvus.proto.milvus.SelectGrantRequest\x1a(.milvus.proto.milvus.SelectGrantResponse\"\x00\x32u\n\x0cProxyService\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00:U\n\x0emilvus_ext_obj\x12\x1c.google.protobuf.FileOptions\x18\xe9\x07 \x01(\x0b\x32\x1e.milvus.proto.milvus.MilvusExtBa\n\x0eio.milvus.grpcB\x0bMilvusProtoP\x01Z3github.com/milvus-io/milvus/internal/proto/milvuspb\xa0\x01\x01\xca>\x07\n\x05\x32.1.0b\x06proto3' - , - dependencies=[common__pb2.DESCRIPTOR,schema__pb2.DESCRIPTOR,google_dot_protobuf_dot_descriptor__pb2.DESCRIPTOR,]) - -_SHOWTYPE = _descriptor.EnumDescriptor( - name='ShowType', - full_name='milvus.proto.milvus.ShowType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='All', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='InMemory', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=15089, - serialized_end=15122, -) -_sym_db.RegisterEnumDescriptor(_SHOWTYPE) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cmilvus.proto\x12\x13milvus.proto.milvus\x1a\x0c\x63ommon.proto\x1a\x0cschema.proto\x1a google/protobuf/descriptor.proto\"y\n\x12\x43reateAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"^\n\x10\x44ropAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\"x\n\x11\x41lterAliasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\r\n\x05\x61lias\x18\x04 \x01(\t\"\xde\x01\n\x17\x43reateCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0e\n\x06schema\x18\x04 \x01(\x0c\x12\x12\n\nshards_num\x18\x05 \x01(\x05\x12@\n\x11\x63onsistency_level\x18\x06 \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel:\x07\xca>\x04\x10\x01\x18\x03\"v\n\x15\x44ropCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x02\x18\x03\"\x89\x01\n\x14HasCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\ntime_stamp\x18\x04 \x01(\x04:\x07\xca>\x04\x10\x04\x18\x03\"J\n\x0c\x42oolResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\x08\"L\n\x0eStringResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05value\x18\x02 \x01(\t\"\xa4\x01\n\x19\x44\x65scribeCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x12\n\ntime_stamp\x18\x05 \x01(\x04:\x07\xca>\x04\x10\x04\x18\x03\"\xca\x03\n\x1a\x44\x65scribeCollectionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x35\n\x06schema\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.CollectionSchema\x12\x14\n\x0c\x63ollectionID\x18\x03 \x01(\x03\x12\x1d\n\x15virtual_channel_names\x18\x04 \x03(\t\x12\x1e\n\x16physical_channel_names\x18\x05 \x03(\t\x12\x19\n\x11\x63reated_timestamp\x18\x06 \x01(\x04\x12\x1d\n\x15\x63reated_utc_timestamp\x18\x07 \x01(\x04\x12\x12\n\nshards_num\x18\x08 \x01(\x05\x12\x0f\n\x07\x61liases\x18\t \x03(\t\x12\x39\n\x0fstart_positions\x18\n \x03(\x0b\x32 .milvus.proto.common.KeyDataPair\x12@\n\x11\x63onsistency_level\x18\x0b \x01(\x0e\x32%.milvus.proto.common.ConsistencyLevel\x12\x17\n\x0f\x63ollection_name\x18\x0c \x01(\t\"\x8e\x01\n\x15LoadCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0ereplica_number\x18\x04 \x01(\x05:\x07\xca>\x04\x10\x05\x18\x03\"y\n\x18ReleaseCollectionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x06\x18\x03\"\x7f\n\x1eGetCollectionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t:\x07\xca>\x04\x10\x04\x18\x03\"\x80\x01\n\x1fGetCollectionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb7\x01\n\x16ShowCollectionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x12\n\ntime_stamp\x18\x03 \x01(\x04\x12+\n\x04type\x18\x04 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\x12\x18\n\x10\x63ollection_names\x18\x05 \x03(\t:\x05\xca>\x02\x10\x04\"\xf3\x01\n\x17ShowCollectionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x18\n\x10\x63ollection_names\x18\x02 \x03(\t\x12\x16\n\x0e\x63ollection_ids\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\x12\x1f\n\x17query_service_available\x18\x07 \x03(\x08\"\x86\x01\n\x16\x43reatePartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x84\x01\n\x14\x44ropPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x83\x01\n\x13HasPartitionRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x9e\x01\n\x15LoadPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x16\n\x0ereplica_number\x18\x05 \x01(\x05\"\x89\x01\n\x18ReleasePartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x8d\x01\n\x1dGetPartitionStatisticsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\"\x7f\n\x1eGetPartitionStatisticsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x05stats\x18\x02 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xc9\x01\n\x15ShowPartitionsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x14\n\x0c\x63ollectionID\x18\x04 \x01(\x03\x12\x17\n\x0fpartition_names\x18\x05 \x03(\t\x12+\n\x04type\x18\x06 \x01(\x0e\x32\x1d.milvus.proto.milvus.ShowType\"\xce\x01\n\x16ShowPartitionsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x17\n\x0fpartition_names\x18\x02 \x03(\t\x12\x14\n\x0cpartitionIDs\x18\x03 \x03(\x03\x12\x1a\n\x12\x63reated_timestamps\x18\x04 \x03(\x04\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x03(\x04\x12\x1c\n\x14inMemory_percentages\x18\x06 \x03(\x03\"m\n\x16\x44\x65scribeSegmentRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x11\n\tsegmentID\x18\x03 \x01(\x03\"\x8f\x01\n\x17\x44\x65scribeSegmentResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x0f\n\x07\x62uildID\x18\x03 \x01(\x03\x12\x14\n\x0c\x65nable_index\x18\x04 \x01(\x08\x12\x0f\n\x07\x66ieldID\x18\x05 \x01(\x03\"l\n\x13ShowSegmentsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\"W\n\x14ShowSegmentsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x12\n\nsegmentIDs\x18\x02 \x03(\x03\"\xcb\x01\n\x12\x43reateIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x37\n\x0c\x65xtra_params\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nindex_name\x18\x06 \x01(\t\"\x94\x01\n\x14\x44\x65scribeIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t\"~\n\x10IndexDescription\x12\x12\n\nindex_name\x18\x01 \x01(\t\x12\x0f\n\x07indexID\x18\x02 \x01(\x03\x12\x31\n\x06params\x18\x03 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x12\n\nfield_name\x18\x04 \x01(\t\"\x87\x01\n\x15\x44\x65scribeIndexResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x41\n\x12index_descriptions\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.IndexDescription\"\x9c\x01\n\x1cGetIndexBuildProgressRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t\"v\n\x1dGetIndexBuildProgressResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0cindexed_rows\x18\x02 \x01(\x03\x12\x12\n\ntotal_rows\x18\x03 \x01(\x03\"\x94\x01\n\x14GetIndexStateRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t\"\x89\x01\n\x15GetIndexStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12.\n\x05state\x18\x02 \x01(\x0e\x32\x1f.milvus.proto.common.IndexState\x12\x13\n\x0b\x66\x61il_reason\x18\x03 \x01(\t\"\x90\x01\n\x10\x44ropIndexRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x12\n\nfield_name\x18\x04 \x01(\t\x12\x12\n\nindex_name\x18\x05 \x01(\t\"\xd7\x01\n\rInsertRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x33\n\x0b\x66ields_data\x18\x05 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x11\n\thash_keys\x18\x06 \x03(\r\x12\x10\n\x08num_rows\x18\x07 \x01(\r\"\xf0\x01\n\x0eMutationResult\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12%\n\x03IDs\x18\x02 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x12\n\nsucc_index\x18\x03 \x03(\r\x12\x11\n\terr_index\x18\x04 \x03(\r\x12\x14\n\x0c\x61\x63knowledged\x18\x05 \x01(\x08\x12\x12\n\ninsert_cnt\x18\x06 \x01(\x03\x12\x12\n\ndelete_cnt\x18\x07 \x01(\x03\x12\x12\n\nupsert_cnt\x18\x08 \x01(\x03\x12\x11\n\ttimestamp\x18\t \x01(\x04\"\x9e\x01\n\rDeleteRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x16\n\x0epartition_name\x18\x04 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x05 \x01(\t\x12\x11\n\thash_keys\x18\x06 \x03(\r\"\xea\x02\n\rSearchRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\x12\x0b\n\x03\x64sl\x18\x05 \x01(\t\x12\x19\n\x11placeholder_group\x18\x06 \x01(\x0c\x12.\n\x08\x64sl_type\x18\x07 \x01(\x0e\x32\x1c.milvus.proto.common.DslType\x12\x15\n\routput_fields\x18\x08 \x03(\t\x12\x38\n\rsearch_params\x18\t \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x18\n\x10travel_timestamp\x18\n \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x0b \x01(\x04\x12\n\n\x02nq\x18\x0c \x01(\x03\"5\n\x04Hits\x12\x0b\n\x03IDs\x18\x01 \x03(\x03\x12\x10\n\x08row_data\x18\x02 \x03(\x0c\x12\x0e\n\x06scores\x18\x03 \x03(\x02\"\x8d\x01\n\rSearchResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x36\n\x07results\x18\x02 \x01(\x0b\x32%.milvus.proto.schema.SearchResultData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"e\n\x0c\x46lushRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x18\n\x10\x63ollection_names\x18\x03 \x03(\t\"\xe9\x01\n\rFlushResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12G\n\x0b\x63oll_segIDs\x18\x03 \x03(\x0b\x32\x32.milvus.proto.milvus.FlushResponse.CollSegIDsEntry\x1aQ\n\x0f\x43ollSegIDsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArray:\x02\x38\x01\"\xd9\x01\n\x0cQueryRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07\x64\x62_name\x18\x02 \x01(\t\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\x12\x0c\n\x04\x65xpr\x18\x04 \x01(\t\x12\x15\n\routput_fields\x18\x05 \x03(\t\x12\x17\n\x0fpartition_names\x18\x06 \x03(\t\x12\x18\n\x10travel_timestamp\x18\x07 \x01(\x04\x12\x1b\n\x13guarantee_timestamp\x18\x08 \x01(\x04\"\x89\x01\n\x0cQueryResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x0b\x66ields_data\x18\x02 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x17\n\x0f\x63ollection_name\x18\x03 \x01(\t\"}\n\tVectorIDs\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12*\n\x08id_array\x18\x03 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\x17\n\x0fpartition_names\x18\x04 \x03(\t\"\x83\x01\n\x0cVectorsArray\x12\x32\n\x08id_array\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.milvus.VectorIDsH\x00\x12\x36\n\ndata_array\x18\x02 \x01(\x0b\x32 .milvus.proto.schema.VectorFieldH\x00\x42\x07\n\x05\x61rray\"\xdd\x01\n\x13\x43\x61lcDistanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x32\n\x07op_left\x18\x02 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x33\n\x08op_right\x18\x03 \x01(\x0b\x32!.milvus.proto.milvus.VectorsArray\x12\x31\n\x06params\x18\x04 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"\xb5\x01\n\x13\x43\x61lcDistanceResults\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x31\n\x08int_dist\x18\x02 \x01(\x0b\x32\x1d.milvus.proto.schema.IntArrayH\x00\x12\x35\n\nfloat_dist\x18\x03 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x42\x07\n\x05\x61rray\"\x99\x01\n\x15PersistentSegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08num_rows\x18\x04 \x01(\x03\x12\x30\n\x05state\x18\x05 \x01(\x0e\x32!.milvus.proto.common.SegmentState\"u\n\x1fGetPersistentSegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x8a\x01\n GetPersistentSegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x39\n\x05infos\x18\x02 \x03(\x0b\x32*.milvus.proto.milvus.PersistentSegmentInfo\"\xec\x01\n\x10QuerySegmentInfo\x12\x11\n\tsegmentID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x13\n\x0bpartitionID\x18\x03 \x01(\x03\x12\x10\n\x08mem_size\x18\x04 \x01(\x03\x12\x10\n\x08num_rows\x18\x05 \x01(\x03\x12\x12\n\nindex_name\x18\x06 \x01(\t\x12\x0f\n\x07indexID\x18\x07 \x01(\x03\x12\x0e\n\x06nodeID\x18\x08 \x01(\x03\x12\x30\n\x05state\x18\t \x01(\x0e\x32!.milvus.proto.common.SegmentState\x12\x0f\n\x07nodeIds\x18\n \x03(\x03\"p\n\x1aGetQuerySegmentInfoRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0e\n\x06\x64\x62Name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ollectionName\x18\x03 \x01(\t\"\x80\x01\n\x1bGetQuerySegmentInfoResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x05infos\x18\x02 \x03(\x0b\x32%.milvus.proto.milvus.QuerySegmentInfo\"$\n\x0c\x44ummyRequest\x12\x14\n\x0crequest_type\x18\x01 \x01(\t\"!\n\rDummyResponse\x12\x10\n\x08response\x18\x01 \x01(\t\"\x15\n\x13RegisterLinkRequest\"r\n\x14RegisterLinkResponse\x12-\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.Address\x12+\n\x06status\x18\x02 \x01(\x0b\x32\x1b.milvus.proto.common.Status\"P\n\x11GetMetricsRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x0f\n\x07request\x18\x02 \x01(\t\"k\n\x12GetMetricsResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x10\n\x08response\x18\x02 \x01(\t\x12\x16\n\x0e\x63omponent_name\x18\x03 \x01(\t\"\x9c\x01\n\x12LoadBalanceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x12\n\nsrc_nodeID\x18\x02 \x01(\x03\x12\x13\n\x0b\x64st_nodeIDs\x18\x03 \x03(\x03\x12\x19\n\x11sealed_segmentIDs\x18\x04 \x03(\x03\x12\x16\n\x0e\x63ollectionName\x18\x05 \x01(\t\"C\n\x17ManualCompactionRequest\x12\x14\n\x0c\x63ollectionID\x18\x01 \x01(\x03\x12\x12\n\ntimetravel\x18\x02 \x01(\x04\"]\n\x18ManualCompactionResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x14\n\x0c\x63ompactionID\x18\x02 \x01(\x03\"1\n\x19GetCompactionStateRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xc7\x01\n\x1aGetCompactionStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12\x17\n\x0f\x65xecutingPlanNo\x18\x03 \x01(\x03\x12\x15\n\rtimeoutPlanNo\x18\x04 \x01(\x03\x12\x17\n\x0f\x63ompletedPlanNo\x18\x05 \x01(\x03\"1\n\x19GetCompactionPlansRequest\x12\x14\n\x0c\x63ompactionID\x18\x01 \x01(\x03\"\xbc\x01\n\x1aGetCompactionPlansResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x33\n\x05state\x18\x02 \x01(\x0e\x32$.milvus.proto.common.CompactionState\x12<\n\nmergeInfos\x18\x03 \x03(\x0b\x32(.milvus.proto.milvus.CompactionMergeInfo\"6\n\x13\x43ompactionMergeInfo\x12\x0f\n\x07sources\x18\x01 \x03(\x03\x12\x0e\n\x06target\x18\x02 \x01(\x03\"*\n\x14GetFlushStateRequest\x12\x12\n\nsegmentIDs\x18\x01 \x03(\x03\"U\n\x15GetFlushStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x0f\n\x07\x66lushed\x18\x02 \x01(\x08\"\xad\x01\n\rImportRequest\x12\x17\n\x0f\x63ollection_name\x18\x01 \x01(\t\x12\x16\n\x0epartition_name\x18\x02 \x01(\t\x12\x15\n\rchannel_names\x18\x03 \x03(\t\x12\x11\n\trow_based\x18\x04 \x01(\x08\x12\r\n\x05\x66iles\x18\x05 \x03(\t\x12\x32\n\x07options\x18\x06 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\"L\n\x0eImportResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\r\n\x05tasks\x18\x02 \x03(\x03\"%\n\x15GetImportStateRequest\x12\x0c\n\x04task\x18\x01 \x01(\x03\"\x86\x02\n\x16GetImportStateResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12/\n\x05state\x18\x02 \x01(\x0e\x32 .milvus.proto.common.ImportState\x12\x11\n\trow_count\x18\x03 \x01(\x03\x12\x0f\n\x07id_list\x18\x04 \x03(\x03\x12\x30\n\x05infos\x18\x05 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\n\n\x02id\x18\x06 \x01(\x03\x12\x16\n\x0e\x64\x61ta_queryable\x18\x07 \x01(\x08\x12\x14\n\x0c\x64\x61ta_indexed\x18\x08 \x01(\x08\"\x18\n\x16ListImportTasksRequest\"\x82\x01\n\x17ListImportTasksResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12:\n\x05tasks\x18\x02 \x03(\x0b\x32+.milvus.proto.milvus.GetImportStateResponse\"p\n\x12GetReplicasRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x18\n\x10with_shard_nodes\x18\x03 \x01(\x08\"v\n\x13GetReplicasResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08replicas\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.ReplicaInfo\"\x9a\x01\n\x0bReplicaInfo\x12\x11\n\treplicaID\x18\x01 \x01(\x03\x12\x14\n\x0c\x63ollectionID\x18\x02 \x01(\x03\x12\x15\n\rpartition_ids\x18\x03 \x03(\x03\x12\x39\n\x0eshard_replicas\x18\x04 \x03(\x0b\x32!.milvus.proto.milvus.ShardReplica\x12\x10\n\x08node_ids\x18\x05 \x03(\x03\"`\n\x0cShardReplica\x12\x10\n\x08leaderID\x18\x01 \x01(\x03\x12\x13\n\x0bleader_addr\x18\x02 \x01(\t\x12\x17\n\x0f\x64m_channel_name\x18\x03 \x01(\t\x12\x10\n\x08node_ids\x18\x04 \x03(\x03\"\xaa\x01\n\x17\x43reateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x10\n\x08password\x18\x03 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x04 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x05 \x01(\x04\"\xc2\x01\n\x17UpdateCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x13\n\x0boldPassword\x18\x03 \x01(\t\x12\x13\n\x0bnewPassword\x18\x04 \x01(\t\x12\x1e\n\x16\x63reated_utc_timestamps\x18\x05 \x01(\x04\x12\x1f\n\x17modified_utc_timestamps\x18\x06 \x01(\x04\"W\n\x17\x44\x65leteCredentialRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\"W\n\x15ListCredUsersResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x11\n\tusernames\x18\x02 \x03(\t\"B\n\x14ListCredUsersRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\"\x1a\n\nRoleEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1a\n\nUserEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"p\n\x11\x43reateRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12/\n\x06\x65ntity\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\"P\n\x0f\x44ropRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x11\n\trole_name\x18\x02 \x01(\t\"\xa1\x01\n\x16OperateUserRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x10\n\x08username\x18\x02 \x01(\t\x12\x11\n\trole_name\x18\x03 \x01(\t\x12\x36\n\x04type\x18\x04 \x01(\x0e\x32(.milvus.proto.milvus.OperateUserRoleType\"\x89\x01\n\x11SelectRoleRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04role\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12\x19\n\x11include_user_info\x18\x03 \x01(\x08\"k\n\nRoleResult\x12-\n\x04role\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\x12.\n\x05users\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\"s\n\x12SelectRoleResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x30\n\x07results\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleResult\"\x89\x01\n\x11SelectUserRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12-\n\x04user\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x19\n\x11include_role_info\x18\x03 \x01(\x08\"k\n\nUserResult\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12.\n\x05roles\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.RoleEntity\"r\n\x12SelectUserResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12/\n\x06result\x18\x02 \x03(\x0b\x32\x1f.milvus.proto.milvus.UserResult\"\x1e\n\x0eResourceEntity\x12\x0c\n\x04type\x18\x01 \x01(\t\"\x1f\n\x0fPrivilegeEntity\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x98\x01\n\x15SelectResourceRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x33\n\x06\x65ntity\x18\x02 \x01(\x0b\x32#.milvus.proto.milvus.ResourceEntity\x12\x1e\n\x16include_privilege_info\x18\x03 \x01(\x08\"\x81\x01\n\x0eResourceResult\x12\x35\n\x08resource\x18\x01 \x01(\x0b\x32#.milvus.proto.milvus.ResourceEntity\x12\x38\n\nprivileges\x18\x02 \x03(\x0b\x32$.milvus.proto.milvus.PrivilegeEntity\"{\n\x16SelectResourceResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x34\n\x07results\x18\x02 \x03(\x0b\x32#.milvus.proto.milvus.ResourceResult\"\x98\x01\n\x0fPrincipalEntity\x12\x16\n\x0eprincipal_type\x18\x01 \x01(\t\x12/\n\x04user\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntityH\x00\x12/\n\x04role\x18\x03 \x01(\x0b\x32\x1f.milvus.proto.milvus.RoleEntityH\x00\x42\x0b\n\tprincipal\"w\n\rGrantorEntity\x12-\n\x04user\x18\x01 \x01(\x0b\x32\x1f.milvus.proto.milvus.UserEntity\x12\x37\n\tprivilege\x18\x02 \x01(\x0b\x32$.milvus.proto.milvus.PrivilegeEntity\"\xc9\x01\n\x0bGrantEntity\x12\x37\n\tprincipal\x18\x01 \x01(\x0b\x32$.milvus.proto.milvus.PrincipalEntity\x12\x35\n\x08resource\x18\x02 \x01(\x0b\x32#.milvus.proto.milvus.ResourceEntity\x12\x15\n\rresource_name\x18\x03 \x01(\t\x12\x33\n\x07grantor\x18\x04 \x01(\x0b\x32\".milvus.proto.milvus.GrantorEntity\"r\n\x12SelectGrantRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity\"v\n\x13SelectGrantResponse\x12+\n\x06status\x18\x01 \x01(\x0b\x32\x1b.milvus.proto.common.Status\x12\x32\n\x08\x65ntities\x18\x02 \x03(\x0b\x32 .milvus.proto.milvus.GrantEntity\"\xb0\x01\n\x17OperatePrivilegeRequest\x12*\n\x04\x62\x61se\x18\x01 \x01(\x0b\x32\x1c.milvus.proto.common.MsgBase\x12\x30\n\x06\x65ntity\x18\x02 \x01(\x0b\x32 .milvus.proto.milvus.GrantEntity\x12\x37\n\x04type\x18\x03 \x01(\x0e\x32).milvus.proto.milvus.OperatePrivilegeType\"\x1c\n\tMilvusExt\x12\x0f\n\x07version\x18\x01 \x01(\t*!\n\x08ShowType\x12\x07\n\x03\x41ll\x10\x00\x12\x0c\n\x08InMemory\x10\x01*@\n\x13OperateUserRoleType\x12\x11\n\rAddUserToRole\x10\x00\x12\x16\n\x12RemoveUserFromRole\x10\x01*-\n\x14OperatePrivilegeType\x12\t\n\x05Grant\x10\x00\x12\n\n\x06Revoke\x10\x01\x32\xa1+\n\rMilvusService\x12_\n\x10\x43reateCollection\x12,.milvus.proto.milvus.CreateCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12[\n\x0e\x44ropCollection\x12*.milvus.proto.milvus.DropCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\rHasCollection\x12).milvus.proto.milvus.HasCollectionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadCollection\x12*.milvus.proto.milvus.LoadCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleaseCollection\x12-.milvus.proto.milvus.ReleaseCollectionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12\x44\x65scribeCollection\x12..milvus.proto.milvus.DescribeCollectionRequest\x1a/.milvus.proto.milvus.DescribeCollectionResponse\"\x00\x12\x86\x01\n\x17GetCollectionStatistics\x12\x33.milvus.proto.milvus.GetCollectionStatisticsRequest\x1a\x34.milvus.proto.milvus.GetCollectionStatisticsResponse\"\x00\x12n\n\x0fShowCollections\x12+.milvus.proto.milvus.ShowCollectionsRequest\x1a,.milvus.proto.milvus.ShowCollectionsResponse\"\x00\x12]\n\x0f\x43reatePartition\x12+.milvus.proto.milvus.CreatePartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Y\n\rDropPartition\x12).milvus.proto.milvus.DropPartitionRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0cHasPartition\x12(.milvus.proto.milvus.HasPartitionRequest\x1a!.milvus.proto.milvus.BoolResponse\"\x00\x12[\n\x0eLoadPartitions\x12*.milvus.proto.milvus.LoadPartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x61\n\x11ReleasePartitions\x12-.milvus.proto.milvus.ReleasePartitionsRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x83\x01\n\x16GetPartitionStatistics\x12\x32.milvus.proto.milvus.GetPartitionStatisticsRequest\x1a\x33.milvus.proto.milvus.GetPartitionStatisticsResponse\"\x00\x12k\n\x0eShowPartitions\x12*.milvus.proto.milvus.ShowPartitionsRequest\x1a+.milvus.proto.milvus.ShowPartitionsResponse\"\x00\x12U\n\x0b\x43reateAlias\x12\'.milvus.proto.milvus.CreateAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12Q\n\tDropAlias\x12%.milvus.proto.milvus.DropAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\nAlterAlias\x12&.milvus.proto.milvus.AlterAliasRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12U\n\x0b\x43reateIndex\x12\'.milvus.proto.milvus.CreateIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rDescribeIndex\x12).milvus.proto.milvus.DescribeIndexRequest\x1a*.milvus.proto.milvus.DescribeIndexResponse\"\x00\x12h\n\rGetIndexState\x12).milvus.proto.milvus.GetIndexStateRequest\x1a*.milvus.proto.milvus.GetIndexStateResponse\"\x00\x12\x80\x01\n\x15GetIndexBuildProgress\x12\x31.milvus.proto.milvus.GetIndexBuildProgressRequest\x1a\x32.milvus.proto.milvus.GetIndexBuildProgressResponse\"\x00\x12Q\n\tDropIndex\x12%.milvus.proto.milvus.DropIndexRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12S\n\x06Insert\x12\".milvus.proto.milvus.InsertRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12S\n\x06\x44\x65lete\x12\".milvus.proto.milvus.DeleteRequest\x1a#.milvus.proto.milvus.MutationResult\"\x00\x12R\n\x06Search\x12\".milvus.proto.milvus.SearchRequest\x1a\".milvus.proto.milvus.SearchResults\"\x00\x12P\n\x05\x46lush\x12!.milvus.proto.milvus.FlushRequest\x1a\".milvus.proto.milvus.FlushResponse\"\x00\x12O\n\x05Query\x12!.milvus.proto.milvus.QueryRequest\x1a!.milvus.proto.milvus.QueryResults\"\x00\x12\x64\n\x0c\x43\x61lcDistance\x12(.milvus.proto.milvus.CalcDistanceRequest\x1a(.milvus.proto.milvus.CalcDistanceResults\"\x00\x12h\n\rGetFlushState\x12).milvus.proto.milvus.GetFlushStateRequest\x1a*.milvus.proto.milvus.GetFlushStateResponse\"\x00\x12\x89\x01\n\x18GetPersistentSegmentInfo\x12\x34.milvus.proto.milvus.GetPersistentSegmentInfoRequest\x1a\x35.milvus.proto.milvus.GetPersistentSegmentInfoResponse\"\x00\x12z\n\x13GetQuerySegmentInfo\x12/.milvus.proto.milvus.GetQuerySegmentInfoRequest\x1a\x30.milvus.proto.milvus.GetQuerySegmentInfoResponse\"\x00\x12\x62\n\x0bGetReplicas\x12\'.milvus.proto.milvus.GetReplicasRequest\x1a(.milvus.proto.milvus.GetReplicasResponse\"\x00\x12P\n\x05\x44ummy\x12!.milvus.proto.milvus.DummyRequest\x1a\".milvus.proto.milvus.DummyResponse\"\x00\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00\x12_\n\nGetMetrics\x12&.milvus.proto.milvus.GetMetricsRequest\x1a\'.milvus.proto.milvus.GetMetricsResponse\"\x00\x12U\n\x0bLoadBalance\x12\'.milvus.proto.milvus.LoadBalanceRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12w\n\x12GetCompactionState\x12..milvus.proto.milvus.GetCompactionStateRequest\x1a/.milvus.proto.milvus.GetCompactionStateResponse\"\x00\x12q\n\x10ManualCompaction\x12,.milvus.proto.milvus.ManualCompactionRequest\x1a-.milvus.proto.milvus.ManualCompactionResponse\"\x00\x12\x80\x01\n\x1bGetCompactionStateWithPlans\x12..milvus.proto.milvus.GetCompactionPlansRequest\x1a/.milvus.proto.milvus.GetCompactionPlansResponse\"\x00\x12S\n\x06Import\x12\".milvus.proto.milvus.ImportRequest\x1a#.milvus.proto.milvus.ImportResponse\"\x00\x12k\n\x0eGetImportState\x12*.milvus.proto.milvus.GetImportStateRequest\x1a+.milvus.proto.milvus.GetImportStateResponse\"\x00\x12n\n\x0fListImportTasks\x12+.milvus.proto.milvus.ListImportTasksRequest\x1a,.milvus.proto.milvus.ListImportTasksResponse\"\x00\x12_\n\x10\x43reateCredential\x12,.milvus.proto.milvus.CreateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10UpdateCredential\x12,.milvus.proto.milvus.UpdateCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\x10\x44\x65leteCredential\x12,.milvus.proto.milvus.DeleteCredentialRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12h\n\rListCredUsers\x12).milvus.proto.milvus.ListCredUsersRequest\x1a*.milvus.proto.milvus.ListCredUsersResponse\"\x00\x12S\n\nCreateRole\x12&.milvus.proto.milvus.CreateRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12O\n\x08\x44ropRole\x12$.milvus.proto.milvus.DropRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12]\n\x0fOperateUserRole\x12+.milvus.proto.milvus.OperateUserRoleRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12_\n\nSelectRole\x12&.milvus.proto.milvus.SelectRoleRequest\x1a\'.milvus.proto.milvus.SelectRoleResponse\"\x00\x12_\n\nSelectUser\x12&.milvus.proto.milvus.SelectUserRequest\x1a\'.milvus.proto.milvus.SelectUserResponse\"\x00\x12k\n\x0eSelectResource\x12*.milvus.proto.milvus.SelectResourceRequest\x1a+.milvus.proto.milvus.SelectResourceResponse\"\x00\x12_\n\x10OperatePrivilege\x12,.milvus.proto.milvus.OperatePrivilegeRequest\x1a\x1b.milvus.proto.common.Status\"\x00\x12\x62\n\x0bSelectGrant\x12\'.milvus.proto.milvus.SelectGrantRequest\x1a(.milvus.proto.milvus.SelectGrantResponse\"\x00\x32u\n\x0cProxyService\x12\x65\n\x0cRegisterLink\x12(.milvus.proto.milvus.RegisterLinkRequest\x1a).milvus.proto.milvus.RegisterLinkResponse\"\x00:U\n\x0emilvus_ext_obj\x12\x1c.google.protobuf.FileOptions\x18\xe9\x07 \x01(\x0b\x32\x1e.milvus.proto.milvus.MilvusExtBa\n\x0eio.milvus.grpcB\x0bMilvusProtoP\x01Z3github.com/milvus-io/milvus/internal/proto/milvuspb\xa0\x01\x01\xca>\x07\n\x05\x32.1.0b\x06proto3') +_SHOWTYPE = DESCRIPTOR.enum_types_by_name['ShowType'] ShowType = enum_type_wrapper.EnumTypeWrapper(_SHOWTYPE) -_OPERATEUSERROLETYPE = _descriptor.EnumDescriptor( - name='OperateUserRoleType', - full_name='milvus.proto.milvus.OperateUserRoleType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='AddUserToRole', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='RemoveUserFromRole', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=15124, - serialized_end=15188, -) -_sym_db.RegisterEnumDescriptor(_OPERATEUSERROLETYPE) - +_OPERATEUSERROLETYPE = DESCRIPTOR.enum_types_by_name['OperateUserRoleType'] OperateUserRoleType = enum_type_wrapper.EnumTypeWrapper(_OPERATEUSERROLETYPE) -_OPERATEPRIVILEGETYPE = _descriptor.EnumDescriptor( - name='OperatePrivilegeType', - full_name='milvus.proto.milvus.OperatePrivilegeType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='Grant', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Revoke', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=15190, - serialized_end=15235, -) -_sym_db.RegisterEnumDescriptor(_OPERATEPRIVILEGETYPE) - +_OPERATEPRIVILEGETYPE = DESCRIPTOR.enum_types_by_name['OperatePrivilegeType'] OperatePrivilegeType = enum_type_wrapper.EnumTypeWrapper(_OPERATEPRIVILEGETYPE) All = 0 InMemory = 1 @@ -113,5855 +34,121 @@ Revoke = 1 MILVUS_EXT_OBJ_FIELD_NUMBER = 1001 -milvus_ext_obj = _descriptor.FieldDescriptor( - name='milvus_ext_obj', full_name='milvus.proto.milvus.milvus_ext_obj', index=0, - number=1001, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=True, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key) - - -_CREATEALIASREQUEST = _descriptor.Descriptor( - name='CreateAliasRequest', - full_name='milvus.proto.milvus.CreateAliasRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.CreateAliasRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.CreateAliasRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.CreateAliasRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='alias', full_name='milvus.proto.milvus.CreateAliasRequest.alias', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=99, - serialized_end=220, -) - - -_DROPALIASREQUEST = _descriptor.Descriptor( - name='DropAliasRequest', - full_name='milvus.proto.milvus.DropAliasRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DropAliasRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.DropAliasRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='alias', full_name='milvus.proto.milvus.DropAliasRequest.alias', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=222, - serialized_end=316, -) - - -_ALTERALIASREQUEST = _descriptor.Descriptor( - name='AlterAliasRequest', - full_name='milvus.proto.milvus.AlterAliasRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.AlterAliasRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.AlterAliasRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.AlterAliasRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='alias', full_name='milvus.proto.milvus.AlterAliasRequest.alias', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=318, - serialized_end=438, -) - - -_CREATECOLLECTIONREQUEST = _descriptor.Descriptor( - name='CreateCollectionRequest', - full_name='milvus.proto.milvus.CreateCollectionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.CreateCollectionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.CreateCollectionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.CreateCollectionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='schema', full_name='milvus.proto.milvus.CreateCollectionRequest.schema', index=3, - number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='shards_num', full_name='milvus.proto.milvus.CreateCollectionRequest.shards_num', index=4, - number=5, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='consistency_level', full_name='milvus.proto.milvus.CreateCollectionRequest.consistency_level', index=5, - number=6, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'\312>\004\020\001\030\003', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=441, - serialized_end=663, -) - - -_DROPCOLLECTIONREQUEST = _descriptor.Descriptor( - name='DropCollectionRequest', - full_name='milvus.proto.milvus.DropCollectionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DropCollectionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.DropCollectionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.DropCollectionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'\312>\004\020\002\030\003', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=665, - serialized_end=783, -) - - -_HASCOLLECTIONREQUEST = _descriptor.Descriptor( - name='HasCollectionRequest', - full_name='milvus.proto.milvus.HasCollectionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.HasCollectionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.HasCollectionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.HasCollectionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='time_stamp', full_name='milvus.proto.milvus.HasCollectionRequest.time_stamp', index=3, - number=4, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'\312>\004\020\004\030\003', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=786, - serialized_end=923, -) - - -_BOOLRESPONSE = _descriptor.Descriptor( - name='BoolResponse', - full_name='milvus.proto.milvus.BoolResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.BoolResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='value', full_name='milvus.proto.milvus.BoolResponse.value', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=925, - serialized_end=999, -) - - -_STRINGRESPONSE = _descriptor.Descriptor( - name='StringResponse', - full_name='milvus.proto.milvus.StringResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.StringResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='value', full_name='milvus.proto.milvus.StringResponse.value', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1001, - serialized_end=1077, -) - - -_DESCRIBECOLLECTIONREQUEST = _descriptor.Descriptor( - name='DescribeCollectionRequest', - full_name='milvus.proto.milvus.DescribeCollectionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DescribeCollectionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.DescribeCollectionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.DescribeCollectionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.DescribeCollectionRequest.collectionID', index=3, - number=4, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='time_stamp', full_name='milvus.proto.milvus.DescribeCollectionRequest.time_stamp', index=4, - number=5, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'\312>\004\020\004\030\003', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1080, - serialized_end=1244, -) - - -_DESCRIBECOLLECTIONRESPONSE = _descriptor.Descriptor( - name='DescribeCollectionResponse', - full_name='milvus.proto.milvus.DescribeCollectionResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.DescribeCollectionResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='schema', full_name='milvus.proto.milvus.DescribeCollectionResponse.schema', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.DescribeCollectionResponse.collectionID', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='virtual_channel_names', full_name='milvus.proto.milvus.DescribeCollectionResponse.virtual_channel_names', index=3, - number=4, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='physical_channel_names', full_name='milvus.proto.milvus.DescribeCollectionResponse.physical_channel_names', index=4, - number=5, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='created_timestamp', full_name='milvus.proto.milvus.DescribeCollectionResponse.created_timestamp', index=5, - number=6, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='created_utc_timestamp', full_name='milvus.proto.milvus.DescribeCollectionResponse.created_utc_timestamp', index=6, - number=7, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='shards_num', full_name='milvus.proto.milvus.DescribeCollectionResponse.shards_num', index=7, - number=8, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='aliases', full_name='milvus.proto.milvus.DescribeCollectionResponse.aliases', index=8, - number=9, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='start_positions', full_name='milvus.proto.milvus.DescribeCollectionResponse.start_positions', index=9, - number=10, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='consistency_level', full_name='milvus.proto.milvus.DescribeCollectionResponse.consistency_level', index=10, - number=11, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.DescribeCollectionResponse.collection_name', index=11, - number=12, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1247, - serialized_end=1705, -) - - -_LOADCOLLECTIONREQUEST = _descriptor.Descriptor( - name='LoadCollectionRequest', - full_name='milvus.proto.milvus.LoadCollectionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.LoadCollectionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.LoadCollectionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.LoadCollectionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='replica_number', full_name='milvus.proto.milvus.LoadCollectionRequest.replica_number', index=3, - number=4, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'\312>\004\020\005\030\003', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1708, - serialized_end=1850, -) - - -_RELEASECOLLECTIONREQUEST = _descriptor.Descriptor( - name='ReleaseCollectionRequest', - full_name='milvus.proto.milvus.ReleaseCollectionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.ReleaseCollectionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.ReleaseCollectionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.ReleaseCollectionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'\312>\004\020\006\030\003', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1852, - serialized_end=1973, -) - - -_GETCOLLECTIONSTATISTICSREQUEST = _descriptor.Descriptor( - name='GetCollectionStatisticsRequest', - full_name='milvus.proto.milvus.GetCollectionStatisticsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.GetCollectionStatisticsRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.GetCollectionStatisticsRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.GetCollectionStatisticsRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'\312>\004\020\004\030\003', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1975, - serialized_end=2102, -) - - -_GETCOLLECTIONSTATISTICSRESPONSE = _descriptor.Descriptor( - name='GetCollectionStatisticsResponse', - full_name='milvus.proto.milvus.GetCollectionStatisticsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetCollectionStatisticsResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='stats', full_name='milvus.proto.milvus.GetCollectionStatisticsResponse.stats', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2105, - serialized_end=2233, -) - - -_SHOWCOLLECTIONSREQUEST = _descriptor.Descriptor( - name='ShowCollectionsRequest', - full_name='milvus.proto.milvus.ShowCollectionsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.ShowCollectionsRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.ShowCollectionsRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='time_stamp', full_name='milvus.proto.milvus.ShowCollectionsRequest.time_stamp', index=2, - number=3, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='type', full_name='milvus.proto.milvus.ShowCollectionsRequest.type', index=3, - number=4, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_names', full_name='milvus.proto.milvus.ShowCollectionsRequest.collection_names', index=4, - number=5, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'\312>\002\020\004', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2236, - serialized_end=2419, -) - - -_SHOWCOLLECTIONSRESPONSE = _descriptor.Descriptor( - name='ShowCollectionsResponse', - full_name='milvus.proto.milvus.ShowCollectionsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.ShowCollectionsResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_names', full_name='milvus.proto.milvus.ShowCollectionsResponse.collection_names', index=1, - number=2, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_ids', full_name='milvus.proto.milvus.ShowCollectionsResponse.collection_ids', index=2, - number=3, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='created_timestamps', full_name='milvus.proto.milvus.ShowCollectionsResponse.created_timestamps', index=3, - number=4, type=4, cpp_type=4, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='created_utc_timestamps', full_name='milvus.proto.milvus.ShowCollectionsResponse.created_utc_timestamps', index=4, - number=5, type=4, cpp_type=4, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='inMemory_percentages', full_name='milvus.proto.milvus.ShowCollectionsResponse.inMemory_percentages', index=5, - number=6, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='query_service_available', full_name='milvus.proto.milvus.ShowCollectionsResponse.query_service_available', index=6, - number=7, type=8, cpp_type=7, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2422, - serialized_end=2665, -) - - -_CREATEPARTITIONREQUEST = _descriptor.Descriptor( - name='CreatePartitionRequest', - full_name='milvus.proto.milvus.CreatePartitionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.CreatePartitionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.CreatePartitionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.CreatePartitionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_name', full_name='milvus.proto.milvus.CreatePartitionRequest.partition_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2668, - serialized_end=2802, -) - - -_DROPPARTITIONREQUEST = _descriptor.Descriptor( - name='DropPartitionRequest', - full_name='milvus.proto.milvus.DropPartitionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DropPartitionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.DropPartitionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.DropPartitionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_name', full_name='milvus.proto.milvus.DropPartitionRequest.partition_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2805, - serialized_end=2937, -) - - -_HASPARTITIONREQUEST = _descriptor.Descriptor( - name='HasPartitionRequest', - full_name='milvus.proto.milvus.HasPartitionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.HasPartitionRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.HasPartitionRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.HasPartitionRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_name', full_name='milvus.proto.milvus.HasPartitionRequest.partition_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2940, - serialized_end=3071, -) - - -_LOADPARTITIONSREQUEST = _descriptor.Descriptor( - name='LoadPartitionsRequest', - full_name='milvus.proto.milvus.LoadPartitionsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.LoadPartitionsRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.LoadPartitionsRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.LoadPartitionsRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_names', full_name='milvus.proto.milvus.LoadPartitionsRequest.partition_names', index=3, - number=4, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='replica_number', full_name='milvus.proto.milvus.LoadPartitionsRequest.replica_number', index=4, - number=5, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=3074, - serialized_end=3232, -) - - -_RELEASEPARTITIONSREQUEST = _descriptor.Descriptor( - name='ReleasePartitionsRequest', - full_name='milvus.proto.milvus.ReleasePartitionsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.ReleasePartitionsRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.ReleasePartitionsRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.ReleasePartitionsRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_names', full_name='milvus.proto.milvus.ReleasePartitionsRequest.partition_names', index=3, - number=4, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=3235, - serialized_end=3372, -) - - -_GETPARTITIONSTATISTICSREQUEST = _descriptor.Descriptor( - name='GetPartitionStatisticsRequest', - full_name='milvus.proto.milvus.GetPartitionStatisticsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.GetPartitionStatisticsRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.GetPartitionStatisticsRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.GetPartitionStatisticsRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_name', full_name='milvus.proto.milvus.GetPartitionStatisticsRequest.partition_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=3375, - serialized_end=3516, -) - - -_GETPARTITIONSTATISTICSRESPONSE = _descriptor.Descriptor( - name='GetPartitionStatisticsResponse', - full_name='milvus.proto.milvus.GetPartitionStatisticsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetPartitionStatisticsResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='stats', full_name='milvus.proto.milvus.GetPartitionStatisticsResponse.stats', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=3518, - serialized_end=3645, -) - - -_SHOWPARTITIONSREQUEST = _descriptor.Descriptor( - name='ShowPartitionsRequest', - full_name='milvus.proto.milvus.ShowPartitionsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.ShowPartitionsRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.ShowPartitionsRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.ShowPartitionsRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.ShowPartitionsRequest.collectionID', index=3, - number=4, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_names', full_name='milvus.proto.milvus.ShowPartitionsRequest.partition_names', index=4, - number=5, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='type', full_name='milvus.proto.milvus.ShowPartitionsRequest.type', index=5, - number=6, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=3648, - serialized_end=3849, -) - - -_SHOWPARTITIONSRESPONSE = _descriptor.Descriptor( - name='ShowPartitionsResponse', - full_name='milvus.proto.milvus.ShowPartitionsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.ShowPartitionsResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_names', full_name='milvus.proto.milvus.ShowPartitionsResponse.partition_names', index=1, - number=2, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partitionIDs', full_name='milvus.proto.milvus.ShowPartitionsResponse.partitionIDs', index=2, - number=3, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='created_timestamps', full_name='milvus.proto.milvus.ShowPartitionsResponse.created_timestamps', index=3, - number=4, type=4, cpp_type=4, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='created_utc_timestamps', full_name='milvus.proto.milvus.ShowPartitionsResponse.created_utc_timestamps', index=4, - number=5, type=4, cpp_type=4, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='inMemory_percentages', full_name='milvus.proto.milvus.ShowPartitionsResponse.inMemory_percentages', index=5, - number=6, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=3852, - serialized_end=4058, -) - - -_DESCRIBESEGMENTREQUEST = _descriptor.Descriptor( - name='DescribeSegmentRequest', - full_name='milvus.proto.milvus.DescribeSegmentRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DescribeSegmentRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.DescribeSegmentRequest.collectionID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='segmentID', full_name='milvus.proto.milvus.DescribeSegmentRequest.segmentID', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=4060, - serialized_end=4169, -) - - -_DESCRIBESEGMENTRESPONSE = _descriptor.Descriptor( - name='DescribeSegmentResponse', - full_name='milvus.proto.milvus.DescribeSegmentResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.DescribeSegmentResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='indexID', full_name='milvus.proto.milvus.DescribeSegmentResponse.indexID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='buildID', full_name='milvus.proto.milvus.DescribeSegmentResponse.buildID', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='enable_index', full_name='milvus.proto.milvus.DescribeSegmentResponse.enable_index', index=3, - number=4, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='fieldID', full_name='milvus.proto.milvus.DescribeSegmentResponse.fieldID', index=4, - number=5, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=4172, - serialized_end=4315, -) - - -_SHOWSEGMENTSREQUEST = _descriptor.Descriptor( - name='ShowSegmentsRequest', - full_name='milvus.proto.milvus.ShowSegmentsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.ShowSegmentsRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.ShowSegmentsRequest.collectionID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partitionID', full_name='milvus.proto.milvus.ShowSegmentsRequest.partitionID', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=4317, - serialized_end=4425, -) - - -_SHOWSEGMENTSRESPONSE = _descriptor.Descriptor( - name='ShowSegmentsResponse', - full_name='milvus.proto.milvus.ShowSegmentsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.ShowSegmentsResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='segmentIDs', full_name='milvus.proto.milvus.ShowSegmentsResponse.segmentIDs', index=1, - number=2, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=4427, - serialized_end=4514, -) - - -_CREATEINDEXREQUEST = _descriptor.Descriptor( - name='CreateIndexRequest', - full_name='milvus.proto.milvus.CreateIndexRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.CreateIndexRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.CreateIndexRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.CreateIndexRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_name', full_name='milvus.proto.milvus.CreateIndexRequest.field_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='extra_params', full_name='milvus.proto.milvus.CreateIndexRequest.extra_params', index=4, - number=5, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='index_name', full_name='milvus.proto.milvus.CreateIndexRequest.index_name', index=5, - number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=4517, - serialized_end=4720, -) - - -_DESCRIBEINDEXREQUEST = _descriptor.Descriptor( - name='DescribeIndexRequest', - full_name='milvus.proto.milvus.DescribeIndexRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DescribeIndexRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.DescribeIndexRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.DescribeIndexRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_name', full_name='milvus.proto.milvus.DescribeIndexRequest.field_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='index_name', full_name='milvus.proto.milvus.DescribeIndexRequest.index_name', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=4723, - serialized_end=4871, -) - - -_INDEXDESCRIPTION = _descriptor.Descriptor( - name='IndexDescription', - full_name='milvus.proto.milvus.IndexDescription', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='index_name', full_name='milvus.proto.milvus.IndexDescription.index_name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='indexID', full_name='milvus.proto.milvus.IndexDescription.indexID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='params', full_name='milvus.proto.milvus.IndexDescription.params', index=2, - number=3, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_name', full_name='milvus.proto.milvus.IndexDescription.field_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=4873, - serialized_end=4999, -) - - -_DESCRIBEINDEXRESPONSE = _descriptor.Descriptor( - name='DescribeIndexResponse', - full_name='milvus.proto.milvus.DescribeIndexResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.DescribeIndexResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='index_descriptions', full_name='milvus.proto.milvus.DescribeIndexResponse.index_descriptions', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=5002, - serialized_end=5137, -) - - -_GETINDEXBUILDPROGRESSREQUEST = _descriptor.Descriptor( - name='GetIndexBuildProgressRequest', - full_name='milvus.proto.milvus.GetIndexBuildProgressRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.GetIndexBuildProgressRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.GetIndexBuildProgressRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.GetIndexBuildProgressRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_name', full_name='milvus.proto.milvus.GetIndexBuildProgressRequest.field_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='index_name', full_name='milvus.proto.milvus.GetIndexBuildProgressRequest.index_name', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=5140, - serialized_end=5296, -) - - -_GETINDEXBUILDPROGRESSRESPONSE = _descriptor.Descriptor( - name='GetIndexBuildProgressResponse', - full_name='milvus.proto.milvus.GetIndexBuildProgressResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetIndexBuildProgressResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='indexed_rows', full_name='milvus.proto.milvus.GetIndexBuildProgressResponse.indexed_rows', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='total_rows', full_name='milvus.proto.milvus.GetIndexBuildProgressResponse.total_rows', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=5298, - serialized_end=5416, -) - - -_GETINDEXSTATEREQUEST = _descriptor.Descriptor( - name='GetIndexStateRequest', - full_name='milvus.proto.milvus.GetIndexStateRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.GetIndexStateRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.GetIndexStateRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.GetIndexStateRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_name', full_name='milvus.proto.milvus.GetIndexStateRequest.field_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='index_name', full_name='milvus.proto.milvus.GetIndexStateRequest.index_name', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=5419, - serialized_end=5567, -) - - -_GETINDEXSTATERESPONSE = _descriptor.Descriptor( - name='GetIndexStateResponse', - full_name='milvus.proto.milvus.GetIndexStateResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetIndexStateResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='state', full_name='milvus.proto.milvus.GetIndexStateResponse.state', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='fail_reason', full_name='milvus.proto.milvus.GetIndexStateResponse.fail_reason', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=5570, - serialized_end=5707, -) - - -_DROPINDEXREQUEST = _descriptor.Descriptor( - name='DropIndexRequest', - full_name='milvus.proto.milvus.DropIndexRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DropIndexRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.DropIndexRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.DropIndexRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_name', full_name='milvus.proto.milvus.DropIndexRequest.field_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='index_name', full_name='milvus.proto.milvus.DropIndexRequest.index_name', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=5710, - serialized_end=5854, -) - - -_INSERTREQUEST = _descriptor.Descriptor( - name='InsertRequest', - full_name='milvus.proto.milvus.InsertRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.InsertRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.InsertRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.InsertRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_name', full_name='milvus.proto.milvus.InsertRequest.partition_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='fields_data', full_name='milvus.proto.milvus.InsertRequest.fields_data', index=4, - number=5, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='hash_keys', full_name='milvus.proto.milvus.InsertRequest.hash_keys', index=5, - number=6, type=13, cpp_type=3, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='num_rows', full_name='milvus.proto.milvus.InsertRequest.num_rows', index=6, - number=7, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=5857, - serialized_end=6072, -) - - -_MUTATIONRESULT = _descriptor.Descriptor( - name='MutationResult', - full_name='milvus.proto.milvus.MutationResult', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.MutationResult.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='IDs', full_name='milvus.proto.milvus.MutationResult.IDs', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='succ_index', full_name='milvus.proto.milvus.MutationResult.succ_index', index=2, - number=3, type=13, cpp_type=3, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='err_index', full_name='milvus.proto.milvus.MutationResult.err_index', index=3, - number=4, type=13, cpp_type=3, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='acknowledged', full_name='milvus.proto.milvus.MutationResult.acknowledged', index=4, - number=5, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='insert_cnt', full_name='milvus.proto.milvus.MutationResult.insert_cnt', index=5, - number=6, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='delete_cnt', full_name='milvus.proto.milvus.MutationResult.delete_cnt', index=6, - number=7, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='upsert_cnt', full_name='milvus.proto.milvus.MutationResult.upsert_cnt', index=7, - number=8, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='timestamp', full_name='milvus.proto.milvus.MutationResult.timestamp', index=8, - number=9, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=6075, - serialized_end=6315, -) - - -_DELETEREQUEST = _descriptor.Descriptor( - name='DeleteRequest', - full_name='milvus.proto.milvus.DeleteRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DeleteRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.DeleteRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.DeleteRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_name', full_name='milvus.proto.milvus.DeleteRequest.partition_name', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='expr', full_name='milvus.proto.milvus.DeleteRequest.expr', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='hash_keys', full_name='milvus.proto.milvus.DeleteRequest.hash_keys', index=5, - number=6, type=13, cpp_type=3, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=6318, - serialized_end=6476, -) - - -_SEARCHREQUEST = _descriptor.Descriptor( - name='SearchRequest', - full_name='milvus.proto.milvus.SearchRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.SearchRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.SearchRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.SearchRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_names', full_name='milvus.proto.milvus.SearchRequest.partition_names', index=3, - number=4, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='dsl', full_name='milvus.proto.milvus.SearchRequest.dsl', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='placeholder_group', full_name='milvus.proto.milvus.SearchRequest.placeholder_group', index=5, - number=6, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='dsl_type', full_name='milvus.proto.milvus.SearchRequest.dsl_type', index=6, - number=7, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='output_fields', full_name='milvus.proto.milvus.SearchRequest.output_fields', index=7, - number=8, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='search_params', full_name='milvus.proto.milvus.SearchRequest.search_params', index=8, - number=9, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='travel_timestamp', full_name='milvus.proto.milvus.SearchRequest.travel_timestamp', index=9, - number=10, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='guarantee_timestamp', full_name='milvus.proto.milvus.SearchRequest.guarantee_timestamp', index=10, - number=11, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='nq', full_name='milvus.proto.milvus.SearchRequest.nq', index=11, - number=12, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=6479, - serialized_end=6841, -) - - -_HITS = _descriptor.Descriptor( - name='Hits', - full_name='milvus.proto.milvus.Hits', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='IDs', full_name='milvus.proto.milvus.Hits.IDs', index=0, - number=1, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='row_data', full_name='milvus.proto.milvus.Hits.row_data', index=1, - number=2, type=12, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='scores', full_name='milvus.proto.milvus.Hits.scores', index=2, - number=3, type=2, cpp_type=6, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=6843, - serialized_end=6896, -) - - -_SEARCHRESULTS = _descriptor.Descriptor( - name='SearchResults', - full_name='milvus.proto.milvus.SearchResults', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.SearchResults.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='results', full_name='milvus.proto.milvus.SearchResults.results', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.SearchResults.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=6899, - serialized_end=7040, -) - - -_FLUSHREQUEST = _descriptor.Descriptor( - name='FlushRequest', - full_name='milvus.proto.milvus.FlushRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.FlushRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.FlushRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_names', full_name='milvus.proto.milvus.FlushRequest.collection_names', index=2, - number=3, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=7042, - serialized_end=7143, -) - - -_FLUSHRESPONSE_COLLSEGIDSENTRY = _descriptor.Descriptor( - name='CollSegIDsEntry', - full_name='milvus.proto.milvus.FlushResponse.CollSegIDsEntry', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='key', full_name='milvus.proto.milvus.FlushResponse.CollSegIDsEntry.key', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='value', full_name='milvus.proto.milvus.FlushResponse.CollSegIDsEntry.value', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=b'8\001', - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=7298, - serialized_end=7379, -) - -_FLUSHRESPONSE = _descriptor.Descriptor( - name='FlushResponse', - full_name='milvus.proto.milvus.FlushResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.FlushResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.FlushResponse.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='coll_segIDs', full_name='milvus.proto.milvus.FlushResponse.coll_segIDs', index=2, - number=3, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[_FLUSHRESPONSE_COLLSEGIDSENTRY, ], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=7146, - serialized_end=7379, -) - - -_QUERYREQUEST = _descriptor.Descriptor( - name='QueryRequest', - full_name='milvus.proto.milvus.QueryRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.QueryRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='db_name', full_name='milvus.proto.milvus.QueryRequest.db_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.QueryRequest.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='expr', full_name='milvus.proto.milvus.QueryRequest.expr', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='output_fields', full_name='milvus.proto.milvus.QueryRequest.output_fields', index=4, - number=5, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_names', full_name='milvus.proto.milvus.QueryRequest.partition_names', index=5, - number=6, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='travel_timestamp', full_name='milvus.proto.milvus.QueryRequest.travel_timestamp', index=6, - number=7, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='guarantee_timestamp', full_name='milvus.proto.milvus.QueryRequest.guarantee_timestamp', index=7, - number=8, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=7382, - serialized_end=7599, -) - - -_QUERYRESULTS = _descriptor.Descriptor( - name='QueryResults', - full_name='milvus.proto.milvus.QueryResults', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.QueryResults.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='fields_data', full_name='milvus.proto.milvus.QueryResults.fields_data', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.QueryResults.collection_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=7602, - serialized_end=7739, -) - - -_VECTORIDS = _descriptor.Descriptor( - name='VectorIDs', - full_name='milvus.proto.milvus.VectorIDs', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.VectorIDs.collection_name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_name', full_name='milvus.proto.milvus.VectorIDs.field_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='id_array', full_name='milvus.proto.milvus.VectorIDs.id_array', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_names', full_name='milvus.proto.milvus.VectorIDs.partition_names', index=3, - number=4, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=7741, - serialized_end=7866, -) - - -_VECTORSARRAY = _descriptor.Descriptor( - name='VectorsArray', - full_name='milvus.proto.milvus.VectorsArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='id_array', full_name='milvus.proto.milvus.VectorsArray.id_array', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='data_array', full_name='milvus.proto.milvus.VectorsArray.data_array', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='array', full_name='milvus.proto.milvus.VectorsArray.array', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=7869, - serialized_end=8000, -) - - -_CALCDISTANCEREQUEST = _descriptor.Descriptor( - name='CalcDistanceRequest', - full_name='milvus.proto.milvus.CalcDistanceRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.CalcDistanceRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='op_left', full_name='milvus.proto.milvus.CalcDistanceRequest.op_left', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='op_right', full_name='milvus.proto.milvus.CalcDistanceRequest.op_right', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='params', full_name='milvus.proto.milvus.CalcDistanceRequest.params', index=3, - number=4, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=8003, - serialized_end=8224, -) - - -_CALCDISTANCERESULTS = _descriptor.Descriptor( - name='CalcDistanceResults', - full_name='milvus.proto.milvus.CalcDistanceResults', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.CalcDistanceResults.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='int_dist', full_name='milvus.proto.milvus.CalcDistanceResults.int_dist', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='float_dist', full_name='milvus.proto.milvus.CalcDistanceResults.float_dist', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='array', full_name='milvus.proto.milvus.CalcDistanceResults.array', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=8227, - serialized_end=8408, -) - - -_PERSISTENTSEGMENTINFO = _descriptor.Descriptor( - name='PersistentSegmentInfo', - full_name='milvus.proto.milvus.PersistentSegmentInfo', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='segmentID', full_name='milvus.proto.milvus.PersistentSegmentInfo.segmentID', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.PersistentSegmentInfo.collectionID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partitionID', full_name='milvus.proto.milvus.PersistentSegmentInfo.partitionID', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='num_rows', full_name='milvus.proto.milvus.PersistentSegmentInfo.num_rows', index=3, - number=4, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='state', full_name='milvus.proto.milvus.PersistentSegmentInfo.state', index=4, - number=5, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=8411, - serialized_end=8564, -) - - -_GETPERSISTENTSEGMENTINFOREQUEST = _descriptor.Descriptor( - name='GetPersistentSegmentInfoRequest', - full_name='milvus.proto.milvus.GetPersistentSegmentInfoRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.GetPersistentSegmentInfoRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='dbName', full_name='milvus.proto.milvus.GetPersistentSegmentInfoRequest.dbName', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionName', full_name='milvus.proto.milvus.GetPersistentSegmentInfoRequest.collectionName', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=8566, - serialized_end=8683, -) - - -_GETPERSISTENTSEGMENTINFORESPONSE = _descriptor.Descriptor( - name='GetPersistentSegmentInfoResponse', - full_name='milvus.proto.milvus.GetPersistentSegmentInfoResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetPersistentSegmentInfoResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='infos', full_name='milvus.proto.milvus.GetPersistentSegmentInfoResponse.infos', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=8686, - serialized_end=8824, -) - - -_QUERYSEGMENTINFO = _descriptor.Descriptor( - name='QuerySegmentInfo', - full_name='milvus.proto.milvus.QuerySegmentInfo', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='segmentID', full_name='milvus.proto.milvus.QuerySegmentInfo.segmentID', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.QuerySegmentInfo.collectionID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partitionID', full_name='milvus.proto.milvus.QuerySegmentInfo.partitionID', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='mem_size', full_name='milvus.proto.milvus.QuerySegmentInfo.mem_size', index=3, - number=4, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='num_rows', full_name='milvus.proto.milvus.QuerySegmentInfo.num_rows', index=4, - number=5, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='index_name', full_name='milvus.proto.milvus.QuerySegmentInfo.index_name', index=5, - number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='indexID', full_name='milvus.proto.milvus.QuerySegmentInfo.indexID', index=6, - number=7, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='nodeID', full_name='milvus.proto.milvus.QuerySegmentInfo.nodeID', index=7, - number=8, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='state', full_name='milvus.proto.milvus.QuerySegmentInfo.state', index=8, - number=9, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='nodeIds', full_name='milvus.proto.milvus.QuerySegmentInfo.nodeIds', index=9, - number=10, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=8827, - serialized_end=9063, -) - - -_GETQUERYSEGMENTINFOREQUEST = _descriptor.Descriptor( - name='GetQuerySegmentInfoRequest', - full_name='milvus.proto.milvus.GetQuerySegmentInfoRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.GetQuerySegmentInfoRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='dbName', full_name='milvus.proto.milvus.GetQuerySegmentInfoRequest.dbName', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionName', full_name='milvus.proto.milvus.GetQuerySegmentInfoRequest.collectionName', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9065, - serialized_end=9177, -) - - -_GETQUERYSEGMENTINFORESPONSE = _descriptor.Descriptor( - name='GetQuerySegmentInfoResponse', - full_name='milvus.proto.milvus.GetQuerySegmentInfoResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetQuerySegmentInfoResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='infos', full_name='milvus.proto.milvus.GetQuerySegmentInfoResponse.infos', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9180, - serialized_end=9308, -) - - -_DUMMYREQUEST = _descriptor.Descriptor( - name='DummyRequest', - full_name='milvus.proto.milvus.DummyRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='request_type', full_name='milvus.proto.milvus.DummyRequest.request_type', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9310, - serialized_end=9346, -) - - -_DUMMYRESPONSE = _descriptor.Descriptor( - name='DummyResponse', - full_name='milvus.proto.milvus.DummyResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='response', full_name='milvus.proto.milvus.DummyResponse.response', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9348, - serialized_end=9381, -) - - -_REGISTERLINKREQUEST = _descriptor.Descriptor( - name='RegisterLinkRequest', - full_name='milvus.proto.milvus.RegisterLinkRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9383, - serialized_end=9404, -) - - -_REGISTERLINKRESPONSE = _descriptor.Descriptor( - name='RegisterLinkResponse', - full_name='milvus.proto.milvus.RegisterLinkResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='address', full_name='milvus.proto.milvus.RegisterLinkResponse.address', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.RegisterLinkResponse.status', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9406, - serialized_end=9520, -) - - -_GETMETRICSREQUEST = _descriptor.Descriptor( - name='GetMetricsRequest', - full_name='milvus.proto.milvus.GetMetricsRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.GetMetricsRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='request', full_name='milvus.proto.milvus.GetMetricsRequest.request', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9522, - serialized_end=9602, -) - - -_GETMETRICSRESPONSE = _descriptor.Descriptor( - name='GetMetricsResponse', - full_name='milvus.proto.milvus.GetMetricsResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetMetricsResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='response', full_name='milvus.proto.milvus.GetMetricsResponse.response', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='component_name', full_name='milvus.proto.milvus.GetMetricsResponse.component_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9604, - serialized_end=9711, -) - - -_LOADBALANCEREQUEST = _descriptor.Descriptor( - name='LoadBalanceRequest', - full_name='milvus.proto.milvus.LoadBalanceRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.LoadBalanceRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='src_nodeID', full_name='milvus.proto.milvus.LoadBalanceRequest.src_nodeID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='dst_nodeIDs', full_name='milvus.proto.milvus.LoadBalanceRequest.dst_nodeIDs', index=2, - number=3, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='sealed_segmentIDs', full_name='milvus.proto.milvus.LoadBalanceRequest.sealed_segmentIDs', index=3, - number=4, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionName', full_name='milvus.proto.milvus.LoadBalanceRequest.collectionName', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9714, - serialized_end=9870, -) - - -_MANUALCOMPACTIONREQUEST = _descriptor.Descriptor( - name='ManualCompactionRequest', - full_name='milvus.proto.milvus.ManualCompactionRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.ManualCompactionRequest.collectionID', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='timetravel', full_name='milvus.proto.milvus.ManualCompactionRequest.timetravel', index=1, - number=2, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9872, - serialized_end=9939, -) - - -_MANUALCOMPACTIONRESPONSE = _descriptor.Descriptor( - name='ManualCompactionResponse', - full_name='milvus.proto.milvus.ManualCompactionResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.ManualCompactionResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='compactionID', full_name='milvus.proto.milvus.ManualCompactionResponse.compactionID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=9941, - serialized_end=10034, -) - - -_GETCOMPACTIONSTATEREQUEST = _descriptor.Descriptor( - name='GetCompactionStateRequest', - full_name='milvus.proto.milvus.GetCompactionStateRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='compactionID', full_name='milvus.proto.milvus.GetCompactionStateRequest.compactionID', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10036, - serialized_end=10085, -) - - -_GETCOMPACTIONSTATERESPONSE = _descriptor.Descriptor( - name='GetCompactionStateResponse', - full_name='milvus.proto.milvus.GetCompactionStateResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetCompactionStateResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='state', full_name='milvus.proto.milvus.GetCompactionStateResponse.state', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='executingPlanNo', full_name='milvus.proto.milvus.GetCompactionStateResponse.executingPlanNo', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='timeoutPlanNo', full_name='milvus.proto.milvus.GetCompactionStateResponse.timeoutPlanNo', index=3, - number=4, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='completedPlanNo', full_name='milvus.proto.milvus.GetCompactionStateResponse.completedPlanNo', index=4, - number=5, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10088, - serialized_end=10287, -) - - -_GETCOMPACTIONPLANSREQUEST = _descriptor.Descriptor( - name='GetCompactionPlansRequest', - full_name='milvus.proto.milvus.GetCompactionPlansRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='compactionID', full_name='milvus.proto.milvus.GetCompactionPlansRequest.compactionID', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10289, - serialized_end=10338, -) - - -_GETCOMPACTIONPLANSRESPONSE = _descriptor.Descriptor( - name='GetCompactionPlansResponse', - full_name='milvus.proto.milvus.GetCompactionPlansResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetCompactionPlansResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='state', full_name='milvus.proto.milvus.GetCompactionPlansResponse.state', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='mergeInfos', full_name='milvus.proto.milvus.GetCompactionPlansResponse.mergeInfos', index=2, - number=3, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10341, - serialized_end=10529, -) - - -_COMPACTIONMERGEINFO = _descriptor.Descriptor( - name='CompactionMergeInfo', - full_name='milvus.proto.milvus.CompactionMergeInfo', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='sources', full_name='milvus.proto.milvus.CompactionMergeInfo.sources', index=0, - number=1, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='target', full_name='milvus.proto.milvus.CompactionMergeInfo.target', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10531, - serialized_end=10585, -) - - -_GETFLUSHSTATEREQUEST = _descriptor.Descriptor( - name='GetFlushStateRequest', - full_name='milvus.proto.milvus.GetFlushStateRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='segmentIDs', full_name='milvus.proto.milvus.GetFlushStateRequest.segmentIDs', index=0, - number=1, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10587, - serialized_end=10629, -) - - -_GETFLUSHSTATERESPONSE = _descriptor.Descriptor( - name='GetFlushStateResponse', - full_name='milvus.proto.milvus.GetFlushStateResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetFlushStateResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='flushed', full_name='milvus.proto.milvus.GetFlushStateResponse.flushed', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10631, - serialized_end=10716, -) - - -_IMPORTREQUEST = _descriptor.Descriptor( - name='ImportRequest', - full_name='milvus.proto.milvus.ImportRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='collection_name', full_name='milvus.proto.milvus.ImportRequest.collection_name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_name', full_name='milvus.proto.milvus.ImportRequest.partition_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='channel_names', full_name='milvus.proto.milvus.ImportRequest.channel_names', index=2, - number=3, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='row_based', full_name='milvus.proto.milvus.ImportRequest.row_based', index=3, - number=4, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='files', full_name='milvus.proto.milvus.ImportRequest.files', index=4, - number=5, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='options', full_name='milvus.proto.milvus.ImportRequest.options', index=5, - number=6, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10719, - serialized_end=10892, -) - - -_IMPORTRESPONSE = _descriptor.Descriptor( - name='ImportResponse', - full_name='milvus.proto.milvus.ImportResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.ImportResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='tasks', full_name='milvus.proto.milvus.ImportResponse.tasks', index=1, - number=2, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10894, - serialized_end=10970, -) - - -_GETIMPORTSTATEREQUEST = _descriptor.Descriptor( - name='GetImportStateRequest', - full_name='milvus.proto.milvus.GetImportStateRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='task', full_name='milvus.proto.milvus.GetImportStateRequest.task', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=10972, - serialized_end=11009, -) - - -_GETIMPORTSTATERESPONSE = _descriptor.Descriptor( - name='GetImportStateResponse', - full_name='milvus.proto.milvus.GetImportStateResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetImportStateResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='state', full_name='milvus.proto.milvus.GetImportStateResponse.state', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='row_count', full_name='milvus.proto.milvus.GetImportStateResponse.row_count', index=2, - number=3, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='id_list', full_name='milvus.proto.milvus.GetImportStateResponse.id_list', index=3, - number=4, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='infos', full_name='milvus.proto.milvus.GetImportStateResponse.infos', index=4, - number=5, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='id', full_name='milvus.proto.milvus.GetImportStateResponse.id', index=5, - number=6, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='data_queryable', full_name='milvus.proto.milvus.GetImportStateResponse.data_queryable', index=6, - number=7, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='data_indexed', full_name='milvus.proto.milvus.GetImportStateResponse.data_indexed', index=7, - number=8, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=11012, - serialized_end=11274, -) - - -_LISTIMPORTTASKSREQUEST = _descriptor.Descriptor( - name='ListImportTasksRequest', - full_name='milvus.proto.milvus.ListImportTasksRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=11276, - serialized_end=11300, -) - - -_LISTIMPORTTASKSRESPONSE = _descriptor.Descriptor( - name='ListImportTasksResponse', - full_name='milvus.proto.milvus.ListImportTasksResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.ListImportTasksResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='tasks', full_name='milvus.proto.milvus.ListImportTasksResponse.tasks', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=11303, - serialized_end=11433, -) - - -_GETREPLICASREQUEST = _descriptor.Descriptor( - name='GetReplicasRequest', - full_name='milvus.proto.milvus.GetReplicasRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.GetReplicasRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.GetReplicasRequest.collectionID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='with_shard_nodes', full_name='milvus.proto.milvus.GetReplicasRequest.with_shard_nodes', index=2, - number=3, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=11435, - serialized_end=11547, -) - - -_GETREPLICASRESPONSE = _descriptor.Descriptor( - name='GetReplicasResponse', - full_name='milvus.proto.milvus.GetReplicasResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.GetReplicasResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='replicas', full_name='milvus.proto.milvus.GetReplicasResponse.replicas', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=11549, - serialized_end=11667, -) - - -_REPLICAINFO = _descriptor.Descriptor( - name='ReplicaInfo', - full_name='milvus.proto.milvus.ReplicaInfo', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='replicaID', full_name='milvus.proto.milvus.ReplicaInfo.replicaID', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='collectionID', full_name='milvus.proto.milvus.ReplicaInfo.collectionID', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='partition_ids', full_name='milvus.proto.milvus.ReplicaInfo.partition_ids', index=2, - number=3, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='shard_replicas', full_name='milvus.proto.milvus.ReplicaInfo.shard_replicas', index=3, - number=4, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='node_ids', full_name='milvus.proto.milvus.ReplicaInfo.node_ids', index=4, - number=5, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=11670, - serialized_end=11824, -) - - -_SHARDREPLICA = _descriptor.Descriptor( - name='ShardReplica', - full_name='milvus.proto.milvus.ShardReplica', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='leaderID', full_name='milvus.proto.milvus.ShardReplica.leaderID', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='leader_addr', full_name='milvus.proto.milvus.ShardReplica.leader_addr', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='dm_channel_name', full_name='milvus.proto.milvus.ShardReplica.dm_channel_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='node_ids', full_name='milvus.proto.milvus.ShardReplica.node_ids', index=3, - number=4, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=11826, - serialized_end=11922, -) - - -_CREATECREDENTIALREQUEST = _descriptor.Descriptor( - name='CreateCredentialRequest', - full_name='milvus.proto.milvus.CreateCredentialRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.CreateCredentialRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='username', full_name='milvus.proto.milvus.CreateCredentialRequest.username', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='password', full_name='milvus.proto.milvus.CreateCredentialRequest.password', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='created_utc_timestamps', full_name='milvus.proto.milvus.CreateCredentialRequest.created_utc_timestamps', index=3, - number=4, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='modified_utc_timestamps', full_name='milvus.proto.milvus.CreateCredentialRequest.modified_utc_timestamps', index=4, - number=5, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=11925, - serialized_end=12095, -) - - -_UPDATECREDENTIALREQUEST = _descriptor.Descriptor( - name='UpdateCredentialRequest', - full_name='milvus.proto.milvus.UpdateCredentialRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.UpdateCredentialRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='username', full_name='milvus.proto.milvus.UpdateCredentialRequest.username', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='oldPassword', full_name='milvus.proto.milvus.UpdateCredentialRequest.oldPassword', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='newPassword', full_name='milvus.proto.milvus.UpdateCredentialRequest.newPassword', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='created_utc_timestamps', full_name='milvus.proto.milvus.UpdateCredentialRequest.created_utc_timestamps', index=4, - number=5, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='modified_utc_timestamps', full_name='milvus.proto.milvus.UpdateCredentialRequest.modified_utc_timestamps', index=5, - number=6, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12098, - serialized_end=12292, -) - - -_DELETECREDENTIALREQUEST = _descriptor.Descriptor( - name='DeleteCredentialRequest', - full_name='milvus.proto.milvus.DeleteCredentialRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DeleteCredentialRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='username', full_name='milvus.proto.milvus.DeleteCredentialRequest.username', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12294, - serialized_end=12381, -) - - -_LISTCREDUSERSRESPONSE = _descriptor.Descriptor( - name='ListCredUsersResponse', - full_name='milvus.proto.milvus.ListCredUsersResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.ListCredUsersResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='usernames', full_name='milvus.proto.milvus.ListCredUsersResponse.usernames', index=1, - number=2, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12383, - serialized_end=12470, -) - - -_LISTCREDUSERSREQUEST = _descriptor.Descriptor( - name='ListCredUsersRequest', - full_name='milvus.proto.milvus.ListCredUsersRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.ListCredUsersRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12472, - serialized_end=12538, -) - - -_ROLEENTITY = _descriptor.Descriptor( - name='RoleEntity', - full_name='milvus.proto.milvus.RoleEntity', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='milvus.proto.milvus.RoleEntity.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12540, - serialized_end=12566, -) - - -_USERENTITY = _descriptor.Descriptor( - name='UserEntity', - full_name='milvus.proto.milvus.UserEntity', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='milvus.proto.milvus.UserEntity.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12568, - serialized_end=12594, -) - - -_CREATEROLEREQUEST = _descriptor.Descriptor( - name='CreateRoleRequest', - full_name='milvus.proto.milvus.CreateRoleRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.CreateRoleRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='entity', full_name='milvus.proto.milvus.CreateRoleRequest.entity', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12596, - serialized_end=12708, -) - - -_DROPROLEREQUEST = _descriptor.Descriptor( - name='DropRoleRequest', - full_name='milvus.proto.milvus.DropRoleRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.DropRoleRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='role_name', full_name='milvus.proto.milvus.DropRoleRequest.role_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12710, - serialized_end=12790, -) - - -_OPERATEUSERROLEREQUEST = _descriptor.Descriptor( - name='OperateUserRoleRequest', - full_name='milvus.proto.milvus.OperateUserRoleRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.OperateUserRoleRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='username', full_name='milvus.proto.milvus.OperateUserRoleRequest.username', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='role_name', full_name='milvus.proto.milvus.OperateUserRoleRequest.role_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='type', full_name='milvus.proto.milvus.OperateUserRoleRequest.type', index=3, - number=4, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12793, - serialized_end=12954, -) - - -_SELECTROLEREQUEST = _descriptor.Descriptor( - name='SelectRoleRequest', - full_name='milvus.proto.milvus.SelectRoleRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.SelectRoleRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='role', full_name='milvus.proto.milvus.SelectRoleRequest.role', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='include_user_info', full_name='milvus.proto.milvus.SelectRoleRequest.include_user_info', index=2, - number=3, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=12957, - serialized_end=13094, -) - - -_ROLERESULT = _descriptor.Descriptor( - name='RoleResult', - full_name='milvus.proto.milvus.RoleResult', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='role', full_name='milvus.proto.milvus.RoleResult.role', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='users', full_name='milvus.proto.milvus.RoleResult.users', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13096, - serialized_end=13203, -) - - -_SELECTROLERESPONSE = _descriptor.Descriptor( - name='SelectRoleResponse', - full_name='milvus.proto.milvus.SelectRoleResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.SelectRoleResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='results', full_name='milvus.proto.milvus.SelectRoleResponse.results', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13205, - serialized_end=13320, -) - - -_SELECTUSERREQUEST = _descriptor.Descriptor( - name='SelectUserRequest', - full_name='milvus.proto.milvus.SelectUserRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.SelectUserRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='user', full_name='milvus.proto.milvus.SelectUserRequest.user', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='include_role_info', full_name='milvus.proto.milvus.SelectUserRequest.include_role_info', index=2, - number=3, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13323, - serialized_end=13460, -) - - -_USERRESULT = _descriptor.Descriptor( - name='UserResult', - full_name='milvus.proto.milvus.UserResult', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='user', full_name='milvus.proto.milvus.UserResult.user', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='roles', full_name='milvus.proto.milvus.UserResult.roles', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13462, - serialized_end=13569, -) - - -_SELECTUSERRESPONSE = _descriptor.Descriptor( - name='SelectUserResponse', - full_name='milvus.proto.milvus.SelectUserResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.SelectUserResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='result', full_name='milvus.proto.milvus.SelectUserResponse.result', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13571, - serialized_end=13685, -) - - -_RESOURCEENTITY = _descriptor.Descriptor( - name='ResourceEntity', - full_name='milvus.proto.milvus.ResourceEntity', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='type', full_name='milvus.proto.milvus.ResourceEntity.type', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13687, - serialized_end=13717, -) - - -_PRIVILEGEENTITY = _descriptor.Descriptor( - name='PrivilegeEntity', - full_name='milvus.proto.milvus.PrivilegeEntity', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='milvus.proto.milvus.PrivilegeEntity.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13719, - serialized_end=13750, -) - - -_SELECTRESOURCEREQUEST = _descriptor.Descriptor( - name='SelectResourceRequest', - full_name='milvus.proto.milvus.SelectResourceRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.SelectResourceRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='entity', full_name='milvus.proto.milvus.SelectResourceRequest.entity', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='include_privilege_info', full_name='milvus.proto.milvus.SelectResourceRequest.include_privilege_info', index=2, - number=3, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13753, - serialized_end=13905, -) - - -_RESOURCERESULT = _descriptor.Descriptor( - name='ResourceResult', - full_name='milvus.proto.milvus.ResourceResult', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='resource', full_name='milvus.proto.milvus.ResourceResult.resource', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='privileges', full_name='milvus.proto.milvus.ResourceResult.privileges', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=13908, - serialized_end=14037, -) - - -_SELECTRESOURCERESPONSE = _descriptor.Descriptor( - name='SelectResourceResponse', - full_name='milvus.proto.milvus.SelectResourceResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.SelectResourceResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='results', full_name='milvus.proto.milvus.SelectResourceResponse.results', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=14039, - serialized_end=14162, -) - - -_PRINCIPALENTITY = _descriptor.Descriptor( - name='PrincipalEntity', - full_name='milvus.proto.milvus.PrincipalEntity', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='principal_type', full_name='milvus.proto.milvus.PrincipalEntity.principal_type', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='user', full_name='milvus.proto.milvus.PrincipalEntity.user', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='role', full_name='milvus.proto.milvus.PrincipalEntity.role', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='principal', full_name='milvus.proto.milvus.PrincipalEntity.principal', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=14165, - serialized_end=14317, -) - - -_GRANTORENTITY = _descriptor.Descriptor( - name='GrantorEntity', - full_name='milvus.proto.milvus.GrantorEntity', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='user', full_name='milvus.proto.milvus.GrantorEntity.user', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='privilege', full_name='milvus.proto.milvus.GrantorEntity.privilege', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=14319, - serialized_end=14438, -) - - -_GRANTENTITY = _descriptor.Descriptor( - name='GrantEntity', - full_name='milvus.proto.milvus.GrantEntity', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='principal', full_name='milvus.proto.milvus.GrantEntity.principal', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='resource', full_name='milvus.proto.milvus.GrantEntity.resource', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='resource_name', full_name='milvus.proto.milvus.GrantEntity.resource_name', index=2, - number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='grantor', full_name='milvus.proto.milvus.GrantEntity.grantor', index=3, - number=4, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=14441, - serialized_end=14642, -) - - -_SELECTGRANTREQUEST = _descriptor.Descriptor( - name='SelectGrantRequest', - full_name='milvus.proto.milvus.SelectGrantRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.SelectGrantRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='entity', full_name='milvus.proto.milvus.SelectGrantRequest.entity', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=14644, - serialized_end=14758, -) - - -_SELECTGRANTRESPONSE = _descriptor.Descriptor( - name='SelectGrantResponse', - full_name='milvus.proto.milvus.SelectGrantResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='milvus.proto.milvus.SelectGrantResponse.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='entities', full_name='milvus.proto.milvus.SelectGrantResponse.entities', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=14760, - serialized_end=14878, -) - - -_OPERATEPRIVILEGEREQUEST = _descriptor.Descriptor( - name='OperatePrivilegeRequest', - full_name='milvus.proto.milvus.OperatePrivilegeRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='base', full_name='milvus.proto.milvus.OperatePrivilegeRequest.base', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='entity', full_name='milvus.proto.milvus.OperatePrivilegeRequest.entity', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='type', full_name='milvus.proto.milvus.OperatePrivilegeRequest.type', index=2, - number=3, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=14881, - serialized_end=15057, -) - - -_MILVUSEXT = _descriptor.Descriptor( - name='MilvusExt', - full_name='milvus.proto.milvus.MilvusExt', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='version', full_name='milvus.proto.milvus.MilvusExt.version', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=15059, - serialized_end=15087, -) - -_CREATEALIASREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_DROPALIASREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_ALTERALIASREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_CREATECOLLECTIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_CREATECOLLECTIONREQUEST.fields_by_name['consistency_level'].enum_type = common__pb2._CONSISTENCYLEVEL -_DROPCOLLECTIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_HASCOLLECTIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_BOOLRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_STRINGRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_DESCRIBECOLLECTIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_DESCRIBECOLLECTIONRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_DESCRIBECOLLECTIONRESPONSE.fields_by_name['schema'].message_type = schema__pb2._COLLECTIONSCHEMA -_DESCRIBECOLLECTIONRESPONSE.fields_by_name['start_positions'].message_type = common__pb2._KEYDATAPAIR -_DESCRIBECOLLECTIONRESPONSE.fields_by_name['consistency_level'].enum_type = common__pb2._CONSISTENCYLEVEL -_LOADCOLLECTIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_RELEASECOLLECTIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETCOLLECTIONSTATISTICSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETCOLLECTIONSTATISTICSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETCOLLECTIONSTATISTICSRESPONSE.fields_by_name['stats'].message_type = common__pb2._KEYVALUEPAIR -_SHOWCOLLECTIONSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SHOWCOLLECTIONSREQUEST.fields_by_name['type'].enum_type = _SHOWTYPE -_SHOWCOLLECTIONSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_CREATEPARTITIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_DROPPARTITIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_HASPARTITIONREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_LOADPARTITIONSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_RELEASEPARTITIONSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETPARTITIONSTATISTICSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETPARTITIONSTATISTICSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETPARTITIONSTATISTICSRESPONSE.fields_by_name['stats'].message_type = common__pb2._KEYVALUEPAIR -_SHOWPARTITIONSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SHOWPARTITIONSREQUEST.fields_by_name['type'].enum_type = _SHOWTYPE -_SHOWPARTITIONSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_DESCRIBESEGMENTREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_DESCRIBESEGMENTRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_SHOWSEGMENTSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SHOWSEGMENTSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_CREATEINDEXREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_CREATEINDEXREQUEST.fields_by_name['extra_params'].message_type = common__pb2._KEYVALUEPAIR -_DESCRIBEINDEXREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_INDEXDESCRIPTION.fields_by_name['params'].message_type = common__pb2._KEYVALUEPAIR -_DESCRIBEINDEXRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_DESCRIBEINDEXRESPONSE.fields_by_name['index_descriptions'].message_type = _INDEXDESCRIPTION -_GETINDEXBUILDPROGRESSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETINDEXBUILDPROGRESSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETINDEXSTATEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETINDEXSTATERESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETINDEXSTATERESPONSE.fields_by_name['state'].enum_type = common__pb2._INDEXSTATE -_DROPINDEXREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_INSERTREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_INSERTREQUEST.fields_by_name['fields_data'].message_type = schema__pb2._FIELDDATA -_MUTATIONRESULT.fields_by_name['status'].message_type = common__pb2._STATUS -_MUTATIONRESULT.fields_by_name['IDs'].message_type = schema__pb2._IDS -_DELETEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SEARCHREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SEARCHREQUEST.fields_by_name['dsl_type'].enum_type = common__pb2._DSLTYPE -_SEARCHREQUEST.fields_by_name['search_params'].message_type = common__pb2._KEYVALUEPAIR -_SEARCHRESULTS.fields_by_name['status'].message_type = common__pb2._STATUS -_SEARCHRESULTS.fields_by_name['results'].message_type = schema__pb2._SEARCHRESULTDATA -_FLUSHREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_FLUSHRESPONSE_COLLSEGIDSENTRY.fields_by_name['value'].message_type = schema__pb2._LONGARRAY -_FLUSHRESPONSE_COLLSEGIDSENTRY.containing_type = _FLUSHRESPONSE -_FLUSHRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_FLUSHRESPONSE.fields_by_name['coll_segIDs'].message_type = _FLUSHRESPONSE_COLLSEGIDSENTRY -_QUERYREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_QUERYRESULTS.fields_by_name['status'].message_type = common__pb2._STATUS -_QUERYRESULTS.fields_by_name['fields_data'].message_type = schema__pb2._FIELDDATA -_VECTORIDS.fields_by_name['id_array'].message_type = schema__pb2._IDS -_VECTORSARRAY.fields_by_name['id_array'].message_type = _VECTORIDS -_VECTORSARRAY.fields_by_name['data_array'].message_type = schema__pb2._VECTORFIELD -_VECTORSARRAY.oneofs_by_name['array'].fields.append( - _VECTORSARRAY.fields_by_name['id_array']) -_VECTORSARRAY.fields_by_name['id_array'].containing_oneof = _VECTORSARRAY.oneofs_by_name['array'] -_VECTORSARRAY.oneofs_by_name['array'].fields.append( - _VECTORSARRAY.fields_by_name['data_array']) -_VECTORSARRAY.fields_by_name['data_array'].containing_oneof = _VECTORSARRAY.oneofs_by_name['array'] -_CALCDISTANCEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_CALCDISTANCEREQUEST.fields_by_name['op_left'].message_type = _VECTORSARRAY -_CALCDISTANCEREQUEST.fields_by_name['op_right'].message_type = _VECTORSARRAY -_CALCDISTANCEREQUEST.fields_by_name['params'].message_type = common__pb2._KEYVALUEPAIR -_CALCDISTANCERESULTS.fields_by_name['status'].message_type = common__pb2._STATUS -_CALCDISTANCERESULTS.fields_by_name['int_dist'].message_type = schema__pb2._INTARRAY -_CALCDISTANCERESULTS.fields_by_name['float_dist'].message_type = schema__pb2._FLOATARRAY -_CALCDISTANCERESULTS.oneofs_by_name['array'].fields.append( - _CALCDISTANCERESULTS.fields_by_name['int_dist']) -_CALCDISTANCERESULTS.fields_by_name['int_dist'].containing_oneof = _CALCDISTANCERESULTS.oneofs_by_name['array'] -_CALCDISTANCERESULTS.oneofs_by_name['array'].fields.append( - _CALCDISTANCERESULTS.fields_by_name['float_dist']) -_CALCDISTANCERESULTS.fields_by_name['float_dist'].containing_oneof = _CALCDISTANCERESULTS.oneofs_by_name['array'] -_PERSISTENTSEGMENTINFO.fields_by_name['state'].enum_type = common__pb2._SEGMENTSTATE -_GETPERSISTENTSEGMENTINFOREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETPERSISTENTSEGMENTINFORESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETPERSISTENTSEGMENTINFORESPONSE.fields_by_name['infos'].message_type = _PERSISTENTSEGMENTINFO -_QUERYSEGMENTINFO.fields_by_name['state'].enum_type = common__pb2._SEGMENTSTATE -_GETQUERYSEGMENTINFOREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETQUERYSEGMENTINFORESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETQUERYSEGMENTINFORESPONSE.fields_by_name['infos'].message_type = _QUERYSEGMENTINFO -_REGISTERLINKRESPONSE.fields_by_name['address'].message_type = common__pb2._ADDRESS -_REGISTERLINKRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETMETRICSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETMETRICSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_LOADBALANCEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_MANUALCOMPACTIONRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETCOMPACTIONSTATERESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETCOMPACTIONSTATERESPONSE.fields_by_name['state'].enum_type = common__pb2._COMPACTIONSTATE -_GETCOMPACTIONPLANSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETCOMPACTIONPLANSRESPONSE.fields_by_name['state'].enum_type = common__pb2._COMPACTIONSTATE -_GETCOMPACTIONPLANSRESPONSE.fields_by_name['mergeInfos'].message_type = _COMPACTIONMERGEINFO -_GETFLUSHSTATERESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_IMPORTREQUEST.fields_by_name['options'].message_type = common__pb2._KEYVALUEPAIR -_IMPORTRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETIMPORTSTATERESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETIMPORTSTATERESPONSE.fields_by_name['state'].enum_type = common__pb2._IMPORTSTATE -_GETIMPORTSTATERESPONSE.fields_by_name['infos'].message_type = common__pb2._KEYVALUEPAIR -_LISTIMPORTTASKSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_LISTIMPORTTASKSRESPONSE.fields_by_name['tasks'].message_type = _GETIMPORTSTATERESPONSE -_GETREPLICASREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_GETREPLICASRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_GETREPLICASRESPONSE.fields_by_name['replicas'].message_type = _REPLICAINFO -_REPLICAINFO.fields_by_name['shard_replicas'].message_type = _SHARDREPLICA -_CREATECREDENTIALREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_UPDATECREDENTIALREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_DELETECREDENTIALREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_LISTCREDUSERSRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_LISTCREDUSERSREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_CREATEROLEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_CREATEROLEREQUEST.fields_by_name['entity'].message_type = _ROLEENTITY -_DROPROLEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_OPERATEUSERROLEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_OPERATEUSERROLEREQUEST.fields_by_name['type'].enum_type = _OPERATEUSERROLETYPE -_SELECTROLEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SELECTROLEREQUEST.fields_by_name['role'].message_type = _ROLEENTITY -_ROLERESULT.fields_by_name['role'].message_type = _ROLEENTITY -_ROLERESULT.fields_by_name['users'].message_type = _USERENTITY -_SELECTROLERESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_SELECTROLERESPONSE.fields_by_name['results'].message_type = _ROLERESULT -_SELECTUSERREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SELECTUSERREQUEST.fields_by_name['user'].message_type = _USERENTITY -_USERRESULT.fields_by_name['user'].message_type = _USERENTITY -_USERRESULT.fields_by_name['roles'].message_type = _ROLEENTITY -_SELECTUSERRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_SELECTUSERRESPONSE.fields_by_name['result'].message_type = _USERRESULT -_SELECTRESOURCEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SELECTRESOURCEREQUEST.fields_by_name['entity'].message_type = _RESOURCEENTITY -_RESOURCERESULT.fields_by_name['resource'].message_type = _RESOURCEENTITY -_RESOURCERESULT.fields_by_name['privileges'].message_type = _PRIVILEGEENTITY -_SELECTRESOURCERESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_SELECTRESOURCERESPONSE.fields_by_name['results'].message_type = _RESOURCERESULT -_PRINCIPALENTITY.fields_by_name['user'].message_type = _USERENTITY -_PRINCIPALENTITY.fields_by_name['role'].message_type = _ROLEENTITY -_PRINCIPALENTITY.oneofs_by_name['principal'].fields.append( - _PRINCIPALENTITY.fields_by_name['user']) -_PRINCIPALENTITY.fields_by_name['user'].containing_oneof = _PRINCIPALENTITY.oneofs_by_name['principal'] -_PRINCIPALENTITY.oneofs_by_name['principal'].fields.append( - _PRINCIPALENTITY.fields_by_name['role']) -_PRINCIPALENTITY.fields_by_name['role'].containing_oneof = _PRINCIPALENTITY.oneofs_by_name['principal'] -_GRANTORENTITY.fields_by_name['user'].message_type = _USERENTITY -_GRANTORENTITY.fields_by_name['privilege'].message_type = _PRIVILEGEENTITY -_GRANTENTITY.fields_by_name['principal'].message_type = _PRINCIPALENTITY -_GRANTENTITY.fields_by_name['resource'].message_type = _RESOURCEENTITY -_GRANTENTITY.fields_by_name['grantor'].message_type = _GRANTORENTITY -_SELECTGRANTREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_SELECTGRANTREQUEST.fields_by_name['entity'].message_type = _GRANTENTITY -_SELECTGRANTRESPONSE.fields_by_name['status'].message_type = common__pb2._STATUS -_SELECTGRANTRESPONSE.fields_by_name['entities'].message_type = _GRANTENTITY -_OPERATEPRIVILEGEREQUEST.fields_by_name['base'].message_type = common__pb2._MSGBASE -_OPERATEPRIVILEGEREQUEST.fields_by_name['entity'].message_type = _GRANTENTITY -_OPERATEPRIVILEGEREQUEST.fields_by_name['type'].enum_type = _OPERATEPRIVILEGETYPE -DESCRIPTOR.message_types_by_name['CreateAliasRequest'] = _CREATEALIASREQUEST -DESCRIPTOR.message_types_by_name['DropAliasRequest'] = _DROPALIASREQUEST -DESCRIPTOR.message_types_by_name['AlterAliasRequest'] = _ALTERALIASREQUEST -DESCRIPTOR.message_types_by_name['CreateCollectionRequest'] = _CREATECOLLECTIONREQUEST -DESCRIPTOR.message_types_by_name['DropCollectionRequest'] = _DROPCOLLECTIONREQUEST -DESCRIPTOR.message_types_by_name['HasCollectionRequest'] = _HASCOLLECTIONREQUEST -DESCRIPTOR.message_types_by_name['BoolResponse'] = _BOOLRESPONSE -DESCRIPTOR.message_types_by_name['StringResponse'] = _STRINGRESPONSE -DESCRIPTOR.message_types_by_name['DescribeCollectionRequest'] = _DESCRIBECOLLECTIONREQUEST -DESCRIPTOR.message_types_by_name['DescribeCollectionResponse'] = _DESCRIBECOLLECTIONRESPONSE -DESCRIPTOR.message_types_by_name['LoadCollectionRequest'] = _LOADCOLLECTIONREQUEST -DESCRIPTOR.message_types_by_name['ReleaseCollectionRequest'] = _RELEASECOLLECTIONREQUEST -DESCRIPTOR.message_types_by_name['GetCollectionStatisticsRequest'] = _GETCOLLECTIONSTATISTICSREQUEST -DESCRIPTOR.message_types_by_name['GetCollectionStatisticsResponse'] = _GETCOLLECTIONSTATISTICSRESPONSE -DESCRIPTOR.message_types_by_name['ShowCollectionsRequest'] = _SHOWCOLLECTIONSREQUEST -DESCRIPTOR.message_types_by_name['ShowCollectionsResponse'] = _SHOWCOLLECTIONSRESPONSE -DESCRIPTOR.message_types_by_name['CreatePartitionRequest'] = _CREATEPARTITIONREQUEST -DESCRIPTOR.message_types_by_name['DropPartitionRequest'] = _DROPPARTITIONREQUEST -DESCRIPTOR.message_types_by_name['HasPartitionRequest'] = _HASPARTITIONREQUEST -DESCRIPTOR.message_types_by_name['LoadPartitionsRequest'] = _LOADPARTITIONSREQUEST -DESCRIPTOR.message_types_by_name['ReleasePartitionsRequest'] = _RELEASEPARTITIONSREQUEST -DESCRIPTOR.message_types_by_name['GetPartitionStatisticsRequest'] = _GETPARTITIONSTATISTICSREQUEST -DESCRIPTOR.message_types_by_name['GetPartitionStatisticsResponse'] = _GETPARTITIONSTATISTICSRESPONSE -DESCRIPTOR.message_types_by_name['ShowPartitionsRequest'] = _SHOWPARTITIONSREQUEST -DESCRIPTOR.message_types_by_name['ShowPartitionsResponse'] = _SHOWPARTITIONSRESPONSE -DESCRIPTOR.message_types_by_name['DescribeSegmentRequest'] = _DESCRIBESEGMENTREQUEST -DESCRIPTOR.message_types_by_name['DescribeSegmentResponse'] = _DESCRIBESEGMENTRESPONSE -DESCRIPTOR.message_types_by_name['ShowSegmentsRequest'] = _SHOWSEGMENTSREQUEST -DESCRIPTOR.message_types_by_name['ShowSegmentsResponse'] = _SHOWSEGMENTSRESPONSE -DESCRIPTOR.message_types_by_name['CreateIndexRequest'] = _CREATEINDEXREQUEST -DESCRIPTOR.message_types_by_name['DescribeIndexRequest'] = _DESCRIBEINDEXREQUEST -DESCRIPTOR.message_types_by_name['IndexDescription'] = _INDEXDESCRIPTION -DESCRIPTOR.message_types_by_name['DescribeIndexResponse'] = _DESCRIBEINDEXRESPONSE -DESCRIPTOR.message_types_by_name['GetIndexBuildProgressRequest'] = _GETINDEXBUILDPROGRESSREQUEST -DESCRIPTOR.message_types_by_name['GetIndexBuildProgressResponse'] = _GETINDEXBUILDPROGRESSRESPONSE -DESCRIPTOR.message_types_by_name['GetIndexStateRequest'] = _GETINDEXSTATEREQUEST -DESCRIPTOR.message_types_by_name['GetIndexStateResponse'] = _GETINDEXSTATERESPONSE -DESCRIPTOR.message_types_by_name['DropIndexRequest'] = _DROPINDEXREQUEST -DESCRIPTOR.message_types_by_name['InsertRequest'] = _INSERTREQUEST -DESCRIPTOR.message_types_by_name['MutationResult'] = _MUTATIONRESULT -DESCRIPTOR.message_types_by_name['DeleteRequest'] = _DELETEREQUEST -DESCRIPTOR.message_types_by_name['SearchRequest'] = _SEARCHREQUEST -DESCRIPTOR.message_types_by_name['Hits'] = _HITS -DESCRIPTOR.message_types_by_name['SearchResults'] = _SEARCHRESULTS -DESCRIPTOR.message_types_by_name['FlushRequest'] = _FLUSHREQUEST -DESCRIPTOR.message_types_by_name['FlushResponse'] = _FLUSHRESPONSE -DESCRIPTOR.message_types_by_name['QueryRequest'] = _QUERYREQUEST -DESCRIPTOR.message_types_by_name['QueryResults'] = _QUERYRESULTS -DESCRIPTOR.message_types_by_name['VectorIDs'] = _VECTORIDS -DESCRIPTOR.message_types_by_name['VectorsArray'] = _VECTORSARRAY -DESCRIPTOR.message_types_by_name['CalcDistanceRequest'] = _CALCDISTANCEREQUEST -DESCRIPTOR.message_types_by_name['CalcDistanceResults'] = _CALCDISTANCERESULTS -DESCRIPTOR.message_types_by_name['PersistentSegmentInfo'] = _PERSISTENTSEGMENTINFO -DESCRIPTOR.message_types_by_name['GetPersistentSegmentInfoRequest'] = _GETPERSISTENTSEGMENTINFOREQUEST -DESCRIPTOR.message_types_by_name['GetPersistentSegmentInfoResponse'] = _GETPERSISTENTSEGMENTINFORESPONSE -DESCRIPTOR.message_types_by_name['QuerySegmentInfo'] = _QUERYSEGMENTINFO -DESCRIPTOR.message_types_by_name['GetQuerySegmentInfoRequest'] = _GETQUERYSEGMENTINFOREQUEST -DESCRIPTOR.message_types_by_name['GetQuerySegmentInfoResponse'] = _GETQUERYSEGMENTINFORESPONSE -DESCRIPTOR.message_types_by_name['DummyRequest'] = _DUMMYREQUEST -DESCRIPTOR.message_types_by_name['DummyResponse'] = _DUMMYRESPONSE -DESCRIPTOR.message_types_by_name['RegisterLinkRequest'] = _REGISTERLINKREQUEST -DESCRIPTOR.message_types_by_name['RegisterLinkResponse'] = _REGISTERLINKRESPONSE -DESCRIPTOR.message_types_by_name['GetMetricsRequest'] = _GETMETRICSREQUEST -DESCRIPTOR.message_types_by_name['GetMetricsResponse'] = _GETMETRICSRESPONSE -DESCRIPTOR.message_types_by_name['LoadBalanceRequest'] = _LOADBALANCEREQUEST -DESCRIPTOR.message_types_by_name['ManualCompactionRequest'] = _MANUALCOMPACTIONREQUEST -DESCRIPTOR.message_types_by_name['ManualCompactionResponse'] = _MANUALCOMPACTIONRESPONSE -DESCRIPTOR.message_types_by_name['GetCompactionStateRequest'] = _GETCOMPACTIONSTATEREQUEST -DESCRIPTOR.message_types_by_name['GetCompactionStateResponse'] = _GETCOMPACTIONSTATERESPONSE -DESCRIPTOR.message_types_by_name['GetCompactionPlansRequest'] = _GETCOMPACTIONPLANSREQUEST -DESCRIPTOR.message_types_by_name['GetCompactionPlansResponse'] = _GETCOMPACTIONPLANSRESPONSE -DESCRIPTOR.message_types_by_name['CompactionMergeInfo'] = _COMPACTIONMERGEINFO -DESCRIPTOR.message_types_by_name['GetFlushStateRequest'] = _GETFLUSHSTATEREQUEST -DESCRIPTOR.message_types_by_name['GetFlushStateResponse'] = _GETFLUSHSTATERESPONSE -DESCRIPTOR.message_types_by_name['ImportRequest'] = _IMPORTREQUEST -DESCRIPTOR.message_types_by_name['ImportResponse'] = _IMPORTRESPONSE -DESCRIPTOR.message_types_by_name['GetImportStateRequest'] = _GETIMPORTSTATEREQUEST -DESCRIPTOR.message_types_by_name['GetImportStateResponse'] = _GETIMPORTSTATERESPONSE -DESCRIPTOR.message_types_by_name['ListImportTasksRequest'] = _LISTIMPORTTASKSREQUEST -DESCRIPTOR.message_types_by_name['ListImportTasksResponse'] = _LISTIMPORTTASKSRESPONSE -DESCRIPTOR.message_types_by_name['GetReplicasRequest'] = _GETREPLICASREQUEST -DESCRIPTOR.message_types_by_name['GetReplicasResponse'] = _GETREPLICASRESPONSE -DESCRIPTOR.message_types_by_name['ReplicaInfo'] = _REPLICAINFO -DESCRIPTOR.message_types_by_name['ShardReplica'] = _SHARDREPLICA -DESCRIPTOR.message_types_by_name['CreateCredentialRequest'] = _CREATECREDENTIALREQUEST -DESCRIPTOR.message_types_by_name['UpdateCredentialRequest'] = _UPDATECREDENTIALREQUEST -DESCRIPTOR.message_types_by_name['DeleteCredentialRequest'] = _DELETECREDENTIALREQUEST -DESCRIPTOR.message_types_by_name['ListCredUsersResponse'] = _LISTCREDUSERSRESPONSE -DESCRIPTOR.message_types_by_name['ListCredUsersRequest'] = _LISTCREDUSERSREQUEST -DESCRIPTOR.message_types_by_name['RoleEntity'] = _ROLEENTITY -DESCRIPTOR.message_types_by_name['UserEntity'] = _USERENTITY -DESCRIPTOR.message_types_by_name['CreateRoleRequest'] = _CREATEROLEREQUEST -DESCRIPTOR.message_types_by_name['DropRoleRequest'] = _DROPROLEREQUEST -DESCRIPTOR.message_types_by_name['OperateUserRoleRequest'] = _OPERATEUSERROLEREQUEST -DESCRIPTOR.message_types_by_name['SelectRoleRequest'] = _SELECTROLEREQUEST -DESCRIPTOR.message_types_by_name['RoleResult'] = _ROLERESULT -DESCRIPTOR.message_types_by_name['SelectRoleResponse'] = _SELECTROLERESPONSE -DESCRIPTOR.message_types_by_name['SelectUserRequest'] = _SELECTUSERREQUEST -DESCRIPTOR.message_types_by_name['UserResult'] = _USERRESULT -DESCRIPTOR.message_types_by_name['SelectUserResponse'] = _SELECTUSERRESPONSE -DESCRIPTOR.message_types_by_name['ResourceEntity'] = _RESOURCEENTITY -DESCRIPTOR.message_types_by_name['PrivilegeEntity'] = _PRIVILEGEENTITY -DESCRIPTOR.message_types_by_name['SelectResourceRequest'] = _SELECTRESOURCEREQUEST -DESCRIPTOR.message_types_by_name['ResourceResult'] = _RESOURCERESULT -DESCRIPTOR.message_types_by_name['SelectResourceResponse'] = _SELECTRESOURCERESPONSE -DESCRIPTOR.message_types_by_name['PrincipalEntity'] = _PRINCIPALENTITY -DESCRIPTOR.message_types_by_name['GrantorEntity'] = _GRANTORENTITY -DESCRIPTOR.message_types_by_name['GrantEntity'] = _GRANTENTITY -DESCRIPTOR.message_types_by_name['SelectGrantRequest'] = _SELECTGRANTREQUEST -DESCRIPTOR.message_types_by_name['SelectGrantResponse'] = _SELECTGRANTRESPONSE -DESCRIPTOR.message_types_by_name['OperatePrivilegeRequest'] = _OPERATEPRIVILEGEREQUEST -DESCRIPTOR.message_types_by_name['MilvusExt'] = _MILVUSEXT -DESCRIPTOR.enum_types_by_name['ShowType'] = _SHOWTYPE -DESCRIPTOR.enum_types_by_name['OperateUserRoleType'] = _OPERATEUSERROLETYPE -DESCRIPTOR.enum_types_by_name['OperatePrivilegeType'] = _OPERATEPRIVILEGETYPE -DESCRIPTOR.extensions_by_name['milvus_ext_obj'] = milvus_ext_obj -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - +milvus_ext_obj = DESCRIPTOR.extensions_by_name['milvus_ext_obj'] + +_CREATEALIASREQUEST = DESCRIPTOR.message_types_by_name['CreateAliasRequest'] +_DROPALIASREQUEST = DESCRIPTOR.message_types_by_name['DropAliasRequest'] +_ALTERALIASREQUEST = DESCRIPTOR.message_types_by_name['AlterAliasRequest'] +_CREATECOLLECTIONREQUEST = DESCRIPTOR.message_types_by_name['CreateCollectionRequest'] +_DROPCOLLECTIONREQUEST = DESCRIPTOR.message_types_by_name['DropCollectionRequest'] +_HASCOLLECTIONREQUEST = DESCRIPTOR.message_types_by_name['HasCollectionRequest'] +_BOOLRESPONSE = DESCRIPTOR.message_types_by_name['BoolResponse'] +_STRINGRESPONSE = DESCRIPTOR.message_types_by_name['StringResponse'] +_DESCRIBECOLLECTIONREQUEST = DESCRIPTOR.message_types_by_name['DescribeCollectionRequest'] +_DESCRIBECOLLECTIONRESPONSE = DESCRIPTOR.message_types_by_name['DescribeCollectionResponse'] +_LOADCOLLECTIONREQUEST = DESCRIPTOR.message_types_by_name['LoadCollectionRequest'] +_RELEASECOLLECTIONREQUEST = DESCRIPTOR.message_types_by_name['ReleaseCollectionRequest'] +_GETCOLLECTIONSTATISTICSREQUEST = DESCRIPTOR.message_types_by_name['GetCollectionStatisticsRequest'] +_GETCOLLECTIONSTATISTICSRESPONSE = DESCRIPTOR.message_types_by_name['GetCollectionStatisticsResponse'] +_SHOWCOLLECTIONSREQUEST = DESCRIPTOR.message_types_by_name['ShowCollectionsRequest'] +_SHOWCOLLECTIONSRESPONSE = DESCRIPTOR.message_types_by_name['ShowCollectionsResponse'] +_CREATEPARTITIONREQUEST = DESCRIPTOR.message_types_by_name['CreatePartitionRequest'] +_DROPPARTITIONREQUEST = DESCRIPTOR.message_types_by_name['DropPartitionRequest'] +_HASPARTITIONREQUEST = DESCRIPTOR.message_types_by_name['HasPartitionRequest'] +_LOADPARTITIONSREQUEST = DESCRIPTOR.message_types_by_name['LoadPartitionsRequest'] +_RELEASEPARTITIONSREQUEST = DESCRIPTOR.message_types_by_name['ReleasePartitionsRequest'] +_GETPARTITIONSTATISTICSREQUEST = DESCRIPTOR.message_types_by_name['GetPartitionStatisticsRequest'] +_GETPARTITIONSTATISTICSRESPONSE = DESCRIPTOR.message_types_by_name['GetPartitionStatisticsResponse'] +_SHOWPARTITIONSREQUEST = DESCRIPTOR.message_types_by_name['ShowPartitionsRequest'] +_SHOWPARTITIONSRESPONSE = DESCRIPTOR.message_types_by_name['ShowPartitionsResponse'] +_DESCRIBESEGMENTREQUEST = DESCRIPTOR.message_types_by_name['DescribeSegmentRequest'] +_DESCRIBESEGMENTRESPONSE = DESCRIPTOR.message_types_by_name['DescribeSegmentResponse'] +_SHOWSEGMENTSREQUEST = DESCRIPTOR.message_types_by_name['ShowSegmentsRequest'] +_SHOWSEGMENTSRESPONSE = DESCRIPTOR.message_types_by_name['ShowSegmentsResponse'] +_CREATEINDEXREQUEST = DESCRIPTOR.message_types_by_name['CreateIndexRequest'] +_DESCRIBEINDEXREQUEST = DESCRIPTOR.message_types_by_name['DescribeIndexRequest'] +_INDEXDESCRIPTION = DESCRIPTOR.message_types_by_name['IndexDescription'] +_DESCRIBEINDEXRESPONSE = DESCRIPTOR.message_types_by_name['DescribeIndexResponse'] +_GETINDEXBUILDPROGRESSREQUEST = DESCRIPTOR.message_types_by_name['GetIndexBuildProgressRequest'] +_GETINDEXBUILDPROGRESSRESPONSE = DESCRIPTOR.message_types_by_name['GetIndexBuildProgressResponse'] +_GETINDEXSTATEREQUEST = DESCRIPTOR.message_types_by_name['GetIndexStateRequest'] +_GETINDEXSTATERESPONSE = DESCRIPTOR.message_types_by_name['GetIndexStateResponse'] +_DROPINDEXREQUEST = DESCRIPTOR.message_types_by_name['DropIndexRequest'] +_INSERTREQUEST = DESCRIPTOR.message_types_by_name['InsertRequest'] +_MUTATIONRESULT = DESCRIPTOR.message_types_by_name['MutationResult'] +_DELETEREQUEST = DESCRIPTOR.message_types_by_name['DeleteRequest'] +_SEARCHREQUEST = DESCRIPTOR.message_types_by_name['SearchRequest'] +_HITS = DESCRIPTOR.message_types_by_name['Hits'] +_SEARCHRESULTS = DESCRIPTOR.message_types_by_name['SearchResults'] +_FLUSHREQUEST = DESCRIPTOR.message_types_by_name['FlushRequest'] +_FLUSHRESPONSE = DESCRIPTOR.message_types_by_name['FlushResponse'] +_FLUSHRESPONSE_COLLSEGIDSENTRY = _FLUSHRESPONSE.nested_types_by_name['CollSegIDsEntry'] +_QUERYREQUEST = DESCRIPTOR.message_types_by_name['QueryRequest'] +_QUERYRESULTS = DESCRIPTOR.message_types_by_name['QueryResults'] +_VECTORIDS = DESCRIPTOR.message_types_by_name['VectorIDs'] +_VECTORSARRAY = DESCRIPTOR.message_types_by_name['VectorsArray'] +_CALCDISTANCEREQUEST = DESCRIPTOR.message_types_by_name['CalcDistanceRequest'] +_CALCDISTANCERESULTS = DESCRIPTOR.message_types_by_name['CalcDistanceResults'] +_PERSISTENTSEGMENTINFO = DESCRIPTOR.message_types_by_name['PersistentSegmentInfo'] +_GETPERSISTENTSEGMENTINFOREQUEST = DESCRIPTOR.message_types_by_name['GetPersistentSegmentInfoRequest'] +_GETPERSISTENTSEGMENTINFORESPONSE = DESCRIPTOR.message_types_by_name['GetPersistentSegmentInfoResponse'] +_QUERYSEGMENTINFO = DESCRIPTOR.message_types_by_name['QuerySegmentInfo'] +_GETQUERYSEGMENTINFOREQUEST = DESCRIPTOR.message_types_by_name['GetQuerySegmentInfoRequest'] +_GETQUERYSEGMENTINFORESPONSE = DESCRIPTOR.message_types_by_name['GetQuerySegmentInfoResponse'] +_DUMMYREQUEST = DESCRIPTOR.message_types_by_name['DummyRequest'] +_DUMMYRESPONSE = DESCRIPTOR.message_types_by_name['DummyResponse'] +_REGISTERLINKREQUEST = DESCRIPTOR.message_types_by_name['RegisterLinkRequest'] +_REGISTERLINKRESPONSE = DESCRIPTOR.message_types_by_name['RegisterLinkResponse'] +_GETMETRICSREQUEST = DESCRIPTOR.message_types_by_name['GetMetricsRequest'] +_GETMETRICSRESPONSE = DESCRIPTOR.message_types_by_name['GetMetricsResponse'] +_LOADBALANCEREQUEST = DESCRIPTOR.message_types_by_name['LoadBalanceRequest'] +_MANUALCOMPACTIONREQUEST = DESCRIPTOR.message_types_by_name['ManualCompactionRequest'] +_MANUALCOMPACTIONRESPONSE = DESCRIPTOR.message_types_by_name['ManualCompactionResponse'] +_GETCOMPACTIONSTATEREQUEST = DESCRIPTOR.message_types_by_name['GetCompactionStateRequest'] +_GETCOMPACTIONSTATERESPONSE = DESCRIPTOR.message_types_by_name['GetCompactionStateResponse'] +_GETCOMPACTIONPLANSREQUEST = DESCRIPTOR.message_types_by_name['GetCompactionPlansRequest'] +_GETCOMPACTIONPLANSRESPONSE = DESCRIPTOR.message_types_by_name['GetCompactionPlansResponse'] +_COMPACTIONMERGEINFO = DESCRIPTOR.message_types_by_name['CompactionMergeInfo'] +_GETFLUSHSTATEREQUEST = DESCRIPTOR.message_types_by_name['GetFlushStateRequest'] +_GETFLUSHSTATERESPONSE = DESCRIPTOR.message_types_by_name['GetFlushStateResponse'] +_IMPORTREQUEST = DESCRIPTOR.message_types_by_name['ImportRequest'] +_IMPORTRESPONSE = DESCRIPTOR.message_types_by_name['ImportResponse'] +_GETIMPORTSTATEREQUEST = DESCRIPTOR.message_types_by_name['GetImportStateRequest'] +_GETIMPORTSTATERESPONSE = DESCRIPTOR.message_types_by_name['GetImportStateResponse'] +_LISTIMPORTTASKSREQUEST = DESCRIPTOR.message_types_by_name['ListImportTasksRequest'] +_LISTIMPORTTASKSRESPONSE = DESCRIPTOR.message_types_by_name['ListImportTasksResponse'] +_GETREPLICASREQUEST = DESCRIPTOR.message_types_by_name['GetReplicasRequest'] +_GETREPLICASRESPONSE = DESCRIPTOR.message_types_by_name['GetReplicasResponse'] +_REPLICAINFO = DESCRIPTOR.message_types_by_name['ReplicaInfo'] +_SHARDREPLICA = DESCRIPTOR.message_types_by_name['ShardReplica'] +_CREATECREDENTIALREQUEST = DESCRIPTOR.message_types_by_name['CreateCredentialRequest'] +_UPDATECREDENTIALREQUEST = DESCRIPTOR.message_types_by_name['UpdateCredentialRequest'] +_DELETECREDENTIALREQUEST = DESCRIPTOR.message_types_by_name['DeleteCredentialRequest'] +_LISTCREDUSERSRESPONSE = DESCRIPTOR.message_types_by_name['ListCredUsersResponse'] +_LISTCREDUSERSREQUEST = DESCRIPTOR.message_types_by_name['ListCredUsersRequest'] +_ROLEENTITY = DESCRIPTOR.message_types_by_name['RoleEntity'] +_USERENTITY = DESCRIPTOR.message_types_by_name['UserEntity'] +_CREATEROLEREQUEST = DESCRIPTOR.message_types_by_name['CreateRoleRequest'] +_DROPROLEREQUEST = DESCRIPTOR.message_types_by_name['DropRoleRequest'] +_OPERATEUSERROLEREQUEST = DESCRIPTOR.message_types_by_name['OperateUserRoleRequest'] +_SELECTROLEREQUEST = DESCRIPTOR.message_types_by_name['SelectRoleRequest'] +_ROLERESULT = DESCRIPTOR.message_types_by_name['RoleResult'] +_SELECTROLERESPONSE = DESCRIPTOR.message_types_by_name['SelectRoleResponse'] +_SELECTUSERREQUEST = DESCRIPTOR.message_types_by_name['SelectUserRequest'] +_USERRESULT = DESCRIPTOR.message_types_by_name['UserResult'] +_SELECTUSERRESPONSE = DESCRIPTOR.message_types_by_name['SelectUserResponse'] +_RESOURCEENTITY = DESCRIPTOR.message_types_by_name['ResourceEntity'] +_PRIVILEGEENTITY = DESCRIPTOR.message_types_by_name['PrivilegeEntity'] +_SELECTRESOURCEREQUEST = DESCRIPTOR.message_types_by_name['SelectResourceRequest'] +_RESOURCERESULT = DESCRIPTOR.message_types_by_name['ResourceResult'] +_SELECTRESOURCERESPONSE = DESCRIPTOR.message_types_by_name['SelectResourceResponse'] +_PRINCIPALENTITY = DESCRIPTOR.message_types_by_name['PrincipalEntity'] +_GRANTORENTITY = DESCRIPTOR.message_types_by_name['GrantorEntity'] +_GRANTENTITY = DESCRIPTOR.message_types_by_name['GrantEntity'] +_SELECTGRANTREQUEST = DESCRIPTOR.message_types_by_name['SelectGrantRequest'] +_SELECTGRANTRESPONSE = DESCRIPTOR.message_types_by_name['SelectGrantResponse'] +_OPERATEPRIVILEGEREQUEST = DESCRIPTOR.message_types_by_name['OperatePrivilegeRequest'] +_MILVUSEXT = DESCRIPTOR.message_types_by_name['MilvusExt'] CreateAliasRequest = _reflection.GeneratedProtocolMessageType('CreateAliasRequest', (_message.Message,), { 'DESCRIPTOR' : _CREATEALIASREQUEST, '__module__' : 'milvus_pb2' @@ -6754,609 +941,265 @@ }) _sym_db.RegisterMessage(MilvusExt) -milvus_ext_obj.message_type = _MILVUSEXT -google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(milvus_ext_obj) - -DESCRIPTOR._options = None -_CREATECOLLECTIONREQUEST._options = None -_DROPCOLLECTIONREQUEST._options = None -_HASCOLLECTIONREQUEST._options = None -_DESCRIBECOLLECTIONREQUEST._options = None -_LOADCOLLECTIONREQUEST._options = None -_RELEASECOLLECTIONREQUEST._options = None -_GETCOLLECTIONSTATISTICSREQUEST._options = None -_SHOWCOLLECTIONSREQUEST._options = None -_FLUSHRESPONSE_COLLSEGIDSENTRY._options = None - -_MILVUSSERVICE = _descriptor.ServiceDescriptor( - name='MilvusService', - full_name='milvus.proto.milvus.MilvusService', - file=DESCRIPTOR, - index=0, - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_start=15238, - serialized_end=20775, - methods=[ - _descriptor.MethodDescriptor( - name='CreateCollection', - full_name='milvus.proto.milvus.MilvusService.CreateCollection', - index=0, - containing_service=None, - input_type=_CREATECOLLECTIONREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='DropCollection', - full_name='milvus.proto.milvus.MilvusService.DropCollection', - index=1, - containing_service=None, - input_type=_DROPCOLLECTIONREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='HasCollection', - full_name='milvus.proto.milvus.MilvusService.HasCollection', - index=2, - containing_service=None, - input_type=_HASCOLLECTIONREQUEST, - output_type=_BOOLRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='LoadCollection', - full_name='milvus.proto.milvus.MilvusService.LoadCollection', - index=3, - containing_service=None, - input_type=_LOADCOLLECTIONREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='ReleaseCollection', - full_name='milvus.proto.milvus.MilvusService.ReleaseCollection', - index=4, - containing_service=None, - input_type=_RELEASECOLLECTIONREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='DescribeCollection', - full_name='milvus.proto.milvus.MilvusService.DescribeCollection', - index=5, - containing_service=None, - input_type=_DESCRIBECOLLECTIONREQUEST, - output_type=_DESCRIBECOLLECTIONRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetCollectionStatistics', - full_name='milvus.proto.milvus.MilvusService.GetCollectionStatistics', - index=6, - containing_service=None, - input_type=_GETCOLLECTIONSTATISTICSREQUEST, - output_type=_GETCOLLECTIONSTATISTICSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='ShowCollections', - full_name='milvus.proto.milvus.MilvusService.ShowCollections', - index=7, - containing_service=None, - input_type=_SHOWCOLLECTIONSREQUEST, - output_type=_SHOWCOLLECTIONSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='CreatePartition', - full_name='milvus.proto.milvus.MilvusService.CreatePartition', - index=8, - containing_service=None, - input_type=_CREATEPARTITIONREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='DropPartition', - full_name='milvus.proto.milvus.MilvusService.DropPartition', - index=9, - containing_service=None, - input_type=_DROPPARTITIONREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='HasPartition', - full_name='milvus.proto.milvus.MilvusService.HasPartition', - index=10, - containing_service=None, - input_type=_HASPARTITIONREQUEST, - output_type=_BOOLRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='LoadPartitions', - full_name='milvus.proto.milvus.MilvusService.LoadPartitions', - index=11, - containing_service=None, - input_type=_LOADPARTITIONSREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='ReleasePartitions', - full_name='milvus.proto.milvus.MilvusService.ReleasePartitions', - index=12, - containing_service=None, - input_type=_RELEASEPARTITIONSREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetPartitionStatistics', - full_name='milvus.proto.milvus.MilvusService.GetPartitionStatistics', - index=13, - containing_service=None, - input_type=_GETPARTITIONSTATISTICSREQUEST, - output_type=_GETPARTITIONSTATISTICSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='ShowPartitions', - full_name='milvus.proto.milvus.MilvusService.ShowPartitions', - index=14, - containing_service=None, - input_type=_SHOWPARTITIONSREQUEST, - output_type=_SHOWPARTITIONSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='CreateAlias', - full_name='milvus.proto.milvus.MilvusService.CreateAlias', - index=15, - containing_service=None, - input_type=_CREATEALIASREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='DropAlias', - full_name='milvus.proto.milvus.MilvusService.DropAlias', - index=16, - containing_service=None, - input_type=_DROPALIASREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='AlterAlias', - full_name='milvus.proto.milvus.MilvusService.AlterAlias', - index=17, - containing_service=None, - input_type=_ALTERALIASREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='CreateIndex', - full_name='milvus.proto.milvus.MilvusService.CreateIndex', - index=18, - containing_service=None, - input_type=_CREATEINDEXREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='DescribeIndex', - full_name='milvus.proto.milvus.MilvusService.DescribeIndex', - index=19, - containing_service=None, - input_type=_DESCRIBEINDEXREQUEST, - output_type=_DESCRIBEINDEXRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetIndexState', - full_name='milvus.proto.milvus.MilvusService.GetIndexState', - index=20, - containing_service=None, - input_type=_GETINDEXSTATEREQUEST, - output_type=_GETINDEXSTATERESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetIndexBuildProgress', - full_name='milvus.proto.milvus.MilvusService.GetIndexBuildProgress', - index=21, - containing_service=None, - input_type=_GETINDEXBUILDPROGRESSREQUEST, - output_type=_GETINDEXBUILDPROGRESSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='DropIndex', - full_name='milvus.proto.milvus.MilvusService.DropIndex', - index=22, - containing_service=None, - input_type=_DROPINDEXREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='Insert', - full_name='milvus.proto.milvus.MilvusService.Insert', - index=23, - containing_service=None, - input_type=_INSERTREQUEST, - output_type=_MUTATIONRESULT, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='Delete', - full_name='milvus.proto.milvus.MilvusService.Delete', - index=24, - containing_service=None, - input_type=_DELETEREQUEST, - output_type=_MUTATIONRESULT, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='Search', - full_name='milvus.proto.milvus.MilvusService.Search', - index=25, - containing_service=None, - input_type=_SEARCHREQUEST, - output_type=_SEARCHRESULTS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='Flush', - full_name='milvus.proto.milvus.MilvusService.Flush', - index=26, - containing_service=None, - input_type=_FLUSHREQUEST, - output_type=_FLUSHRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='Query', - full_name='milvus.proto.milvus.MilvusService.Query', - index=27, - containing_service=None, - input_type=_QUERYREQUEST, - output_type=_QUERYRESULTS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='CalcDistance', - full_name='milvus.proto.milvus.MilvusService.CalcDistance', - index=28, - containing_service=None, - input_type=_CALCDISTANCEREQUEST, - output_type=_CALCDISTANCERESULTS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetFlushState', - full_name='milvus.proto.milvus.MilvusService.GetFlushState', - index=29, - containing_service=None, - input_type=_GETFLUSHSTATEREQUEST, - output_type=_GETFLUSHSTATERESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetPersistentSegmentInfo', - full_name='milvus.proto.milvus.MilvusService.GetPersistentSegmentInfo', - index=30, - containing_service=None, - input_type=_GETPERSISTENTSEGMENTINFOREQUEST, - output_type=_GETPERSISTENTSEGMENTINFORESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetQuerySegmentInfo', - full_name='milvus.proto.milvus.MilvusService.GetQuerySegmentInfo', - index=31, - containing_service=None, - input_type=_GETQUERYSEGMENTINFOREQUEST, - output_type=_GETQUERYSEGMENTINFORESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetReplicas', - full_name='milvus.proto.milvus.MilvusService.GetReplicas', - index=32, - containing_service=None, - input_type=_GETREPLICASREQUEST, - output_type=_GETREPLICASRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='Dummy', - full_name='milvus.proto.milvus.MilvusService.Dummy', - index=33, - containing_service=None, - input_type=_DUMMYREQUEST, - output_type=_DUMMYRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='RegisterLink', - full_name='milvus.proto.milvus.MilvusService.RegisterLink', - index=34, - containing_service=None, - input_type=_REGISTERLINKREQUEST, - output_type=_REGISTERLINKRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetMetrics', - full_name='milvus.proto.milvus.MilvusService.GetMetrics', - index=35, - containing_service=None, - input_type=_GETMETRICSREQUEST, - output_type=_GETMETRICSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='LoadBalance', - full_name='milvus.proto.milvus.MilvusService.LoadBalance', - index=36, - containing_service=None, - input_type=_LOADBALANCEREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetCompactionState', - full_name='milvus.proto.milvus.MilvusService.GetCompactionState', - index=37, - containing_service=None, - input_type=_GETCOMPACTIONSTATEREQUEST, - output_type=_GETCOMPACTIONSTATERESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='ManualCompaction', - full_name='milvus.proto.milvus.MilvusService.ManualCompaction', - index=38, - containing_service=None, - input_type=_MANUALCOMPACTIONREQUEST, - output_type=_MANUALCOMPACTIONRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetCompactionStateWithPlans', - full_name='milvus.proto.milvus.MilvusService.GetCompactionStateWithPlans', - index=39, - containing_service=None, - input_type=_GETCOMPACTIONPLANSREQUEST, - output_type=_GETCOMPACTIONPLANSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='Import', - full_name='milvus.proto.milvus.MilvusService.Import', - index=40, - containing_service=None, - input_type=_IMPORTREQUEST, - output_type=_IMPORTRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='GetImportState', - full_name='milvus.proto.milvus.MilvusService.GetImportState', - index=41, - containing_service=None, - input_type=_GETIMPORTSTATEREQUEST, - output_type=_GETIMPORTSTATERESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='ListImportTasks', - full_name='milvus.proto.milvus.MilvusService.ListImportTasks', - index=42, - containing_service=None, - input_type=_LISTIMPORTTASKSREQUEST, - output_type=_LISTIMPORTTASKSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='CreateCredential', - full_name='milvus.proto.milvus.MilvusService.CreateCredential', - index=43, - containing_service=None, - input_type=_CREATECREDENTIALREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='UpdateCredential', - full_name='milvus.proto.milvus.MilvusService.UpdateCredential', - index=44, - containing_service=None, - input_type=_UPDATECREDENTIALREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='DeleteCredential', - full_name='milvus.proto.milvus.MilvusService.DeleteCredential', - index=45, - containing_service=None, - input_type=_DELETECREDENTIALREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='ListCredUsers', - full_name='milvus.proto.milvus.MilvusService.ListCredUsers', - index=46, - containing_service=None, - input_type=_LISTCREDUSERSREQUEST, - output_type=_LISTCREDUSERSRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='CreateRole', - full_name='milvus.proto.milvus.MilvusService.CreateRole', - index=47, - containing_service=None, - input_type=_CREATEROLEREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='DropRole', - full_name='milvus.proto.milvus.MilvusService.DropRole', - index=48, - containing_service=None, - input_type=_DROPROLEREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='OperateUserRole', - full_name='milvus.proto.milvus.MilvusService.OperateUserRole', - index=49, - containing_service=None, - input_type=_OPERATEUSERROLEREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='SelectRole', - full_name='milvus.proto.milvus.MilvusService.SelectRole', - index=50, - containing_service=None, - input_type=_SELECTROLEREQUEST, - output_type=_SELECTROLERESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='SelectUser', - full_name='milvus.proto.milvus.MilvusService.SelectUser', - index=51, - containing_service=None, - input_type=_SELECTUSERREQUEST, - output_type=_SELECTUSERRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='SelectResource', - full_name='milvus.proto.milvus.MilvusService.SelectResource', - index=52, - containing_service=None, - input_type=_SELECTRESOURCEREQUEST, - output_type=_SELECTRESOURCERESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='OperatePrivilege', - full_name='milvus.proto.milvus.MilvusService.OperatePrivilege', - index=53, - containing_service=None, - input_type=_OPERATEPRIVILEGEREQUEST, - output_type=common__pb2._STATUS, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='SelectGrant', - full_name='milvus.proto.milvus.MilvusService.SelectGrant', - index=54, - containing_service=None, - input_type=_SELECTGRANTREQUEST, - output_type=_SELECTGRANTRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), -]) -_sym_db.RegisterServiceDescriptor(_MILVUSSERVICE) - -DESCRIPTOR.services_by_name['MilvusService'] = _MILVUSSERVICE - - -_PROXYSERVICE = _descriptor.ServiceDescriptor( - name='ProxyService', - full_name='milvus.proto.milvus.ProxyService', - file=DESCRIPTOR, - index=1, - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_start=20777, - serialized_end=20894, - methods=[ - _descriptor.MethodDescriptor( - name='RegisterLink', - full_name='milvus.proto.milvus.ProxyService.RegisterLink', - index=0, - containing_service=None, - input_type=_REGISTERLINKREQUEST, - output_type=_REGISTERLINKRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), -]) -_sym_db.RegisterServiceDescriptor(_PROXYSERVICE) - -DESCRIPTOR.services_by_name['ProxyService'] = _PROXYSERVICE - +_MILVUSSERVICE = DESCRIPTOR.services_by_name['MilvusService'] +_PROXYSERVICE = DESCRIPTOR.services_by_name['ProxyService'] +if _descriptor._USE_C_DESCRIPTORS == False: + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(milvus_ext_obj) + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\016io.milvus.grpcB\013MilvusProtoP\001Z3github.com/milvus-io/milvus/internal/proto/milvuspb\240\001\001\312>\007\n\0052.1.0' + _CREATECOLLECTIONREQUEST._options = None + _CREATECOLLECTIONREQUEST._serialized_options = b'\312>\004\020\001\030\003' + _DROPCOLLECTIONREQUEST._options = None + _DROPCOLLECTIONREQUEST._serialized_options = b'\312>\004\020\002\030\003' + _HASCOLLECTIONREQUEST._options = None + _HASCOLLECTIONREQUEST._serialized_options = b'\312>\004\020\004\030\003' + _DESCRIBECOLLECTIONREQUEST._options = None + _DESCRIBECOLLECTIONREQUEST._serialized_options = b'\312>\004\020\004\030\003' + _LOADCOLLECTIONREQUEST._options = None + _LOADCOLLECTIONREQUEST._serialized_options = b'\312>\004\020\005\030\003' + _RELEASECOLLECTIONREQUEST._options = None + _RELEASECOLLECTIONREQUEST._serialized_options = b'\312>\004\020\006\030\003' + _GETCOLLECTIONSTATISTICSREQUEST._options = None + _GETCOLLECTIONSTATISTICSREQUEST._serialized_options = b'\312>\004\020\004\030\003' + _SHOWCOLLECTIONSREQUEST._options = None + _SHOWCOLLECTIONSREQUEST._serialized_options = b'\312>\002\020\004' + _FLUSHRESPONSE_COLLSEGIDSENTRY._options = None + _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_options = b'8\001' + _SHOWTYPE._serialized_start=15089 + _SHOWTYPE._serialized_end=15122 + _OPERATEUSERROLETYPE._serialized_start=15124 + _OPERATEUSERROLETYPE._serialized_end=15188 + _OPERATEPRIVILEGETYPE._serialized_start=15190 + _OPERATEPRIVILEGETYPE._serialized_end=15235 + _CREATEALIASREQUEST._serialized_start=99 + _CREATEALIASREQUEST._serialized_end=220 + _DROPALIASREQUEST._serialized_start=222 + _DROPALIASREQUEST._serialized_end=316 + _ALTERALIASREQUEST._serialized_start=318 + _ALTERALIASREQUEST._serialized_end=438 + _CREATECOLLECTIONREQUEST._serialized_start=441 + _CREATECOLLECTIONREQUEST._serialized_end=663 + _DROPCOLLECTIONREQUEST._serialized_start=665 + _DROPCOLLECTIONREQUEST._serialized_end=783 + _HASCOLLECTIONREQUEST._serialized_start=786 + _HASCOLLECTIONREQUEST._serialized_end=923 + _BOOLRESPONSE._serialized_start=925 + _BOOLRESPONSE._serialized_end=999 + _STRINGRESPONSE._serialized_start=1001 + _STRINGRESPONSE._serialized_end=1077 + _DESCRIBECOLLECTIONREQUEST._serialized_start=1080 + _DESCRIBECOLLECTIONREQUEST._serialized_end=1244 + _DESCRIBECOLLECTIONRESPONSE._serialized_start=1247 + _DESCRIBECOLLECTIONRESPONSE._serialized_end=1705 + _LOADCOLLECTIONREQUEST._serialized_start=1708 + _LOADCOLLECTIONREQUEST._serialized_end=1850 + _RELEASECOLLECTIONREQUEST._serialized_start=1852 + _RELEASECOLLECTIONREQUEST._serialized_end=1973 + _GETCOLLECTIONSTATISTICSREQUEST._serialized_start=1975 + _GETCOLLECTIONSTATISTICSREQUEST._serialized_end=2102 + _GETCOLLECTIONSTATISTICSRESPONSE._serialized_start=2105 + _GETCOLLECTIONSTATISTICSRESPONSE._serialized_end=2233 + _SHOWCOLLECTIONSREQUEST._serialized_start=2236 + _SHOWCOLLECTIONSREQUEST._serialized_end=2419 + _SHOWCOLLECTIONSRESPONSE._serialized_start=2422 + _SHOWCOLLECTIONSRESPONSE._serialized_end=2665 + _CREATEPARTITIONREQUEST._serialized_start=2668 + _CREATEPARTITIONREQUEST._serialized_end=2802 + _DROPPARTITIONREQUEST._serialized_start=2805 + _DROPPARTITIONREQUEST._serialized_end=2937 + _HASPARTITIONREQUEST._serialized_start=2940 + _HASPARTITIONREQUEST._serialized_end=3071 + _LOADPARTITIONSREQUEST._serialized_start=3074 + _LOADPARTITIONSREQUEST._serialized_end=3232 + _RELEASEPARTITIONSREQUEST._serialized_start=3235 + _RELEASEPARTITIONSREQUEST._serialized_end=3372 + _GETPARTITIONSTATISTICSREQUEST._serialized_start=3375 + _GETPARTITIONSTATISTICSREQUEST._serialized_end=3516 + _GETPARTITIONSTATISTICSRESPONSE._serialized_start=3518 + _GETPARTITIONSTATISTICSRESPONSE._serialized_end=3645 + _SHOWPARTITIONSREQUEST._serialized_start=3648 + _SHOWPARTITIONSREQUEST._serialized_end=3849 + _SHOWPARTITIONSRESPONSE._serialized_start=3852 + _SHOWPARTITIONSRESPONSE._serialized_end=4058 + _DESCRIBESEGMENTREQUEST._serialized_start=4060 + _DESCRIBESEGMENTREQUEST._serialized_end=4169 + _DESCRIBESEGMENTRESPONSE._serialized_start=4172 + _DESCRIBESEGMENTRESPONSE._serialized_end=4315 + _SHOWSEGMENTSREQUEST._serialized_start=4317 + _SHOWSEGMENTSREQUEST._serialized_end=4425 + _SHOWSEGMENTSRESPONSE._serialized_start=4427 + _SHOWSEGMENTSRESPONSE._serialized_end=4514 + _CREATEINDEXREQUEST._serialized_start=4517 + _CREATEINDEXREQUEST._serialized_end=4720 + _DESCRIBEINDEXREQUEST._serialized_start=4723 + _DESCRIBEINDEXREQUEST._serialized_end=4871 + _INDEXDESCRIPTION._serialized_start=4873 + _INDEXDESCRIPTION._serialized_end=4999 + _DESCRIBEINDEXRESPONSE._serialized_start=5002 + _DESCRIBEINDEXRESPONSE._serialized_end=5137 + _GETINDEXBUILDPROGRESSREQUEST._serialized_start=5140 + _GETINDEXBUILDPROGRESSREQUEST._serialized_end=5296 + _GETINDEXBUILDPROGRESSRESPONSE._serialized_start=5298 + _GETINDEXBUILDPROGRESSRESPONSE._serialized_end=5416 + _GETINDEXSTATEREQUEST._serialized_start=5419 + _GETINDEXSTATEREQUEST._serialized_end=5567 + _GETINDEXSTATERESPONSE._serialized_start=5570 + _GETINDEXSTATERESPONSE._serialized_end=5707 + _DROPINDEXREQUEST._serialized_start=5710 + _DROPINDEXREQUEST._serialized_end=5854 + _INSERTREQUEST._serialized_start=5857 + _INSERTREQUEST._serialized_end=6072 + _MUTATIONRESULT._serialized_start=6075 + _MUTATIONRESULT._serialized_end=6315 + _DELETEREQUEST._serialized_start=6318 + _DELETEREQUEST._serialized_end=6476 + _SEARCHREQUEST._serialized_start=6479 + _SEARCHREQUEST._serialized_end=6841 + _HITS._serialized_start=6843 + _HITS._serialized_end=6896 + _SEARCHRESULTS._serialized_start=6899 + _SEARCHRESULTS._serialized_end=7040 + _FLUSHREQUEST._serialized_start=7042 + _FLUSHREQUEST._serialized_end=7143 + _FLUSHRESPONSE._serialized_start=7146 + _FLUSHRESPONSE._serialized_end=7379 + _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_start=7298 + _FLUSHRESPONSE_COLLSEGIDSENTRY._serialized_end=7379 + _QUERYREQUEST._serialized_start=7382 + _QUERYREQUEST._serialized_end=7599 + _QUERYRESULTS._serialized_start=7602 + _QUERYRESULTS._serialized_end=7739 + _VECTORIDS._serialized_start=7741 + _VECTORIDS._serialized_end=7866 + _VECTORSARRAY._serialized_start=7869 + _VECTORSARRAY._serialized_end=8000 + _CALCDISTANCEREQUEST._serialized_start=8003 + _CALCDISTANCEREQUEST._serialized_end=8224 + _CALCDISTANCERESULTS._serialized_start=8227 + _CALCDISTANCERESULTS._serialized_end=8408 + _PERSISTENTSEGMENTINFO._serialized_start=8411 + _PERSISTENTSEGMENTINFO._serialized_end=8564 + _GETPERSISTENTSEGMENTINFOREQUEST._serialized_start=8566 + _GETPERSISTENTSEGMENTINFOREQUEST._serialized_end=8683 + _GETPERSISTENTSEGMENTINFORESPONSE._serialized_start=8686 + _GETPERSISTENTSEGMENTINFORESPONSE._serialized_end=8824 + _QUERYSEGMENTINFO._serialized_start=8827 + _QUERYSEGMENTINFO._serialized_end=9063 + _GETQUERYSEGMENTINFOREQUEST._serialized_start=9065 + _GETQUERYSEGMENTINFOREQUEST._serialized_end=9177 + _GETQUERYSEGMENTINFORESPONSE._serialized_start=9180 + _GETQUERYSEGMENTINFORESPONSE._serialized_end=9308 + _DUMMYREQUEST._serialized_start=9310 + _DUMMYREQUEST._serialized_end=9346 + _DUMMYRESPONSE._serialized_start=9348 + _DUMMYRESPONSE._serialized_end=9381 + _REGISTERLINKREQUEST._serialized_start=9383 + _REGISTERLINKREQUEST._serialized_end=9404 + _REGISTERLINKRESPONSE._serialized_start=9406 + _REGISTERLINKRESPONSE._serialized_end=9520 + _GETMETRICSREQUEST._serialized_start=9522 + _GETMETRICSREQUEST._serialized_end=9602 + _GETMETRICSRESPONSE._serialized_start=9604 + _GETMETRICSRESPONSE._serialized_end=9711 + _LOADBALANCEREQUEST._serialized_start=9714 + _LOADBALANCEREQUEST._serialized_end=9870 + _MANUALCOMPACTIONREQUEST._serialized_start=9872 + _MANUALCOMPACTIONREQUEST._serialized_end=9939 + _MANUALCOMPACTIONRESPONSE._serialized_start=9941 + _MANUALCOMPACTIONRESPONSE._serialized_end=10034 + _GETCOMPACTIONSTATEREQUEST._serialized_start=10036 + _GETCOMPACTIONSTATEREQUEST._serialized_end=10085 + _GETCOMPACTIONSTATERESPONSE._serialized_start=10088 + _GETCOMPACTIONSTATERESPONSE._serialized_end=10287 + _GETCOMPACTIONPLANSREQUEST._serialized_start=10289 + _GETCOMPACTIONPLANSREQUEST._serialized_end=10338 + _GETCOMPACTIONPLANSRESPONSE._serialized_start=10341 + _GETCOMPACTIONPLANSRESPONSE._serialized_end=10529 + _COMPACTIONMERGEINFO._serialized_start=10531 + _COMPACTIONMERGEINFO._serialized_end=10585 + _GETFLUSHSTATEREQUEST._serialized_start=10587 + _GETFLUSHSTATEREQUEST._serialized_end=10629 + _GETFLUSHSTATERESPONSE._serialized_start=10631 + _GETFLUSHSTATERESPONSE._serialized_end=10716 + _IMPORTREQUEST._serialized_start=10719 + _IMPORTREQUEST._serialized_end=10892 + _IMPORTRESPONSE._serialized_start=10894 + _IMPORTRESPONSE._serialized_end=10970 + _GETIMPORTSTATEREQUEST._serialized_start=10972 + _GETIMPORTSTATEREQUEST._serialized_end=11009 + _GETIMPORTSTATERESPONSE._serialized_start=11012 + _GETIMPORTSTATERESPONSE._serialized_end=11274 + _LISTIMPORTTASKSREQUEST._serialized_start=11276 + _LISTIMPORTTASKSREQUEST._serialized_end=11300 + _LISTIMPORTTASKSRESPONSE._serialized_start=11303 + _LISTIMPORTTASKSRESPONSE._serialized_end=11433 + _GETREPLICASREQUEST._serialized_start=11435 + _GETREPLICASREQUEST._serialized_end=11547 + _GETREPLICASRESPONSE._serialized_start=11549 + _GETREPLICASRESPONSE._serialized_end=11667 + _REPLICAINFO._serialized_start=11670 + _REPLICAINFO._serialized_end=11824 + _SHARDREPLICA._serialized_start=11826 + _SHARDREPLICA._serialized_end=11922 + _CREATECREDENTIALREQUEST._serialized_start=11925 + _CREATECREDENTIALREQUEST._serialized_end=12095 + _UPDATECREDENTIALREQUEST._serialized_start=12098 + _UPDATECREDENTIALREQUEST._serialized_end=12292 + _DELETECREDENTIALREQUEST._serialized_start=12294 + _DELETECREDENTIALREQUEST._serialized_end=12381 + _LISTCREDUSERSRESPONSE._serialized_start=12383 + _LISTCREDUSERSRESPONSE._serialized_end=12470 + _LISTCREDUSERSREQUEST._serialized_start=12472 + _LISTCREDUSERSREQUEST._serialized_end=12538 + _ROLEENTITY._serialized_start=12540 + _ROLEENTITY._serialized_end=12566 + _USERENTITY._serialized_start=12568 + _USERENTITY._serialized_end=12594 + _CREATEROLEREQUEST._serialized_start=12596 + _CREATEROLEREQUEST._serialized_end=12708 + _DROPROLEREQUEST._serialized_start=12710 + _DROPROLEREQUEST._serialized_end=12790 + _OPERATEUSERROLEREQUEST._serialized_start=12793 + _OPERATEUSERROLEREQUEST._serialized_end=12954 + _SELECTROLEREQUEST._serialized_start=12957 + _SELECTROLEREQUEST._serialized_end=13094 + _ROLERESULT._serialized_start=13096 + _ROLERESULT._serialized_end=13203 + _SELECTROLERESPONSE._serialized_start=13205 + _SELECTROLERESPONSE._serialized_end=13320 + _SELECTUSERREQUEST._serialized_start=13323 + _SELECTUSERREQUEST._serialized_end=13460 + _USERRESULT._serialized_start=13462 + _USERRESULT._serialized_end=13569 + _SELECTUSERRESPONSE._serialized_start=13571 + _SELECTUSERRESPONSE._serialized_end=13685 + _RESOURCEENTITY._serialized_start=13687 + _RESOURCEENTITY._serialized_end=13717 + _PRIVILEGEENTITY._serialized_start=13719 + _PRIVILEGEENTITY._serialized_end=13750 + _SELECTRESOURCEREQUEST._serialized_start=13753 + _SELECTRESOURCEREQUEST._serialized_end=13905 + _RESOURCERESULT._serialized_start=13908 + _RESOURCERESULT._serialized_end=14037 + _SELECTRESOURCERESPONSE._serialized_start=14039 + _SELECTRESOURCERESPONSE._serialized_end=14162 + _PRINCIPALENTITY._serialized_start=14165 + _PRINCIPALENTITY._serialized_end=14317 + _GRANTORENTITY._serialized_start=14319 + _GRANTORENTITY._serialized_end=14438 + _GRANTENTITY._serialized_start=14441 + _GRANTENTITY._serialized_end=14642 + _SELECTGRANTREQUEST._serialized_start=14644 + _SELECTGRANTREQUEST._serialized_end=14758 + _SELECTGRANTRESPONSE._serialized_start=14760 + _SELECTGRANTRESPONSE._serialized_end=14878 + _OPERATEPRIVILEGEREQUEST._serialized_start=14881 + _OPERATEPRIVILEGEREQUEST._serialized_end=15057 + _MILVUSEXT._serialized_start=15059 + _MILVUSEXT._serialized_end=15087 + _MILVUSSERVICE._serialized_start=15238 + _MILVUSSERVICE._serialized_end=20775 + _PROXYSERVICE._serialized_start=20777 + _PROXYSERVICE._serialized_end=20894 # @@protoc_insertion_point(module_scope) diff --git a/pymilvus/grpc_gen/schema_pb2.py b/pymilvus/grpc_gen/schema_pb2.py index 02c88fe7b..b63d04713 100644 --- a/pymilvus/grpc_gen/schema_pb2.py +++ b/pymilvus/grpc_gen/schema_pb2.py @@ -4,6 +4,7 @@ """Generated protocol buffer code.""" from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -15,91 +16,9 @@ from . import common_pb2 as common__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='schema.proto', - package='milvus.proto.schema', - syntax='proto3', - serialized_options=b'\n\016io.milvus.grpcB\013SchemaProtoP\001Z3github.com/milvus-io/milvus/internal/proto/schemapb\240\001\001', - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x0cschema.proto\x12\x13milvus.proto.schema\x1a\x0c\x63ommon.proto\"\x8c\x02\n\x0b\x46ieldSchema\x12\x0f\n\x07\x66ieldID\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x16\n\x0eis_primary_key\x18\x03 \x01(\x08\x12\x13\n\x0b\x64\x65scription\x18\x04 \x01(\t\x12\x30\n\tdata_type\x18\x05 \x01(\x0e\x32\x1d.milvus.proto.schema.DataType\x12\x36\n\x0btype_params\x18\x06 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x37\n\x0cindex_params\x18\x07 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x0e\n\x06\x61utoID\x18\x08 \x01(\x08\"w\n\x10\x43ollectionSchema\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x0e\n\x06\x61utoID\x18\x03 \x01(\x08\x12\x30\n\x06\x66ields\x18\x04 \x03(\x0b\x32 .milvus.proto.schema.FieldSchema\"\x19\n\tBoolArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x08\"\x18\n\x08IntArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x05\"\x19\n\tLongArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x03\"\x1a\n\nFloatArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x02\"\x1b\n\x0b\x44oubleArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x01\"\x1a\n\nBytesArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x0c\"\x1b\n\x0bStringArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\t\"\x92\x03\n\x0bScalarField\x12\x33\n\tbool_data\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.schema.BoolArrayH\x00\x12\x31\n\x08int_data\x18\x02 \x01(\x0b\x32\x1d.milvus.proto.schema.IntArrayH\x00\x12\x33\n\tlong_data\x18\x03 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArrayH\x00\x12\x35\n\nfloat_data\x18\x04 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x12\x37\n\x0b\x64ouble_data\x18\x05 \x01(\x0b\x32 .milvus.proto.schema.DoubleArrayH\x00\x12\x37\n\x0bstring_data\x18\x06 \x01(\x0b\x32 .milvus.proto.schema.StringArrayH\x00\x12\x35\n\nbytes_data\x18\x07 \x01(\x0b\x32\x1f.milvus.proto.schema.BytesArrayH\x00\x42\x06\n\x04\x64\x61ta\"t\n\x0bVectorField\x12\x0b\n\x03\x64im\x18\x01 \x01(\x03\x12\x37\n\x0c\x66loat_vector\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x12\x17\n\rbinary_vector\x18\x03 \x01(\x0cH\x00\x42\x06\n\x04\x64\x61ta\"\xd1\x01\n\tFieldData\x12+\n\x04type\x18\x01 \x01(\x0e\x32\x1d.milvus.proto.schema.DataType\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12\x33\n\x07scalars\x18\x03 \x01(\x0b\x32 .milvus.proto.schema.ScalarFieldH\x00\x12\x33\n\x07vectors\x18\x04 \x01(\x0b\x32 .milvus.proto.schema.VectorFieldH\x00\x12\x10\n\x08\x66ield_id\x18\x05 \x01(\x03\x42\x07\n\x05\x66ield\"w\n\x03IDs\x12\x30\n\x06int_id\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArrayH\x00\x12\x32\n\x06str_id\x18\x02 \x01(\x0b\x32 .milvus.proto.schema.StringArrayH\x00\x42\n\n\x08id_field\"\xb1\x01\n\x10SearchResultData\x12\x13\n\x0bnum_queries\x18\x01 \x01(\x03\x12\r\n\x05top_k\x18\x02 \x01(\x03\x12\x33\n\x0b\x66ields_data\x18\x03 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x0e\n\x06scores\x18\x04 \x03(\x02\x12%\n\x03ids\x18\x05 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\r\n\x05topks\x18\x06 \x03(\x03*\x9c\x01\n\x08\x44\x61taType\x12\x08\n\x04None\x10\x00\x12\x08\n\x04\x42ool\x10\x01\x12\x08\n\x04Int8\x10\x02\x12\t\n\x05Int16\x10\x03\x12\t\n\x05Int32\x10\x04\x12\t\n\x05Int64\x10\x05\x12\t\n\x05\x46loat\x10\n\x12\n\n\x06\x44ouble\x10\x0b\x12\n\n\x06String\x10\x14\x12\x0b\n\x07VarChar\x10\x15\x12\x10\n\x0c\x42inaryVector\x10\x64\x12\x0f\n\x0b\x46loatVector\x10\x65\x42W\n\x0eio.milvus.grpcB\x0bSchemaProtoP\x01Z3github.com/milvus-io/milvus/internal/proto/schemapb\xa0\x01\x01\x62\x06proto3' - , - dependencies=[common__pb2.DESCRIPTOR,]) - -_DATATYPE = _descriptor.EnumDescriptor( - name='DataType', - full_name='milvus.proto.schema.DataType', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='None', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Bool', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Int8', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Int16', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Int32', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Int64', index=5, number=5, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Float', index=6, number=10, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='Double', index=7, number=11, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='String', index=8, number=20, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='VarChar', index=9, number=21, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='BinaryVector', index=10, number=100, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FloatVector', index=11, number=101, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=1674, - serialized_end=1830, -) -_sym_db.RegisterEnumDescriptor(_DATATYPE) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cschema.proto\x12\x13milvus.proto.schema\x1a\x0c\x63ommon.proto\"\x8c\x02\n\x0b\x46ieldSchema\x12\x0f\n\x07\x66ieldID\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x16\n\x0eis_primary_key\x18\x03 \x01(\x08\x12\x13\n\x0b\x64\x65scription\x18\x04 \x01(\t\x12\x30\n\tdata_type\x18\x05 \x01(\x0e\x32\x1d.milvus.proto.schema.DataType\x12\x36\n\x0btype_params\x18\x06 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x37\n\x0cindex_params\x18\x07 \x03(\x0b\x32!.milvus.proto.common.KeyValuePair\x12\x0e\n\x06\x61utoID\x18\x08 \x01(\x08\"w\n\x10\x43ollectionSchema\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x0e\n\x06\x61utoID\x18\x03 \x01(\x08\x12\x30\n\x06\x66ields\x18\x04 \x03(\x0b\x32 .milvus.proto.schema.FieldSchema\"\x19\n\tBoolArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x08\"\x18\n\x08IntArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x05\"\x19\n\tLongArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x03\"\x1a\n\nFloatArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x02\"\x1b\n\x0b\x44oubleArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x01\"\x1a\n\nBytesArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x0c\"\x1b\n\x0bStringArray\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\t\"\x92\x03\n\x0bScalarField\x12\x33\n\tbool_data\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.schema.BoolArrayH\x00\x12\x31\n\x08int_data\x18\x02 \x01(\x0b\x32\x1d.milvus.proto.schema.IntArrayH\x00\x12\x33\n\tlong_data\x18\x03 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArrayH\x00\x12\x35\n\nfloat_data\x18\x04 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x12\x37\n\x0b\x64ouble_data\x18\x05 \x01(\x0b\x32 .milvus.proto.schema.DoubleArrayH\x00\x12\x37\n\x0bstring_data\x18\x06 \x01(\x0b\x32 .milvus.proto.schema.StringArrayH\x00\x12\x35\n\nbytes_data\x18\x07 \x01(\x0b\x32\x1f.milvus.proto.schema.BytesArrayH\x00\x42\x06\n\x04\x64\x61ta\"t\n\x0bVectorField\x12\x0b\n\x03\x64im\x18\x01 \x01(\x03\x12\x37\n\x0c\x66loat_vector\x18\x02 \x01(\x0b\x32\x1f.milvus.proto.schema.FloatArrayH\x00\x12\x17\n\rbinary_vector\x18\x03 \x01(\x0cH\x00\x42\x06\n\x04\x64\x61ta\"\xd1\x01\n\tFieldData\x12+\n\x04type\x18\x01 \x01(\x0e\x32\x1d.milvus.proto.schema.DataType\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12\x33\n\x07scalars\x18\x03 \x01(\x0b\x32 .milvus.proto.schema.ScalarFieldH\x00\x12\x33\n\x07vectors\x18\x04 \x01(\x0b\x32 .milvus.proto.schema.VectorFieldH\x00\x12\x10\n\x08\x66ield_id\x18\x05 \x01(\x03\x42\x07\n\x05\x66ield\"w\n\x03IDs\x12\x30\n\x06int_id\x18\x01 \x01(\x0b\x32\x1e.milvus.proto.schema.LongArrayH\x00\x12\x32\n\x06str_id\x18\x02 \x01(\x0b\x32 .milvus.proto.schema.StringArrayH\x00\x42\n\n\x08id_field\"\xb1\x01\n\x10SearchResultData\x12\x13\n\x0bnum_queries\x18\x01 \x01(\x03\x12\r\n\x05top_k\x18\x02 \x01(\x03\x12\x33\n\x0b\x66ields_data\x18\x03 \x03(\x0b\x32\x1e.milvus.proto.schema.FieldData\x12\x0e\n\x06scores\x18\x04 \x03(\x02\x12%\n\x03ids\x18\x05 \x01(\x0b\x32\x18.milvus.proto.schema.IDs\x12\r\n\x05topks\x18\x06 \x03(\x03*\x9c\x01\n\x08\x44\x61taType\x12\x08\n\x04None\x10\x00\x12\x08\n\x04\x42ool\x10\x01\x12\x08\n\x04Int8\x10\x02\x12\t\n\x05Int16\x10\x03\x12\t\n\x05Int32\x10\x04\x12\t\n\x05Int64\x10\x05\x12\t\n\x05\x46loat\x10\n\x12\n\n\x06\x44ouble\x10\x0b\x12\n\n\x06String\x10\x14\x12\x0b\n\x07VarChar\x10\x15\x12\x10\n\x0c\x42inaryVector\x10\x64\x12\x0f\n\x0b\x46loatVector\x10\x65\x42W\n\x0eio.milvus.grpcB\x0bSchemaProtoP\x01Z3github.com/milvus-io/milvus/internal/proto/schemapb\xa0\x01\x01\x62\x06proto3') +_DATATYPE = DESCRIPTOR.enum_types_by_name['DataType'] DataType = enum_type_wrapper.EnumTypeWrapper(_DATATYPE) globals()['None'] = 0 Bool = 1 @@ -115,745 +34,20 @@ FloatVector = 101 - -_FIELDSCHEMA = _descriptor.Descriptor( - name='FieldSchema', - full_name='milvus.proto.schema.FieldSchema', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='fieldID', full_name='milvus.proto.schema.FieldSchema.fieldID', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='name', full_name='milvus.proto.schema.FieldSchema.name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='is_primary_key', full_name='milvus.proto.schema.FieldSchema.is_primary_key', index=2, - number=3, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='description', full_name='milvus.proto.schema.FieldSchema.description', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='data_type', full_name='milvus.proto.schema.FieldSchema.data_type', index=4, - number=5, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='type_params', full_name='milvus.proto.schema.FieldSchema.type_params', index=5, - number=6, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='index_params', full_name='milvus.proto.schema.FieldSchema.index_params', index=6, - number=7, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='autoID', full_name='milvus.proto.schema.FieldSchema.autoID', index=7, - number=8, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=52, - serialized_end=320, -) - - -_COLLECTIONSCHEMA = _descriptor.Descriptor( - name='CollectionSchema', - full_name='milvus.proto.schema.CollectionSchema', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='name', full_name='milvus.proto.schema.CollectionSchema.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='description', full_name='milvus.proto.schema.CollectionSchema.description', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='autoID', full_name='milvus.proto.schema.CollectionSchema.autoID', index=2, - number=3, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='fields', full_name='milvus.proto.schema.CollectionSchema.fields', index=3, - number=4, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=322, - serialized_end=441, -) - - -_BOOLARRAY = _descriptor.Descriptor( - name='BoolArray', - full_name='milvus.proto.schema.BoolArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='data', full_name='milvus.proto.schema.BoolArray.data', index=0, - number=1, type=8, cpp_type=7, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=443, - serialized_end=468, -) - - -_INTARRAY = _descriptor.Descriptor( - name='IntArray', - full_name='milvus.proto.schema.IntArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='data', full_name='milvus.proto.schema.IntArray.data', index=0, - number=1, type=5, cpp_type=1, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=470, - serialized_end=494, -) - - -_LONGARRAY = _descriptor.Descriptor( - name='LongArray', - full_name='milvus.proto.schema.LongArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='data', full_name='milvus.proto.schema.LongArray.data', index=0, - number=1, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=496, - serialized_end=521, -) - - -_FLOATARRAY = _descriptor.Descriptor( - name='FloatArray', - full_name='milvus.proto.schema.FloatArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='data', full_name='milvus.proto.schema.FloatArray.data', index=0, - number=1, type=2, cpp_type=6, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=523, - serialized_end=549, -) - - -_DOUBLEARRAY = _descriptor.Descriptor( - name='DoubleArray', - full_name='milvus.proto.schema.DoubleArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='data', full_name='milvus.proto.schema.DoubleArray.data', index=0, - number=1, type=1, cpp_type=5, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=551, - serialized_end=578, -) - - -_BYTESARRAY = _descriptor.Descriptor( - name='BytesArray', - full_name='milvus.proto.schema.BytesArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='data', full_name='milvus.proto.schema.BytesArray.data', index=0, - number=1, type=12, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=580, - serialized_end=606, -) - - -_STRINGARRAY = _descriptor.Descriptor( - name='StringArray', - full_name='milvus.proto.schema.StringArray', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='data', full_name='milvus.proto.schema.StringArray.data', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=608, - serialized_end=635, -) - - -_SCALARFIELD = _descriptor.Descriptor( - name='ScalarField', - full_name='milvus.proto.schema.ScalarField', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='bool_data', full_name='milvus.proto.schema.ScalarField.bool_data', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='int_data', full_name='milvus.proto.schema.ScalarField.int_data', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='long_data', full_name='milvus.proto.schema.ScalarField.long_data', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='float_data', full_name='milvus.proto.schema.ScalarField.float_data', index=3, - number=4, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='double_data', full_name='milvus.proto.schema.ScalarField.double_data', index=4, - number=5, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='string_data', full_name='milvus.proto.schema.ScalarField.string_data', index=5, - number=6, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='bytes_data', full_name='milvus.proto.schema.ScalarField.bytes_data', index=6, - number=7, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='data', full_name='milvus.proto.schema.ScalarField.data', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=638, - serialized_end=1040, -) - - -_VECTORFIELD = _descriptor.Descriptor( - name='VectorField', - full_name='milvus.proto.schema.VectorField', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='dim', full_name='milvus.proto.schema.VectorField.dim', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='float_vector', full_name='milvus.proto.schema.VectorField.float_vector', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='binary_vector', full_name='milvus.proto.schema.VectorField.binary_vector', index=2, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='data', full_name='milvus.proto.schema.VectorField.data', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=1042, - serialized_end=1158, -) - - -_FIELDDATA = _descriptor.Descriptor( - name='FieldData', - full_name='milvus.proto.schema.FieldData', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='type', full_name='milvus.proto.schema.FieldData.type', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_name', full_name='milvus.proto.schema.FieldData.field_name', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='scalars', full_name='milvus.proto.schema.FieldData.scalars', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='vectors', full_name='milvus.proto.schema.FieldData.vectors', index=3, - number=4, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='field_id', full_name='milvus.proto.schema.FieldData.field_id', index=4, - number=5, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='field', full_name='milvus.proto.schema.FieldData.field', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=1161, - serialized_end=1370, -) - - -_IDS = _descriptor.Descriptor( - name='IDs', - full_name='milvus.proto.schema.IDs', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='int_id', full_name='milvus.proto.schema.IDs.int_id', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='str_id', full_name='milvus.proto.schema.IDs.str_id', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='id_field', full_name='milvus.proto.schema.IDs.id_field', - index=0, containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[]), - ], - serialized_start=1372, - serialized_end=1491, -) - - -_SEARCHRESULTDATA = _descriptor.Descriptor( - name='SearchResultData', - full_name='milvus.proto.schema.SearchResultData', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='num_queries', full_name='milvus.proto.schema.SearchResultData.num_queries', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='top_k', full_name='milvus.proto.schema.SearchResultData.top_k', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='fields_data', full_name='milvus.proto.schema.SearchResultData.fields_data', index=2, - number=3, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='scores', full_name='milvus.proto.schema.SearchResultData.scores', index=3, - number=4, type=2, cpp_type=6, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='ids', full_name='milvus.proto.schema.SearchResultData.ids', index=4, - number=5, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='topks', full_name='milvus.proto.schema.SearchResultData.topks', index=5, - number=6, type=3, cpp_type=2, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1494, - serialized_end=1671, -) - -_FIELDSCHEMA.fields_by_name['data_type'].enum_type = _DATATYPE -_FIELDSCHEMA.fields_by_name['type_params'].message_type = common__pb2._KEYVALUEPAIR -_FIELDSCHEMA.fields_by_name['index_params'].message_type = common__pb2._KEYVALUEPAIR -_COLLECTIONSCHEMA.fields_by_name['fields'].message_type = _FIELDSCHEMA -_SCALARFIELD.fields_by_name['bool_data'].message_type = _BOOLARRAY -_SCALARFIELD.fields_by_name['int_data'].message_type = _INTARRAY -_SCALARFIELD.fields_by_name['long_data'].message_type = _LONGARRAY -_SCALARFIELD.fields_by_name['float_data'].message_type = _FLOATARRAY -_SCALARFIELD.fields_by_name['double_data'].message_type = _DOUBLEARRAY -_SCALARFIELD.fields_by_name['string_data'].message_type = _STRINGARRAY -_SCALARFIELD.fields_by_name['bytes_data'].message_type = _BYTESARRAY -_SCALARFIELD.oneofs_by_name['data'].fields.append( - _SCALARFIELD.fields_by_name['bool_data']) -_SCALARFIELD.fields_by_name['bool_data'].containing_oneof = _SCALARFIELD.oneofs_by_name['data'] -_SCALARFIELD.oneofs_by_name['data'].fields.append( - _SCALARFIELD.fields_by_name['int_data']) -_SCALARFIELD.fields_by_name['int_data'].containing_oneof = _SCALARFIELD.oneofs_by_name['data'] -_SCALARFIELD.oneofs_by_name['data'].fields.append( - _SCALARFIELD.fields_by_name['long_data']) -_SCALARFIELD.fields_by_name['long_data'].containing_oneof = _SCALARFIELD.oneofs_by_name['data'] -_SCALARFIELD.oneofs_by_name['data'].fields.append( - _SCALARFIELD.fields_by_name['float_data']) -_SCALARFIELD.fields_by_name['float_data'].containing_oneof = _SCALARFIELD.oneofs_by_name['data'] -_SCALARFIELD.oneofs_by_name['data'].fields.append( - _SCALARFIELD.fields_by_name['double_data']) -_SCALARFIELD.fields_by_name['double_data'].containing_oneof = _SCALARFIELD.oneofs_by_name['data'] -_SCALARFIELD.oneofs_by_name['data'].fields.append( - _SCALARFIELD.fields_by_name['string_data']) -_SCALARFIELD.fields_by_name['string_data'].containing_oneof = _SCALARFIELD.oneofs_by_name['data'] -_SCALARFIELD.oneofs_by_name['data'].fields.append( - _SCALARFIELD.fields_by_name['bytes_data']) -_SCALARFIELD.fields_by_name['bytes_data'].containing_oneof = _SCALARFIELD.oneofs_by_name['data'] -_VECTORFIELD.fields_by_name['float_vector'].message_type = _FLOATARRAY -_VECTORFIELD.oneofs_by_name['data'].fields.append( - _VECTORFIELD.fields_by_name['float_vector']) -_VECTORFIELD.fields_by_name['float_vector'].containing_oneof = _VECTORFIELD.oneofs_by_name['data'] -_VECTORFIELD.oneofs_by_name['data'].fields.append( - _VECTORFIELD.fields_by_name['binary_vector']) -_VECTORFIELD.fields_by_name['binary_vector'].containing_oneof = _VECTORFIELD.oneofs_by_name['data'] -_FIELDDATA.fields_by_name['type'].enum_type = _DATATYPE -_FIELDDATA.fields_by_name['scalars'].message_type = _SCALARFIELD -_FIELDDATA.fields_by_name['vectors'].message_type = _VECTORFIELD -_FIELDDATA.oneofs_by_name['field'].fields.append( - _FIELDDATA.fields_by_name['scalars']) -_FIELDDATA.fields_by_name['scalars'].containing_oneof = _FIELDDATA.oneofs_by_name['field'] -_FIELDDATA.oneofs_by_name['field'].fields.append( - _FIELDDATA.fields_by_name['vectors']) -_FIELDDATA.fields_by_name['vectors'].containing_oneof = _FIELDDATA.oneofs_by_name['field'] -_IDS.fields_by_name['int_id'].message_type = _LONGARRAY -_IDS.fields_by_name['str_id'].message_type = _STRINGARRAY -_IDS.oneofs_by_name['id_field'].fields.append( - _IDS.fields_by_name['int_id']) -_IDS.fields_by_name['int_id'].containing_oneof = _IDS.oneofs_by_name['id_field'] -_IDS.oneofs_by_name['id_field'].fields.append( - _IDS.fields_by_name['str_id']) -_IDS.fields_by_name['str_id'].containing_oneof = _IDS.oneofs_by_name['id_field'] -_SEARCHRESULTDATA.fields_by_name['fields_data'].message_type = _FIELDDATA -_SEARCHRESULTDATA.fields_by_name['ids'].message_type = _IDS -DESCRIPTOR.message_types_by_name['FieldSchema'] = _FIELDSCHEMA -DESCRIPTOR.message_types_by_name['CollectionSchema'] = _COLLECTIONSCHEMA -DESCRIPTOR.message_types_by_name['BoolArray'] = _BOOLARRAY -DESCRIPTOR.message_types_by_name['IntArray'] = _INTARRAY -DESCRIPTOR.message_types_by_name['LongArray'] = _LONGARRAY -DESCRIPTOR.message_types_by_name['FloatArray'] = _FLOATARRAY -DESCRIPTOR.message_types_by_name['DoubleArray'] = _DOUBLEARRAY -DESCRIPTOR.message_types_by_name['BytesArray'] = _BYTESARRAY -DESCRIPTOR.message_types_by_name['StringArray'] = _STRINGARRAY -DESCRIPTOR.message_types_by_name['ScalarField'] = _SCALARFIELD -DESCRIPTOR.message_types_by_name['VectorField'] = _VECTORFIELD -DESCRIPTOR.message_types_by_name['FieldData'] = _FIELDDATA -DESCRIPTOR.message_types_by_name['IDs'] = _IDS -DESCRIPTOR.message_types_by_name['SearchResultData'] = _SEARCHRESULTDATA -DESCRIPTOR.enum_types_by_name['DataType'] = _DATATYPE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - +_FIELDSCHEMA = DESCRIPTOR.message_types_by_name['FieldSchema'] +_COLLECTIONSCHEMA = DESCRIPTOR.message_types_by_name['CollectionSchema'] +_BOOLARRAY = DESCRIPTOR.message_types_by_name['BoolArray'] +_INTARRAY = DESCRIPTOR.message_types_by_name['IntArray'] +_LONGARRAY = DESCRIPTOR.message_types_by_name['LongArray'] +_FLOATARRAY = DESCRIPTOR.message_types_by_name['FloatArray'] +_DOUBLEARRAY = DESCRIPTOR.message_types_by_name['DoubleArray'] +_BYTESARRAY = DESCRIPTOR.message_types_by_name['BytesArray'] +_STRINGARRAY = DESCRIPTOR.message_types_by_name['StringArray'] +_SCALARFIELD = DESCRIPTOR.message_types_by_name['ScalarField'] +_VECTORFIELD = DESCRIPTOR.message_types_by_name['VectorField'] +_FIELDDATA = DESCRIPTOR.message_types_by_name['FieldData'] +_IDS = DESCRIPTOR.message_types_by_name['IDs'] +_SEARCHRESULTDATA = DESCRIPTOR.message_types_by_name['SearchResultData'] FieldSchema = _reflection.GeneratedProtocolMessageType('FieldSchema', (_message.Message,), { 'DESCRIPTOR' : _FIELDSCHEMA, '__module__' : 'schema_pb2' @@ -952,6 +146,38 @@ }) _sym_db.RegisterMessage(SearchResultData) - -DESCRIPTOR._options = None +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\016io.milvus.grpcB\013SchemaProtoP\001Z3github.com/milvus-io/milvus/internal/proto/schemapb\240\001\001' + _DATATYPE._serialized_start=1674 + _DATATYPE._serialized_end=1830 + _FIELDSCHEMA._serialized_start=52 + _FIELDSCHEMA._serialized_end=320 + _COLLECTIONSCHEMA._serialized_start=322 + _COLLECTIONSCHEMA._serialized_end=441 + _BOOLARRAY._serialized_start=443 + _BOOLARRAY._serialized_end=468 + _INTARRAY._serialized_start=470 + _INTARRAY._serialized_end=494 + _LONGARRAY._serialized_start=496 + _LONGARRAY._serialized_end=521 + _FLOATARRAY._serialized_start=523 + _FLOATARRAY._serialized_end=549 + _DOUBLEARRAY._serialized_start=551 + _DOUBLEARRAY._serialized_end=578 + _BYTESARRAY._serialized_start=580 + _BYTESARRAY._serialized_end=606 + _STRINGARRAY._serialized_start=608 + _STRINGARRAY._serialized_end=635 + _SCALARFIELD._serialized_start=638 + _SCALARFIELD._serialized_end=1040 + _VECTORFIELD._serialized_start=1042 + _VECTORFIELD._serialized_end=1158 + _FIELDDATA._serialized_start=1161 + _FIELDDATA._serialized_end=1370 + _IDS._serialized_start=1372 + _IDS._serialized_end=1491 + _SEARCHRESULTDATA._serialized_start=1494 + _SEARCHRESULTDATA._serialized_end=1671 # @@protoc_insertion_point(module_scope) diff --git a/requirements.txt b/requirements.txt index a178d1226..7568ffdd6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,11 +4,11 @@ chardet==4.0.0 grpcio==1.47.0 grpcio-testing==1.47.0 grpcio-tools==1.47.0 +protobuf>=3.17.1 idna==2.10 mmh3>=2.0,<=3.0.0 packaging==20.9 pep517==0.10.0 -protobuf==3.17.1 pyparsing==2.4.7 six==1.16.0 toml==0.10.2 diff --git a/setup.py b/setup.py index f1541cbe5..f20f7a616 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,7 @@ include_package_data=True, install_requires=[ "grpcio>=1.47.0", + "grpcio-tools>=1.47.0", "ujson>=2.0.0,<=5.4.0", "mmh3>=2.0,<=3.0.0", "pandas==1.1.5; python_version<'3.7'",
Fix typo `Unavaliable` Signed-off-by: zhuwenxing <[email protected]> resolves: https://github.com/milvus-io/pymilvus/issues/1074 Upgrade protoc generated files Fixes: #1076, #1077 Signed-off-by: XuanYang-cn <[email protected]>
@zhuwenxing Great Catch! /lgtm /approve [APPROVALNOTIFIER] This PR is **APPROVED** This pull-request has been approved by: *<a href="https://github.com/milvus-io/pymilvus/pull/1075#issuecomment-1198819707" title="Approved">XuanYang-cn</a>*, *<a href="https://github.com/milvus-io/pymilvus/pull/1075#" title="Author self-approved">zhuwenxing</a>* The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=milvus-io%2Fpymilvus). The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process) <details > Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/milvus-io/pymilvus/blob/master/OWNERS)~~ [XuanYang-cn] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment </details> <!-- META={"approvers":[]} -->
2022-07-29T06:54:31
0.0
[]
[]
google/glome
google__glome-171
6202d0adaa39103de41770aebcf40b0944ee74be
diff --git a/docs/glome-login.md b/docs/glome-login.md index fc6ad21..6230a31 100644 --- a/docs/glome-login.md +++ b/docs/glome-login.md @@ -17,6 +17,9 @@ If the authorization code matches the one calculated internally by `glome-login`, the user is authorized and glome-login executes the requested action - e.g. providing the login shell or rebooting the machine. +This document describes version 2 of GLOME Login, see also +[RFD001](rfd/001.md) for a rationale of the protocol elements. + ## Implementation The current version of the GLOME login protocol uses the @@ -24,54 +27,40 @@ The current version of the GLOME login protocol uses the Counters are set to constant `0` since only a single set of messages is exchanged. -* GLOME handshake information and tags are encoded as Base64-encoded URLs or - "base64url" - [[RFC4648 section 5](https://tools.ietf.org/html/rfc4648#section-5)]. -* Initial message from the GLOME login client to the server contains the - context required for authorization (i.e. host identity, requested action). -* The authorization context is sent in clear for easier debuggability and - reducing the likelihood of human errors (e.g. incomplete URL copy and - paste). -* Server's public key can be identified by: - * 7-bit service key identifier and message tag prefix (of any - length, including 0). - * 7-bit service key prefix and message tag prefix (of any length, - including 0), -* Using a message tag prefix provides an additional protection against channel - errors (e.g. caused by operator errors). -* The message sent from the GLOME login client to the server contains the context required for authorization (i.e. host identity, requested action). -* In this protocol the client and the server sign identical messages. - the client to the server, and therefore is omitted. +The protocol assumes that the client (i.e., the machine being accessed), +knows the public key of the server. Required elements of the protocol are: + +* A host identifier that uniquely identifies the client. +* An action on the client that needs to be authorized by the server. + +These optional elements can provide additional information to the server: + +* A host identifier type, among which the host identifier is unique. +* A server key index, to tell the server which private key to use. +* A message tag prefix, to allow error detection on the server side. + +The client combines these elements into a challenge string, which the server +validates and responds to with a GLOME tag. GLOME Login challenges are suitable +for embedding into a URL. ### Challenge request format The GLOME login client generates the challenge in the form: -``` -v<V>/<glome-handshake>[/<message>]/ +```abnf +challenge = "v2/" handshake-segment "/" message "/" -glome-handshake := base64url( - <prefix-type> - <prefix7> - <eph-key> - [<prefixN>] - ) +handshake-segment = Base64_urlsafe( prefix client-public-key [message-tag-prefix] ) -message := [<hostid-type>:]<hostid>[/<action>] +message = host-segment "/" action-segment +host-segment = EscapePathSegment( [hostid-type ":"] hostid ) +action-segment = EscapePathSegment(action) ``` -where <fields> have the following meanings: +The individual elements of this specification and the encoding functions are +described in the subsections below. -| Field | Length | Description | -| :-------------- | ----------: | :----------------------------------------------- | -| V | 1 byte | Challenge format version. Currently always 1. | -| prefix-type | 1 bits | Determines the meaning of (prefix7; prefixN) fields: <br><ul><li>0: (service key indicator; message tag prefix)</li><li>1: reserved</li></ul>Service key indicator is either index, or if no index found will be matched<br>with the public key (to be administrator configurable) | -| prefix7 | 7 bits | Purpose determined by prefix-type. | -| eph-key | 32 bytes | Client's public key (ephemeral). | -| prefixN | 0..32 bytes | Purpose determined by prefix-type, right now message tag prefix. | -| hostid-type | 0..n bytes | Type of identity; `hostname` if not set | -| hostid | 1..n bytes | Identity of the target (e.g. hostname, serial number, etc.) | -| action | 0..n bytes | Action that is being authorized (e.g. reboot, shell).<br>Both parties should agree what the default action is if not set. | +#### Challenge Transport Considerations The client should then output the resulting challenge prefixed by the configured prompt. In practice, that configurable prefix can be used to present @@ -83,53 +72,62 @@ server to detect truncated requests and reject those early. Without the trailing slash requirement the request will still likely look correct but may result in an invalid request being signed causing confusion for the operator. +#### Host ID + +The client identifies itself as a named host, using the `hostid` field. This ID +often is a fully qualified domain name, so adhering to domain name restrictions +when choosing host ids is a good idea. However, these restrictions are not +enforced by this protocol, but the host id should not need to be encoded for +inclusion as a URL path segment, and it should not include a `:` character, as +that is used to separate type and id. + +Providing a host id type is optional, but can help with the interpretation of +the host id itself. It is subject to the same encoding considerations as the id +itself. If no host id type is provided, host ids should be interpreted as host +names. + #### Action The `<action>` field represents the action being authorized and should not be ambiguous in a way that affects security. The format of the action is left up to the implementer to decide but it has to take into account these points: - * The `<action>` needs to be suitable for embedding in a URL. + * The `<action>` should be suitable for embedding in a URL path element + (see also the section on encodings below). * The `<action>` should be human readable and easy to understand both as part of the URL and stand alone. Good examples: - * `shell/root` starts a shell as the given user, root in this case. + * `shell=root` starts a shell as the given user, root in this case. * `reboot` reboots the target. - * `show-logs/httpd` outputs debug logs for the HTTPD application. + * `show-logs=httpd` outputs debug logs for the `httpd` application. Bad examples: * `exec` executes a command. * This is bad because it does not specify which command is being executed. - * `exec/cm0gLWZyIC8=` executes a given command (Base64 encoded). + * `exec=cm0gLWZyIC8=` executes a given command (Base64 encoded). * This is not human readable. * `shell` starts a shell as an user-provided but undisclosed user. * This is bad if there exists ambiguity on which user the shell will launch as. E.g. if the system is hard-coded to only allow login as root, this example is OK - otherwise not. + * `shell/root` + * This used to be the recommended format in v1, but it creates ambiguity + between the host part and the action part and will thus be + percent-encoded, which harms legibility. -#### Challenge construction +#### Handshake -Care must be taken to ensure that the challenge outputted by the GLOME login -client is suitable to be embedded in an URL. +The prefix is one byte, of which the most significant bit disambiguates the use +of the low 7 bit. If the MSB is set, the low bits are interpreted as a 7 bit +integer, which the server should interpret as the index of the key its supposed +to use. If the MSB is not set, the entire byte represents the most significant +byte of the public key that the server is supposed to use. -A GLOME login client should make sure to format the challenge as per [[RFC 3986 -Section 2.4](https://tools.ietf.org/html/rfc3986#section-2.4)]. The intent -should be to maximize the human readability of the URL. - -**Example:** If the challenge prefix is set to `https://glome.example.com/` and -the challenge is `v1/ABCD…/serial:ab@!c/action/` the resulting challenge should -be presented as `https://glome.example.com/v1/ABCD…/serial:ab@!c/action/`. -The important lesson from this example is that `serial:ab@!c` is **not** encoded -using percent encoding as there is no reason to and would sacrifice human -readability needlessly. - -Finally it is recommended to verify that commonly used terminal emulators -correctly identify the whole URL when outputted. - -#### Message tag prefix +The public key corresponding to the client's ephemeral key for this challenge +is appended as raw 32 bytes, in the encoding specified in RFC 7748. The message tag prefix is calculated by the client as the MAC tag over the `<message>` field. The client can choose to include as much of the tag as it @@ -144,6 +142,22 @@ the server enforces its inclusion. However, the message tag prefix is still useful to detect accidental message corruption. It can also be used to resolve ambiguity in which service key was used by the client. +For an efficient base64-encoding, the raw message tag prefix should have a +length divisible by 3. + +#### Encodings + +In order to safely embed the handshake and message in a URL, the individual +protocol elements need to be encoded. + +The handshake is encoded using URL-safe Base64, as specified in +<https://www.rfc-editor.org/rfc/rfc4648#section-5>. + +The message consists of two path elements, which are encoded individually, +using the percent-encoding scheme specified in +<https://url.spec.whatwg.org/#percent-encoded-bytes>, and then joined by a `/` +character. + ### Response format The response is a Base64 URL-safe (base64url) MAC tag computed over the @@ -154,74 +168,10 @@ slowed down by introducing an artificial delay before comparing the tags. ### Test vectors -These are some example test cases that can be used to verify an implementation -of the GLOME login protocol. Octet strings (keys and tags) are represented in -hexadecimal encoding, message counters in their decimal represenation and -messages and strings in ASCII encoding. - -[Ka]: https://render.githubusercontent.com/render/math?math=K_a -[Ka']: https://render.githubusercontent.com/render/math?math=K_a^%27 -[Kb]: https://render.githubusercontent.com/render/math?math=K_b -[Kb']: https://render.githubusercontent.com/render/math?math=K_b^%27 -[Ks]: https://render.githubusercontent.com/render/math?math=K_s -[Mn]: https://render.githubusercontent.com/render/math?math=M_n -[T]: https://render.githubusercontent.com/render/math?math=T - -For in-depth definition of the GLOME variables, see the [protocol](protocol.md) -specification. In summary note that -![K_x'](https://render.githubusercontent.com/render/math?math=K_x^%27) is the -private key and -![K_x](https://render.githubusercontent.com/render/math?math=K_x) is the -associated public key. - -#### Vector 1 - -Login request using service key index 1, message tag prefix length of 16 bits, -and response tag length of 60 bits. - -| Variable | Value | -|-----------------------:|:-------------------------------------------------------------------| -| ![K_a'][Ka'] | `77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a` | -| ![K_b'][Kb'] | `5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb` | -| `prefix-type` | `0` | -| `prefix7` | `1` | -| `eph-key` (![K_a][Ka]) | `8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a` | -| `hostid-type` | Omitted | -| `hostid` | `my-server.local` | -| `action` | `shell/root` | -| | | -| ![K_b][Kb] | `de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f` | -| ![K_s][Ks] | `4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742` | -| ![M_n][Mn] | `my-server.local/shell/root` | -| `prefixN` | `d0f59d0b17cb155a1b9cd2b5cdea3a17f37a200e95e3651af2c88e1c5fc8108e` | -| ![T][T] | `9721ee687b827249dbe6c244ba459216cf01d525012163025df358eb87c89059` | -| | | -| Challenge | `v1/AYUg8AmJMKdUdIt93LQ-91oNvzoNJjga9OukqY6qm05q0PU=/my-server.local/shell/root/` | -| Response token | `lyHuaHuCck` | - -#### Vector 2 - -Login request using service key prefix, no message tag prefix, and full response tag. - -| Variable | Value | -|-----------------------:|:-------------------------------------------------------------------| -| ![K_a'][Ka'] | `fee1deadfee1deadfee1deadfee1deadfee1deadfee1deadfee1deadfee1dead` | -| ![K_b'][Kb'] | `b105f00db105f00db105f00db105f00db105f00db105f00db105f00db105f00d` | -| `prefix-type` | `0` | -| `prefix7` | `0x51` | -| `eph-key` (![K_a][Ka]) | `872f435bb8b89d0e3ad62aa2e511074ee195e1c39ef6a88001418be656e3c376` | -| `hostid-type` | `serial-number` | -| `hostid` | `1234567890=ABCDFGH/#?` | -| `action` | `reboot` | -| | | -| ![K_b][Kb] | `d1b6941bba120bcd131f335da15778d9c68dadd398ae61cf8e7d94484ee65647` | -| ![K_s][Ks] | `4b1ee05fcd2ae53ebe4c9ec94915cb057109389a2aa415f26986bddebf379d67` | -| ![M_n][Mn] | `serial-number:1234567890=ABCDFGH/#?/reboot` | -| `prefixN` | `dff5aae753a8bdce06038a20adcdb26c7be19cb6bd05a7850fae542f4af29720` | -| ![T][T] | `a7c33f0542a3ef35c154cd8995084d605c6ce09f83cf1440a6cf3765a343aae6` | -| | | -| Challenge | `v1/UYcvQ1u4uJ0OOtYqouURB07hleHDnvaogAFBi-ZW48N2/serial-number:1234567890=ABCDFGH%2F%23%3F/reboot/` | -| Response token | `p8M_BUKj7zXBVM2JlQhNYFxs4J-DzxRAps83ZaNDquY=` | +Test vectors that conform to this specification are defined in +[login-v2-test-vectors.yaml](login-v2-test-vectors.yaml). They describe two +parties, Alice and Bob, who run through a GLOME Login challenge-response +workflow. In these scenarios, Alice is always the client and Bob the server. ## Alternatives
Document the new protocol. Fold the changes from the RfD into the protocol documentation.
2023-10-05T17:33:19
0.0
[]
[]
google/glome
google__glome-135
467d64ae003005324756d6501a4d74cc7e8c593c
diff --git a/cli/README.md b/cli/README.md index ae10f6f1..ecc826df 100644 --- a/cli/README.md +++ b/cli/README.md @@ -7,35 +7,23 @@ This is a CLI utility to facilitate GLOME operations from the command line. Generating two key pairs: ```shell -$ glome Alice >Alice.pub -$ glome Bob >Bob.pub +$ glome genkey | tee Alice | glome pubkey >Alice.pub +$ glome genkey | tee Bob | glome pubkey >Bob.pub ``` Alice calculates a tag and send it together with message and counter to Bob: ```shell -$ tag=$(glome Alice Bob.pub "Hello world!" 0) -peer-key: 0xbe106dba769f75f215f29b3b5e5e84c792a9d5562a26c9f7e19915c73bb45413 -public-key: 0xe2e97a41a60fd6a3c5de511862671f97e9f8e0d657044cac783e5119eeecae06 -message: 'Hello world!' -counter: 0 -verify: 0 +$ tag=$(echo "Hello world!" | glome tag --key Alice --peer Bob.pub) $ echo "${tag?}" -2b4dc85086e41a5c616301d904ac2dd942f2d71a56985a5be252b5bbca30bdfa +_QuyLz_nkj5exUJscocS8LDnCMszvSmp9wpQuRshi30= ``` Bob can verify that the tag matches: ```shell -$ glome Bob Alice.pub "Hello world!" 0 "${tag?}" -peer-key: 0xe2e97a41a60fd6a3c5de511862671f97e9f8e0d657044cac783e5119eeecae06 -public-key: 0xbe106dba769f75f215f29b3b5e5e84c792a9d5562a26c9f7e19915c73bb45413 -message: 'Hello world!' -counter: 0 -verify: 1 -mac-tag: 0x2b4dc85086e41a5c616301d904ac2dd942f2d71a56985a5be252b5bbca30bdfa -unverified: 0x2b4dc85086e41a5c616301d904ac2dd942f2d71a56985a5be252b5bbca30bdfa +$ echo "Hello world!" | glome verify --key Bob --peer Alice.pub --tag "${tag?}" $ echo $? 0 @@ -44,15 +32,15 @@ $ echo $? Both parties can agree to shorten the tag to reduce the protocol overhead: ```shell -$ glome Bob Alice.pub "Hello world!" 0 "${tag:0:12}" -peer-key: 0xe2e97a41a60fd6a3c5de511862671f97e9f8e0d657044cac783e5119eeecae06 -public-key: 0xbe106dba769f75f215f29b3b5e5e84c792a9d5562a26c9f7e19915c73bb45413 -message: 'Hello world!' -counter: 0 -verify: 1 -mac-tag: 0x2b4dc85086e41a5c616301d904ac2dd942f2d71a56985a5be252b5bbca30bdfa -unverified: 0x2b4dc85086e41a5c616301d90 +$ echo "Hello world!" | glome verify --key Bob --peer Alice.pub --tag "${tag:0:12}" $ echo $? 0 ``` + +CLI also supports ganerating tags for the GLOME Login requests: + +```shell +$ glome login --key Bob https://glome.example.com/v1/AYUg8AmJMKdUdIt93LQ-91oNvzoNJjga9OukqY6qm05q0PU=/my-server.local/shell/root/ +MT_Zc-hucXRjTXTBEo53ehoeUsFn1oFyVadViXf-I4k= +``` diff --git a/cli/commands.c b/cli/commands.c index dcd293e7..fa35ab16 100644 --- a/cli/commands.c +++ b/cli/commands.c @@ -37,18 +37,20 @@ // Arguments static const char *key_file = NULL; static const char *peer_file = NULL; -static const char *tag_hex = NULL; +static const char *tag_b64 = NULL; static unsigned long counter = 0; static bool parse_args(int argc, char **argv) { + int c; struct option long_options[] = {{"key", required_argument, 0, 'k'}, {"peer", required_argument, 0, 'p'}, {"counter", required_argument, 0, 'c'}, {"tag", required_argument, 0, 't'}, {0, 0, 0, 0}}; - int c; - while ((c = getopt_long(argc, argv, "c:k:p:t:", long_options, NULL)) != -1) { + // First argument is the command name so skip it. + while ((c = getopt_long(argc - 1, argv + 1, "c:k:p:t:", long_options, + NULL)) != -1) { switch (c) { case 'c': { char *endptr; @@ -66,7 +68,7 @@ static bool parse_args(int argc, char **argv) { peer_file = optarg; break; case 't': - tag_hex = optarg; + tag_b64 = optarg; break; case '?': return false; @@ -78,26 +80,6 @@ static bool parse_args(int argc, char **argv) { return true; } -static int decode_hex(uint8_t *dst, size_t dst_len, const char *in) { - size_t len = strlen(in); - if (len > 2 && in[0] == '0' && in[1] == 'x') { - len -= 2; - in += 2; - } - if (len > dst_len * 2 || len % 2 != 0) { - return -1; - } - size_t i; - for (i = 0; i < len / 2; i++) { - if (sscanf(in + (i * 2), "%02hhX", dst + i) != 1) { - fprintf(stderr, "ERROR while parsing byte %zu ('%c%c') as hex\n", i, - in[2 * i], in[2 * i + 1]); - return -3; - } - } - return i; -} - static bool read_file(const char *fname, uint8_t *buf, const size_t num_bytes) { FILE *f = fopen(fname, "r"); if (!f) { @@ -118,17 +100,6 @@ static bool read_file(const char *fname, uint8_t *buf, const size_t num_bytes) { return true; } -static void print_hex(FILE *stream, const char *prefix, uint8_t *buf, - size_t len) { - if (prefix != NULL) { - fputs(prefix, stream); - } - for (size_t i = 0; i < len; i++) { - fprintf(stream, "%02x", buf[i]); - } - fputs("\n", stream); -} - int genkey(int argc, char **argv) { UNUSED(argc); UNUSED(argv); @@ -190,7 +161,7 @@ int tag_impl(uint8_t tag[GLOME_MAX_TAG_LENGTH], bool verify, } if (glome_tag(verify, counter, private_key, peer_key, (uint8_t *)message, msg_len, tag)) { - fputs("MAC tag generation failed", stderr); + fputs("MAC tag generation failed\n", stderr); return EXIT_FAILURE; } return EXIT_SUCCESS; @@ -209,33 +180,61 @@ int tag(int argc, char **argv) { if (res) { return res; } - print_hex(stdout, "", tag, sizeof tag); + char tag_encoded[ENCODED_BUFSIZE(sizeof tag)] = {0}; + if (base64url_encode(tag, sizeof tag, (uint8_t *)tag_encoded, + sizeof tag_encoded) == 0) { + fprintf(stderr, "GLOME tag encode failed\n"); + return EXIT_FAILURE; + } + puts(tag_encoded); return EXIT_SUCCESS; } int verify(int argc, char **argv) { uint8_t tag[GLOME_MAX_TAG_LENGTH] = {0}; - uint8_t expected_tag[GLOME_MAX_TAG_LENGTH] = {0}; - size_t expected_tag_len = 0; + uint8_t *expected_tag = NULL; + int ret = EXIT_FAILURE; if (!parse_args(argc, argv)) { - return EXIT_FAILURE; + goto out; } - if (!key_file || !peer_file || !tag_hex) { + if (!key_file || !peer_file || !tag_b64) { fprintf(stderr, "not enough arguments for subcommand %s\n", argv[1]); - return EXIT_FAILURE; + goto out; } int res = tag_impl(tag, /*verify=*/true, key_file, peer_file); if (res) { - return res; + goto out; + } + + // decode the tag + size_t tag_b64_len = strlen(tag_b64); + size_t tag_b64_decoded_len = DECODED_BUFSIZE(tag_b64_len); + expected_tag = malloc(tag_b64_decoded_len); + if (expected_tag == NULL) { + fprintf(stderr, "GLOME tag malloc %ld bytes failed\n", tag_b64_decoded_len); + goto out; + } + size_t expected_tag_len = + base64url_decode((uint8_t *)tag_b64, tag_b64_len, (uint8_t *)expected_tag, + tag_b64_decoded_len); + if (expected_tag_len == 0) { + fprintf(stderr, "GLOME tag decode failed\n"); + goto out; + } + if (expected_tag_len > sizeof tag) { + expected_tag_len = sizeof tag; } // compare the tag - expected_tag_len = decode_hex(expected_tag, sizeof expected_tag, tag_hex); if (CRYPTO_memcmp(expected_tag, tag, expected_tag_len) != 0) { - fputs("MAC tag verification failed", stderr); - return EXIT_FAILURE; + fputs("MAC tag verification failed\n", stderr); + goto out; } - return EXIT_SUCCESS; + ret = EXIT_SUCCESS; + +out: + free(expected_tag); + return ret; } static bool parse_login_path(char *path, char **handshake, char **host, @@ -383,6 +382,11 @@ int login(int argc, char **argv) { size_t handshake_b64_len = strlen(handshake_b64); handshake = malloc(DECODED_BUFSIZE(handshake_b64_len)); + if (handshake == NULL) { + fprintf(stderr, "failed to malloc %ld bytes for base64 decode\n", + DECODED_BUFSIZE(handshake_b64_len)); + goto out; + } int handshake_len = base64url_decode((uint8_t *)handshake_b64, handshake_b64_len, (uint8_t *)handshake, DECODED_BUFSIZE(handshake_b64_len));
CLI should handle tags as base64 instead of hex It's slightly confusing that the CLI prints and verifies tags in hex format, while the tag is exchanged base64-encoded in the login protocol. base64 has arguably better utility support and would allow using the cli as client without re-encoding, so I propose changing the output of `glome tag` to base64.
2022-10-09T11:02:03
0.0
[]
[]
google/glome
google__glome-130
4a97a51611e24e40a9f7fd6a309d026d97e4d08c
diff --git a/login/README.md b/login/README.md index 6543b3ac..e6314f7c 100644 --- a/login/README.md +++ b/login/README.md @@ -77,16 +77,16 @@ PAM module supports the following options: * `config_path=PATH` - location of the configuration file to parse (defaults to `/etc/glome/config`) -* `service_key=KEY` - use hex-encoded `KEY` as the service key (defaults to key +* `key=KEY` - use hex-encoded `KEY` as the service key (defaults to key from configuration file) -* `service_key_version=N` - use `N` for the service key version (defaults to key +* `key_version=N` - use `N` for the service key version (defaults to key version from configuration file) * `url_prefix=URL` - use given URL prefix (defaults to prefix from configuration file) * `debug` - enable verbose logging -* `insecure_debug` - enable logging of secrets (INSECURE!) -* `insecure_host_id=NAME` - use `NAME` as the host-id -* `insecure_secret_key=KEY` - use hex-encoded `KEY` instead of the ephemeral +* `print_secrets` - enable logging of secrets (INSECURE!) +* `host_id=NAME` - use `NAME` as the host-id +* `ephemeral_key=KEY` - use hex-encoded `KEY` instead of the ephemeral secret key (INSECURE!) ## Troubleshooting diff --git a/login/pam.c b/login/pam.c index 88e51809..6acf01f3 100644 --- a/login/pam.c +++ b/login/pam.c @@ -33,11 +33,21 @@ #define UNUSED(var) (void)(var) -static const char *arg_value(const char *arg, const char *key) { - int key_len = strlen(key); - if (strncmp(arg, key, key_len) == 0 && arg[key_len] == '=') { +static const char *arg_value(const char *arg, const char *key, + const char *default_value) { + int i, key_len = strlen(key); + for (i = 0; i < key_len; i++) { + // Compare key with arg char by char while also allowing _ in place of - + if (!(key[i] == arg[i] || (key[i] == '-' && arg[i] == '_'))) { + return NULL; + } + } + if (arg[key_len] == '=') { return arg + key_len + 1; } + if (arg[key_len] == '\0') { + return default_value; + } return NULL; } @@ -49,27 +59,27 @@ static int parse_pam_args(pam_handle_t *pamh, int argc, const char **argv, const char *val; for (int i = 0; i < argc; ++i) { - if ((val = arg_value(argv[i], "config_path"))) { + if ((val = arg_value(argv[i], "config-path", NULL))) { status = glome_login_assign_config_option(config, "default", "config-path", val); - } else if ((val = arg_value(argv[i], "service_key"))) { + } else if ((val = arg_value(argv[i], "key", NULL))) { status = glome_login_assign_config_option(config, "service", "key", val); - } else if ((val = arg_value(argv[i], "service_key_version"))) { + } else if ((val = arg_value(argv[i], "key-version", NULL))) { status = glome_login_assign_config_option(config, "service", "key-version", val); - } else if ((val = arg_value(argv[i], "url_prefix"))) { + } else if ((val = arg_value(argv[i], "url-prefix", NULL))) { status = glome_login_assign_config_option(config, "service", "url-prefix", val); - } else if (!strcmp(argv[i], "debug")) { - status = glome_login_assign_config_option(config, "default", "verbose", - "true"); - } else if (!strcmp(argv[i], "insecure_debug")) { + } else if ((val = arg_value(argv[i], "debug", "true"))) { + status = + glome_login_assign_config_option(config, "default", "verbose", val); + } else if ((val = arg_value(argv[i], "print-secrets", "true"))) { status = glome_login_assign_config_option(config, "default", - "print-secrets", "true"); - } else if ((val = arg_value(argv[i], "insecure_host_id"))) { + "print-secrets", val); + } else if ((val = arg_value(argv[i], "host-id", NULL))) { status = glome_login_assign_config_option(config, "default", "host-id", val); - } else if ((val = arg_value(argv[i], "insecure_secret_key"))) { + } else if ((val = arg_value(argv[i], "ephemeral-key", NULL))) { status = glome_login_assign_config_option(config, "default", "ephemeral-key", val); } else {
PAM module arguments naming is inconsistent with the config It would be great if PAM module arguments naming was consistent with the config (and flags in the future once glome-login suports long flags). Examples of inconsistency: - `service_key` (PAM) vs `key` (config) - `service_key_version` (PAM) vs `key-version` (config) - `url_prefix` (PAM) vs `url-prefix` (config) Personally, I like the config naming better. It's shorter and uses dashes instead of underscores.
I think underscores are also more consistent with other PAM modules, so I'm fine with this. We do have a way to specify a config file as well, right?
2022-05-16T21:23:24
0.0
[]
[]
google/glome
google__glome-86
0e4f97a324bc59e678841922fbaf3006c775457c
diff --git a/README.md b/README.md index c2b04981..f1251eef 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ Building the GLOME library requires - Meson >=0.49.2 - OpenSSL headers >=1.1.1 - glib-2.0 (for glome-login as well as tests) - - libconfuse (for glome-login) - libpam (for PAM module) ### Instructions diff --git a/kokoro/alpine/fetch_dependencies.sh b/kokoro/alpine/fetch_dependencies.sh index 6bc81030..9ac650c4 100755 --- a/kokoro/alpine/fetch_dependencies.sh +++ b/kokoro/alpine/fetch_dependencies.sh @@ -3,4 +3,4 @@ set -e apk add --no-cache \ alpine-sdk meson \ - openssl-dev confuse-dev glib-dev linux-pam-dev + openssl-dev glib-dev linux-pam-dev diff --git a/kokoro/rodete/fetch_dependencies.sh b/kokoro/rodete/fetch_dependencies.sh index d7b397dd..2a30d69c 100755 --- a/kokoro/rodete/fetch_dependencies.sh +++ b/kokoro/rodete/fetch_dependencies.sh @@ -5,4 +5,4 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install -y \ build-essential meson pkg-config \ - libssl-dev libconfuse-dev libglib2.0-dev libpam0g-dev libpam-wrapper + libssl-dev libglib2.0-dev libpam0g-dev libpam-wrapper diff --git a/login/config.c b/login/config.c index 10286789..bca6d267 100644 --- a/login/config.c +++ b/login/config.c @@ -13,79 +13,55 @@ // limitations under the License. #include <alloca.h> -#include <confuse.h> +#include <glib.h> #include <string.h> #include "ui.h" -static void print_config_error(cfg_t* cfg, const char* fmt, va_list ap) { - char* format = alloca(7 + strlen(fmt) + 1); - strcpy(format, "ERROR: "); - strcat(format, fmt); - errorf(format, ap); -} - int parse_config_file(login_config_t* config) { - char* service_key = NULL; - long service_key_version = 0; - char* url_prefix = NULL; - // clang-format off - cfg_opt_t service_opts[] = { - CFG_SIMPLE_STR("key", &service_key), // Hex-encoded service key - CFG_SIMPLE_INT("key-version", &service_key_version), // Key version - CFG_SIMPLE_STR("url-prefix", &url_prefix), // HTTP URL prefix of web service - CFG_END() - }; - cfg_opt_t opts[] = { - CFG_SEC("service", service_opts, CFGF_NONE), - CFG_END() - }; - // clang-format on - cfg_t* cfg = cfg_init(opts, CFGF_NONE); - cfg_set_error_function(cfg, print_config_error); + g_autofree gchar* service_key = NULL; + guint64 service_key_version = 0; + g_autofree gchar* url_prefix = NULL; + g_autoptr(GKeyFile) cfg = g_key_file_new(); + g_autoptr(GError) error = NULL; - int required = config->config_path != NULL; + bool required = config->config_path != NULL; if (!required) { config->config_path = DEFAULT_CONFIG_FILE; } - int r = cfg_parse(cfg, config->config_path); - if (required && r == CFG_FILE_ERROR) { - perror("ERROR: config file could not be read"); - cfg_free(cfg); + gboolean loaded = g_key_file_load_from_file(cfg, config->config_path, + G_KEY_FILE_NONE, &error); + if (required && !loaded) { + errorf("ERROR: config file could not be read: %s\n", error->message); return -1; - } else if (r == CFG_PARSE_ERROR) { - // print_config_error will have been invoked by cfg_parse to print the - // error encountered. - cfg_free(cfg); - return -2; } - cfg_t* cfg_service = cfg_getsec(cfg, "service"); - if (cfg_service != NULL) { - if (service_key != NULL && - is_zeroed(config->service_key, sizeof config->service_key)) { - if (decode_hex(config->service_key, sizeof config->service_key, - service_key)) { - errorf("ERROR: Failed to hex decode service key\n"); - cfg_free(cfg); - return -3; - } - } - if (service_key_version > 255) { - errorf("ERROR: Key version %ld too large, must fit into 8-bit int\n", - service_key_version); - cfg_free(cfg); - return -4; - } - if (service_key_version > 0 && config->service_key_id == 0) { - config->service_key_id = service_key_version; - } - if (url_prefix != NULL && config->url_prefix == NULL) { - config->url_prefix = strdup(url_prefix); + service_key = g_key_file_get_value(cfg, "service", "key", NULL); + if (service_key != NULL && + is_zeroed(config->service_key, sizeof config->service_key)) { + if (decode_hex(config->service_key, sizeof config->service_key, + service_key)) { + errorf("ERROR: Failed to hex decode service key\n"); + return -2; } } - cfg_free(cfg); + service_key_version = + g_key_file_get_uint64(cfg, "service", "key-version", NULL); + if (service_key_version > 255) { + errorf("ERROR: Key version %ld too large, must fit into 8-bit int\n", + service_key_version); + return -3; + } + if (service_key_version > 0 && config->service_key_id == 0) { + config->service_key_id = service_key_version; + } + + url_prefix = g_key_file_get_value(cfg, "service", "url-prefix", NULL); + if (url_prefix != NULL && config->url_prefix == NULL) { + config->url_prefix = strdup(url_prefix); + } + return 0; } diff --git a/login/example.cfg b/login/example.cfg index 6f1e66c8..0356221f 100644 --- a/login/example.cfg +++ b/login/example.cfg @@ -1,12 +1,10 @@ -service -{ - # Replace this with your own GLOME server-side public key. - # - # This can be generated as any other GLOME key, where the private key is - # given to the server (glome.example.com in this example) and the public key - # is distributed to all clients through this configuration file. - # - #key = 5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb - key-version = 1 - url-prefix = "https://glome.example.com" -} +[service] +# Replace this with your own GLOME server-side public key. +# +# This can be generated as any other GLOME key, where the private key is +# given to the server (glome.example.com in this example) and the public key +# is distributed to all clients through this configuration file. +# +#key = 5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb +key-version = 1 +url-prefix = https://glome.example.com diff --git a/login/meson.build b/login/meson.build index 7f40fafe..140259aa 100644 --- a/login/meson.build +++ b/login/meson.build @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -confuse_dep = dependency('libconfuse') - install_data( 'example.cfg', rename : 'config', @@ -34,7 +32,7 @@ login_lib = static_library( 'ui.c', 'ui.h', ], - dependencies : [openssl_dep, glib_dep, confuse_dep], + dependencies : [openssl_dep, glib_dep], link_with : glome_lib, include_directories : glome_incdir, install : false)
Rewrite glome-login's config module to use glib Now that we agreed to use glib, we might want to consider moving away from libconfuse to something more solid/understandable like [glib's Key-value file parser](https://developer.gnome.org/glib/stable/glib-Key-value-file-parser.html).
2021-04-20T17:50:39
0.0
[]
[]
google/glome
google__glome-78
8263f3e23f4488734847716d517428a964de46ce
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2717c29e..7f83268b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,19 +12,28 @@ jobs: # See https://github.com/actions/virtual-environments#available-environments pr_presubmit: runs-on: ubuntu-18.04 + strategy: + matrix: + container: + - "python:3.5-buster" + - "alpine:3.12" container: - image: "python:3.5-buster" + image: ${{ matrix.container }} steps: - uses: actions/checkout@v2 - - name: install dependencies + - name: install Debian dependencies + if: ${{ matrix.container == 'python:3.5-buster' }} run: ./kokoro/rodete/fetch_dependencies.sh + - name: install Alpine dependencies + if: ${{ matrix.container == 'alpine:3.12' }} + run: ./kokoro/alpine/fetch_dependencies.sh - name: setup build directory run: meson build - name: build run: ninja -C build - name: test - run: meson test -C build + run: meson test --print-errorlogs -C build - name: install run: | DESTDIR=out meson install -C build @@ -34,6 +43,7 @@ jobs: test -f build/out/usr/local/etc/glome/config test -f build/out/usr/local/include/glome.h # Dereference the library and check that it points to a valid file. + test -f build/out/usr/local/lib/libglome.so || \ test -f build/out/usr/local/lib/x86_64-linux-gnu/libglome.so pr_code_format: @@ -112,3 +122,12 @@ jobs: golint -set_exit_status=1 ./... - name: run unit tests run: go test ./... + + shell_presubmit: + runs-on: ubuntu-18.04 + container: + image: "koalaman/shellcheck-alpine:v0.7.1" + steps: + - uses: actions/checkout@v2 + - name: test POSIX conformance and lint + run: find . -name "*.sh" | xargs shellcheck --shell=sh diff --git a/cli/commands.c b/cli/commands.c index 32e89878..44210a1d 100644 --- a/cli/commands.c +++ b/cli/commands.c @@ -15,7 +15,6 @@ #include "commands.h" #include <errno.h> -#include <error.h> #include <fcntl.h> #include <getopt.h> #include <limits.h> diff --git a/cli/main.c b/cli/main.c index 268d7d8e..e1d7edc7 100644 --- a/cli/main.c +++ b/cli/main.c @@ -13,7 +13,6 @@ // limitations under the License. #include <errno.h> -#include <error.h> #include <fcntl.h> #include <getopt.h> #include <limits.h> diff --git a/kokoro/alpine/fetch_dependencies.sh b/kokoro/alpine/fetch_dependencies.sh new file mode 100755 index 00000000..6bc81030 --- /dev/null +++ b/kokoro/alpine/fetch_dependencies.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +apk add --no-cache \ + alpine-sdk meson \ + openssl-dev confuse-dev glib-dev linux-pam-dev diff --git a/login/login.c b/login/login.c index 0471d92e..a61d7169 100644 --- a/login/login.c +++ b/login/login.c @@ -15,7 +15,6 @@ #include "login.h" #include <assert.h> -#include <bits/local_lim.h> #include <glib.h> #include <glome.h> #include <netdb.h>
Increase portability of GLOME build The build process contains a couple of minor choices that prevent porting onto non-glibc systems. My use case is Alpine, but the situation is probably similar on MacOS or *BSD. - Bash shell is assumed to be available, thus bashisms in scripts. - Non-POSIX utilities used: `mktemp`, `realpath`. - glibc-only headers are used (unnecessarily :) ).
2021-01-12T09:48:36
0.0
[]
[]
tlocke/flake8-alphabetize
tlocke__flake8-alphabetize-3
b32c07974071492b1f50987d90af5e622569fad1
diff --git a/flake8_alphabetize/core.py b/flake8_alphabetize/core.py index d3aa0bc..d29139e 100644 --- a/flake8_alphabetize/core.py +++ b/flake8_alphabetize/core.py @@ -35,7 +35,7 @@ def add_options(option_manager): @classmethod def parse_options(cls, options): names = options.application_names - cls.app_names = [] if (names is None or names == "") else [names] + cls.app_names = [] if (names is None or names == "") else names.split(",") def _make_error(node, code, message):
Comma-separated application names are not recognized Hi, when using `--application-names foo,bar,baz` those names are not used at all. Will provide a fix and a test soon.
2021-06-17T13:58:04
0.0
[]
[]
pinder-org/pinder
pinder-org__pinder-21
bb62635bcb4186cf4f45696fc3da5082bb899f0a
diff --git a/README.md b/README.md index 66550ec..e8be078 100644 --- a/README.md +++ b/README.md @@ -375,7 +375,8 @@ Each model decoy should have exactly two chains: {R, L} for {Receptor, Ligand}, } ``` -For more details on the implementations of the eval metrics, see the [eval docs](examples/eval/). +For more details on the implementations of the eval metrics, see the [eval tutorial](https://pinder-org.github.io/pinder/pinder-eval.html), [API docs](https://pinder-org.github.io/pinder/source/pinder.eval.dockq.html#) and [eval FAQ](https://pinder-org.github.io/pinder/faq.html#how-can-i-use-the-evaluation-harness-outside-of-a-pinder-context). + For more details on leaderboard generation, see the [MethodMetrics](src/pinder-eval/pinder/eval/dockq/method.py) implementation. diff --git a/examples/pinder-loader.ipynb b/examples/pinder-loader.ipynb index 47a563f..46af8a5 100644 --- a/examples/pinder-loader.ipynb +++ b/examples/pinder-loader.ipynb @@ -435,7 +435,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 7, "id": "6e09ccc9-215f-4d8e-a08f-1de96bb42131", "metadata": {}, "outputs": [ @@ -445,7 +445,7 @@ "PinderLoader(split=test, monomers=holo, systems=180)" ] }, - "execution_count": 6, + "execution_count": 7, "metadata": {}, "output_type": "execute_result" } @@ -481,7 +481,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 8, "id": "f7bcbe6e-4bd3-435c-9ff0-cf611f6bf9cf", "metadata": {}, "outputs": [ @@ -491,7 +491,7 @@ "180" ] }, - "execution_count": 7, + "execution_count": 8, "metadata": {}, "output_type": "execute_result" } @@ -502,7 +502,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 9, "id": "fecd34da-c91d-400c-bbda-64d6cccb8e0b", "metadata": {}, "outputs": [ @@ -521,7 +521,7 @@ " pinder.core.loader.structure.Structure)" ] }, - "execution_count": 8, + "execution_count": 9, "metadata": {}, "output_type": "execute_result" } @@ -535,7 +535,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 10, "id": "bdb3327d-26d2-46fc-95ea-de2ea2fc0516", "metadata": {}, "outputs": [ @@ -543,7 +543,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "100%|█████████████████████████████████████████████████████████████████████████████████████████████████████████████████| 180/180 [01:14<00:00, 2.43it/s]\n" + "100%|███████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████| 180/180 [01:12<00:00, 2.50it/s]\n" ] } ], @@ -565,7 +565,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 11, "id": "77d0f734-508a-4b1e-a4f3-acb8590869a0", "metadata": {}, "outputs": [ @@ -575,7 +575,7 @@ "set()" ] }, - "execution_count": 10, + "execution_count": 11, "metadata": {}, "output_type": "execute_result" } @@ -601,7 +601,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 12, "id": "3644c869-da61-4620-a054-2a3ad163f3f8", "metadata": {}, "outputs": [ @@ -611,7 +611,7 @@ "True" ] }, - "execution_count": 11, + "execution_count": 12, "metadata": {}, "output_type": "execute_result" } @@ -637,7 +637,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 13, "id": "6b653c61-cebd-4ace-baf8-a27f1e011466", "metadata": {}, "outputs": [ @@ -645,8 +645,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "[PosixPath('/var/folders/tt/x223wxwj6dzg3vjjgc_6y5bm0000gn/T/tmpbe5qjtfe/117e__A1_P00817--117e__B1_P00817/af__P00817.pdb')]\n", - "[PosixPath('/var/folders/tt/x223wxwj6dzg3vjjgc_6y5bm0000gn/T/tmpbe5qjtfe/1df0__A1_Q07009--1df0__B1_Q64537/af__Q07009.pdb'), PosixPath('/var/folders/tt/x223wxwj6dzg3vjjgc_6y5bm0000gn/T/tmpbe5qjtfe/1df0__A1_Q07009--1df0__B1_Q64537/af__Q64537.pdb')]\n" + "[PosixPath('/var/folders/tt/x223wxwj6dzg3vjjgc_6y5bm0000gn/T/tmpgrbzq_is/117e__A1_P00817--117e__B1_P00817/af__P00817.pdb')]\n", + "[PosixPath('/var/folders/tt/x223wxwj6dzg3vjjgc_6y5bm0000gn/T/tmpgrbzq_is/1df0__A1_Q07009--1df0__B1_Q64537/af__Q07009.pdb'), PosixPath('/var/folders/tt/x223wxwj6dzg3vjjgc_6y5bm0000gn/T/tmpgrbzq_is/1df0__A1_Q07009--1df0__B1_Q64537/af__Q64537.pdb')]\n" ] } ], @@ -738,7 +738,8 @@ "* `residue_types`\n", "* `residue_ids`\n", "\n", - "You can choose to use a different representation by overriding the default values of `transform` and `target_transform`.\n", + "**Note: You can choose to use a different representation by overriding the default values of `transform` and `target_transform`. The default transform is the structure2tensor_transform defined in pinder.core.loader.dataset. \n", + "It simply takes a `Structure` object and returns a dictionary with string keys and tensor values.**\n", " \n", "It leverages the `PinderLoader` to apply optional filters and/or transforms, provide an interface for sampling alternative monomers, and exposes `transform` and `target_transform` arguments used by the torch Dataset API. \n", "\n", @@ -747,24 +748,24 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 14, "id": "9658c6aa-5720-4c0f-98ae-b79d34ad2754", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "<pinder.core.loader.dataset.PinderDataset at 0x1ecf92350>" + "<pinder.core.loader.dataset.PinderDataset at 0x1fc1f76a0>" ] }, - "execution_count": 2, + "execution_count": 14, "metadata": {}, "output_type": "execute_result" } ], "source": [ "from pinder.core.loader import filters, transforms\n", - "from pinder.core.loader.dataset import PinderDataset\n", + "from pinder.core.loader.dataset import PinderDataset, structure2tensor_transform\n", "\n", "base_filters = [\n", " filters.FilterByMissingHolo(),\n", @@ -792,6 +793,9 @@ " structure_transforms_target=structure_transforms,\n", " # Apply to the feature complex\n", " structure_transforms_feature=structure_transforms,\n", + " # This is the default transform if not specified\n", + " transform=structure2tensor_transform,\n", + " target_transform=structure2tensor_transform,\n", ")\n", "assert len(train_dataset) == len(get_index().query('split == \"train\"'))\n", "\n", @@ -834,20 +838,27 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 15, "id": "383244d7-1a85-4732-9dd4-3455fe4cec88", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "{'target_complex': {'atom_types': tensor([[0., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", + "{'target_complex': {'atom_types': tensor([[0.],\n", + " [1.],\n", + " [2.],\n", + " ...,\n", + " [1.],\n", + " [2.],\n", + " [3.]]),\n", + " 'element_types': tensor([[3.],\n", + " [0.],\n", + " [0.],\n", " ...,\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [0., 0., 1., ..., 0., 0., 0.]]),\n", + " [0.],\n", + " [0.],\n", + " [2.]]),\n", " 'residue_types': tensor([[16.],\n", " [16.],\n", " [16.],\n", @@ -862,22 +873,351 @@ " [177.7620, 463.8650, 166.9020],\n", " [177.4130, 465.0800, 167.7550],\n", " [176.8000, 464.9490, 168.8150]]),\n", - " 'residue_coordinates': tensor([[131.7500, 429.3090, 163.5360],\n", - " [132.6810, 428.2520, 163.1550],\n", - " [133.5150, 428.6750, 161.9500],\n", - " ...,\n", - " [177.7620, 463.8650, 166.9020],\n", - " [177.4130, 465.0800, 167.7550],\n", - " [176.8000, 464.9490, 168.8150]]),\n", + " 'residue_coordinates': tensor([[132.6810, 428.2520, 163.1550],\n", + " [133.5560, 429.2490, 159.5910],\n", + " [133.8750, 432.8980, 160.6290],\n", + " [136.1110, 431.8050, 163.5130],\n", + " [138.3420, 429.8920, 161.0830],\n", + " [138.5230, 432.9090, 158.7600],\n", + " [139.4710, 435.1730, 161.6750],\n", + " [142.1200, 432.6310, 162.6740],\n", + " [143.5890, 432.7500, 159.1600],\n", + " [143.6190, 436.5600, 159.1540],\n", + " [145.2600, 436.8040, 162.5830],\n", + " [147.8380, 434.1320, 161.7330],\n", + " [148.7390, 435.8920, 158.4790],\n", + " [149.0640, 439.2630, 160.2240],\n", + " [151.2220, 437.7670, 162.9840],\n", + " [153.4710, 435.8030, 160.6120],\n", + " [153.9420, 438.9180, 158.4710],\n", + " [156.1140, 440.2660, 161.3150],\n", + " [158.3330, 437.1860, 161.4250],\n", + " [161.8090, 436.4120, 160.1100],\n", + " [161.1120, 432.8370, 158.9350],\n", + " [157.4020, 432.0710, 159.3930],\n", + " [156.5290, 428.3870, 159.0310],\n", + " [154.0400, 428.1160, 156.1500],\n", + " [153.3520, 424.6590, 154.7510],\n", + " [152.8370, 424.8210, 150.9870],\n", + " [150.9700, 422.4160, 148.7320],\n", + " [153.5900, 422.6860, 145.9670],\n", + " [157.3050, 423.3410, 145.6600],\n", + " [158.4860, 426.6730, 144.2700],\n", + " [160.7730, 427.0880, 141.2590],\n", + " [163.9630, 429.0530, 141.9600],\n", + " [166.4230, 427.4330, 139.5550],\n", + " [167.6170, 430.8330, 138.3250],\n", + " [170.5180, 431.9210, 140.5320],\n", + " [169.7800, 435.6680, 140.3160],\n", + " [167.6790, 437.8790, 142.6110],\n", + " [167.3350, 435.1910, 145.2890],\n", + " [168.9090, 437.3000, 148.0580],\n", + " [166.1860, 439.9440, 148.5750],\n", + " [164.1010, 438.1300, 151.1890],\n", + " [163.0190, 438.8690, 154.7450],\n", + " [164.6750, 435.6560, 155.9860],\n", + " [168.1170, 436.6550, 154.6330],\n", + " [169.8040, 437.0930, 158.0010],\n", + " [173.2680, 438.4850, 158.5750],\n", + " [174.9270, 440.8490, 156.1460],\n", + " [175.9170, 440.8010, 152.5000],\n", + " [179.6060, 441.0910, 153.4330],\n", + " [180.8000, 439.9830, 156.8710],\n", + " [184.2540, 439.9980, 158.4580],\n", + " [185.5840, 437.2970, 160.7670],\n", + " [186.4140, 439.9000, 163.4480],\n", + " [182.9430, 441.4570, 163.7500],\n", + " [181.4930, 442.0910, 167.2100],\n", + " [178.0780, 440.5360, 167.9060],\n", + " [176.1650, 440.9290, 171.1790],\n", + " [173.0530, 438.9530, 172.1310],\n", + " [170.3990, 440.6990, 174.2170],\n", + " [166.7880, 440.0710, 175.2260],\n", + " [164.4480, 442.1010, 173.0340],\n", + " [160.9780, 443.6110, 173.3810],\n", + " [158.8330, 443.9000, 170.2730],\n", + " [160.1820, 442.9360, 166.8360],\n", + " [163.5010, 444.7230, 166.1630],\n", + " [164.6310, 442.4290, 163.3160],\n", + " [166.6330, 444.2560, 160.6240],\n", + " [166.1700, 447.5210, 162.5220],\n", + " [168.1350, 449.9450, 164.6440],\n", + " [168.0040, 449.0470, 168.3240],\n", + " [168.4210, 451.0540, 171.5220],\n", + " [169.0440, 450.0360, 175.1300],\n", + " [166.1650, 450.3680, 177.6100],\n", + " [166.7800, 449.8300, 181.3340],\n", + " [163.8480, 448.9150, 183.5760],\n", + " [163.3500, 443.9770, 187.9750],\n", + " [165.0240, 442.4930, 184.8870],\n", + " [168.1120, 443.0980, 182.7810],\n", + " [168.1280, 445.9210, 180.2050],\n", + " [166.7230, 445.0130, 176.8030],\n", + " [167.0690, 446.1330, 173.1930],\n", + " [164.0790, 447.8390, 171.5780],\n", + " [163.4630, 449.0630, 168.0350],\n", + " [164.4160, 452.7320, 168.0130],\n", + " [166.7460, 455.3190, 166.5790],\n", + " [167.5460, 459.0090, 166.8440],\n", + " [170.2010, 459.9620, 169.3810],\n", + " [169.5150, 456.8220, 171.4570],\n", + " [170.7440, 454.3880, 168.7860],\n", + " [172.8900, 451.6810, 170.3850],\n", + " [173.2420, 449.3000, 167.4490],\n", + " [171.4700, 447.3670, 164.7150],\n", + " [169.7840, 443.9650, 164.9670],\n", + " [170.8880, 441.4120, 162.3680],\n", + " [169.3320, 438.1640, 163.6510],\n", + " [166.7170, 436.9060, 166.1030],\n", + " [166.2830, 433.5290, 167.7900],\n", + " [162.5490, 433.4260, 168.5040],\n", + " [162.6440, 430.3540, 170.7620],\n", + " [164.9490, 432.1120, 173.2350],\n", + " [163.6530, 435.5760, 172.2210],\n", + " [167.2540, 436.7450, 171.8300],\n", + " [168.3710, 439.3650, 169.3060],\n", + " [171.8910, 439.6680, 167.8930],\n", + " [173.1360, 443.2500, 167.5870],\n", + " [176.0990, 444.7950, 165.8030],\n", + " [177.1670, 447.8660, 167.8270],\n", + " [177.4160, 451.2430, 166.1360],\n", + " [181.1790, 451.0810, 166.7480],\n", + " [181.3560, 448.4350, 163.9980],\n", + " [180.6020, 448.8920, 160.3060],\n", + " [177.8440, 446.8990, 158.6170],\n", + " [176.7540, 446.3160, 155.0150],\n", + " [173.3820, 444.6900, 154.4770],\n", + " [169.6430, 444.9660, 153.9760],\n", + " [167.6080, 446.9450, 156.5140],\n", + " [163.9630, 447.9270, 156.8800],\n", + " [163.1520, 451.2160, 155.1430],\n", + " [160.3870, 453.6570, 156.0420],\n", + " [158.9330, 453.6920, 152.5150],\n", + " [159.8050, 453.2460, 148.8360],\n", + " [161.2560, 456.7540, 148.4440],\n", + " [164.9420, 455.8330, 148.8520],\n", + " [167.3780, 455.9500, 145.9260],\n", + " [171.0380, 455.0610, 145.5060],\n", + " [173.5830, 457.5340, 146.9270],\n", + " [171.2360, 458.9430, 149.5740],\n", + " [171.8150, 459.8640, 153.2130],\n", + " [169.5910, 457.9090, 155.6000],\n", + " [168.4960, 458.3960, 159.2100],\n", + " [167.0870, 455.9020, 161.7110],\n", + " [163.6430, 457.0390, 162.8610],\n", + " [161.8700, 456.3550, 166.1660],\n", + " [160.7490, 452.9260, 164.8950],\n", + " [164.2440, 451.8750, 163.8110],\n", + " [163.4490, 452.3040, 160.1090],\n", + " [165.6820, 454.0140, 157.5590],\n", + " [164.2940, 457.2310, 156.0670],\n", + " [165.6810, 459.7290, 153.5780],\n", + " [167.3870, 462.7790, 155.0760],\n", + " [170.2060, 465.8340, 161.8360],\n", + " [172.1620, 462.7680, 160.6890],\n", + " [174.0280, 461.7040, 163.8180],\n", + " [175.2110, 458.5660, 161.9930],\n", + " [176.5410, 458.2410, 158.4450],\n", + " [174.5550, 455.7530, 156.3540],\n", + " [174.3580, 455.6030, 152.5600],\n", + " [171.8590, 453.6260, 150.4910],\n", + " [173.6300, 451.2730, 148.0810],\n", + " [170.4820, 450.1750, 146.2000],\n", + " [166.8520, 451.1980, 145.7810],\n", + " [164.0730, 450.1880, 148.1490],\n", + " [162.6710, 446.7750, 147.1980],\n", + " [159.1420, 445.8080, 148.2240],\n", + " [158.3160, 442.3640, 149.5950],\n", + " [155.0300, 443.1470, 151.4050],\n", + " [152.6800, 446.0960, 151.8500],\n", + " [155.0610, 447.4890, 154.4910],\n", + " [158.2010, 445.3460, 154.0190],\n", + " [160.8090, 447.5340, 152.2870],\n", + " [164.4130, 446.3150, 152.1360],\n", + " [167.3360, 448.5380, 151.1380],\n", + " [171.0310, 447.6630, 150.9500],\n", + " [172.8160, 450.1440, 153.2260],\n", + " [176.3550, 450.4540, 154.5850],\n", + " [176.6310, 452.0780, 158.0240],\n", + " [180.1600, 453.0970, 159.0310],\n", + " [179.9110, 454.9710, 162.3160],\n", + " [178.7370, 458.4030, 163.4610],\n", + " [179.1350, 461.9150, 162.0830],\n", + " [180.3160, 464.9940, 163.9950],\n", + " [195.1700, 454.0210, 194.1160],\n", + " [196.4220, 450.5570, 193.1610],\n", + " [195.0530, 447.5260, 191.3340],\n", + " [195.7530, 445.4320, 194.4410],\n", + " [195.6760, 446.8960, 197.9710],\n", + " [199.1230, 447.9300, 199.1640],\n", + " [198.4070, 447.0140, 202.7840],\n", + " [198.1130, 443.3080, 203.5090],\n", + " [195.0350, 441.7530, 205.1060],\n", + " [194.7040, 440.1720, 208.5300],\n", + " [191.7420, 437.9460, 207.6670],\n", + " [190.9460, 435.0990, 205.3140],\n", + " [188.0870, 435.6760, 202.8880],\n", + " [184.8300, 433.7320, 203.1830],\n", + " [184.1270, 431.8260, 199.9570],\n", + " [180.5450, 430.8500, 200.7460],\n", + " [178.2470, 433.3320, 199.0220],\n", + " [178.2770, 433.9260, 195.2680],\n", + " [176.3170, 437.2030, 195.0280],\n", + " [177.7690, 440.7330, 194.9660],\n", + " [181.3350, 439.3910, 195.1330],\n", + " [182.5820, 441.3460, 192.0940],\n", + " [182.3530, 444.9560, 193.3610],\n", + " [186.0870, 445.2240, 194.0290],\n", + " [188.7230, 447.5570, 192.6190],\n", + " [190.8760, 444.5870, 191.5490],\n", + " [188.2670, 443.5230, 188.9590],\n", + " [190.1360, 444.3010, 185.7360],\n", + " [188.8140, 444.1990, 182.1980],\n", + " [185.1300, 444.1560, 181.3470],\n", + " [182.1290, 442.2030, 182.6060],\n", + " [181.3330, 441.2700, 178.9860],\n", + " [184.3690, 440.6570, 176.7700],\n", + " [184.4240, 439.7520, 173.0740],\n", + " [187.1540, 437.5560, 171.6020],\n", + " [187.5170, 439.9750, 168.6500],\n", + " [188.4180, 443.0500, 170.7240],\n", + " [191.4360, 445.2100, 169.8910],\n", + " [193.7480, 445.6510, 172.8940],\n", + " [196.8200, 447.8990, 173.0280],\n", + " [199.4910, 448.6120, 175.6310],\n", + " [201.2080, 451.9090, 176.3780],\n", + " [203.6110, 453.4740, 178.8680],\n", + " [201.6130, 454.9210, 181.7570],\n", + " [202.0690, 458.3840, 183.2730],\n", + " [200.4970, 458.3690, 186.7180],\n", + " [197.7960, 455.8130, 187.5240],\n", + " [195.1460, 455.8470, 184.7720],\n", + " [193.6160, 452.5740, 185.9790],\n", + " [189.8600, 452.3800, 185.3150],\n", + " [189.9440, 455.8580, 183.7680],\n", + " [189.7400, 457.4310, 180.3410],\n", + " [193.1630, 457.9480, 178.8100],\n", + " [194.6770, 460.5170, 176.4640],\n", + " [197.9720, 460.6430, 174.6010],\n", + " [200.7710, 462.5710, 176.3210],\n", + " [203.7970, 463.7400, 174.3330],\n", + " [207.1150, 464.5820, 175.9770],\n", + " [210.1390, 466.5260, 174.8060],\n", + " [210.8850, 463.9390, 172.1200],\n", + " [213.6440, 461.8050, 173.6150],\n", + " [211.1280, 459.2430, 174.9140],\n", + " [208.0390, 457.7610, 173.2930],\n", + " [204.4770, 458.9110, 173.9310],\n", + " [202.5240, 457.8000, 177.0030],\n", + " [198.9190, 457.7220, 178.2440],\n", + " [197.5730, 459.9040, 181.0500],\n", + " [194.2310, 460.2350, 182.8060],\n", + " [192.1140, 462.6430, 180.7850],\n", + " [189.0250, 463.1720, 178.7000],\n", + " [187.1240, 465.8360, 176.8220],\n", + " [188.2850, 466.3320, 173.2420],\n", + " [191.5580, 464.4520, 173.8600],\n", + " [189.9950, 461.1280, 174.9010],\n", + " [191.8440, 458.2970, 173.1540],\n", + " [190.4670, 455.2690, 174.9900],\n", + " [189.7380, 453.5820, 178.3070],\n", + " [192.3390, 451.8830, 180.5000],\n", + " [191.2020, 448.5340, 181.9050],\n", + " [194.3800, 447.0280, 183.4050],\n", + " [197.8700, 447.9650, 184.5850],\n", + " [200.9840, 445.8270, 184.9660],\n", + " [202.8290, 447.6220, 187.7590],\n", + " [206.2120, 445.9180, 187.3400],\n", + " [206.6040, 447.1310, 183.7460],\n", + " [204.4430, 450.2380, 184.1830],\n", + " [202.2310, 449.1370, 181.2890],\n", + " [198.6660, 450.3790, 180.7720],\n", + " [196.2310, 448.2490, 178.7680],\n", + " [194.0550, 450.4240, 176.5260],\n", + " [190.8490, 449.7090, 174.6070],\n", + " [190.4360, 452.3080, 171.8240],\n", + " [187.3830, 454.5590, 171.7980],\n", + " [186.4670, 452.9730, 168.4480],\n", + " [185.9050, 449.6480, 170.2580],\n", + " [182.8890, 448.8910, 172.4330],\n", + " [183.5680, 448.6030, 176.1630],\n", + " [181.3330, 447.5400, 179.0590],\n", + " [182.7340, 447.5270, 182.5670],\n", + " [183.3280, 449.2260, 185.8920],\n", + " [184.8760, 452.6980, 185.6990],\n", + " [185.7140, 455.4170, 188.2030],\n", + " [182.9420, 457.9530, 188.8300],\n", + " [183.2930, 461.5650, 189.9350],\n", + " [182.7580, 462.1320, 193.6660],\n", + " [180.0620, 464.7490, 193.1030],\n", + " [176.4120, 463.9030, 192.5790],\n", + " [177.1550, 460.1730, 192.6930],\n", + " [173.8180, 459.5980, 194.4390],\n", + " [172.0770, 461.1030, 191.4040],\n", + " [173.6950, 458.5410, 189.0910],\n", + " [171.0060, 456.0190, 188.1270],\n", + " [170.8210, 453.3390, 185.4210],\n", + " [170.0180, 454.8270, 182.0350],\n", + " [171.8690, 458.1080, 182.6590],\n", + " [174.2320, 459.6520, 180.1210],\n", + " [177.8640, 459.9130, 181.2230],\n", + " [180.8780, 461.8410, 179.9490],\n", + " [184.5650, 461.8070, 180.8430],\n", + " [186.0650, 464.7990, 182.6440],\n", + " [189.5780, 466.2740, 182.6170],\n", + " [190.7120, 463.6340, 185.1390],\n", + " [189.2980, 460.6630, 183.2290],\n", + " [186.3560, 460.3000, 185.6240],\n", + " [182.7840, 459.6590, 184.5210],\n", + " [180.2130, 462.3320, 185.3590],\n", + " [176.5320, 462.8410, 184.6140],\n", + " [175.8580, 465.0300, 181.5790],\n", + " [178.1930, 465.7110, 174.9000],\n", + " [180.9150, 464.1190, 172.7670],\n", + " [181.2510, 460.5420, 174.1130],\n", + " [178.4430, 457.9660, 174.2140],\n", + " [178.5420, 456.4790, 177.7180],\n", + " [175.4730, 455.1590, 179.5500],\n", + " [175.4670, 454.0690, 183.1870],\n", + " [174.1210, 450.5430, 183.6830],\n", + " [173.9850, 450.6340, 187.5030],\n", + " [174.3640, 452.9240, 190.5240],\n", + " [177.5140, 454.2200, 192.1820],\n", + " [179.3060, 451.6570, 194.3540],\n", + " [181.4890, 453.2110, 197.0570],\n", + " [184.7390, 451.3110, 197.6330],\n", + " [186.4870, 454.0230, 199.6690],\n", + " [185.5270, 457.3810, 201.1790],\n", + " [186.7910, 459.0050, 197.9610],\n", + " [186.6010, 456.0430, 195.5320],\n", + " [183.3680, 455.3620, 193.6270],\n", + " [182.9110, 452.9430, 190.7280],\n", + " [180.0190, 452.5230, 188.3060],\n", + " [179.0910, 450.0250, 185.5960],\n", + " [178.9850, 451.7840, 182.2280],\n", + " [179.0510, 451.0080, 178.5100],\n", + " [181.0530, 453.1550, 176.0780],\n", + " [180.1320, 452.7170, 172.4060],\n", + " [182.0570, 455.4530, 170.6120],\n", + " [181.8140, 459.1820, 170.0770],\n", + " [178.5990, 461.0580, 169.3130],\n", + " [177.7620, 463.8650, 166.9020]]),\n", " 'residue_ids': tensor([ 4., 4., 4., ..., 182., 182., 182.]),\n", " 'chain_ids': tensor([0., 0., 0., ..., 1., 1., 1.])},\n", - " 'feature_complex': {'atom_types': tensor([[0., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", + " 'feature_complex': {'atom_types': tensor([[0.],\n", + " [1.],\n", + " [2.],\n", + " ...,\n", + " [1.],\n", + " [2.],\n", + " [3.]]),\n", + " 'element_types': tensor([[3.],\n", + " [0.],\n", + " [0.],\n", " ...,\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [0., 0., 1., ..., 0., 0., 0.]]),\n", + " [0.],\n", + " [0.],\n", + " [2.]]),\n", " 'residue_types': tensor([[16.],\n", " [16.],\n", " [16.],\n", @@ -892,13 +1232,335 @@ " [177.7620, 463.8650, 166.9020],\n", " [177.4130, 465.0800, 167.7550],\n", " [176.8000, 464.9490, 168.8150]]),\n", - " 'residue_coordinates': tensor([[131.7500, 429.3090, 163.5360],\n", - " [132.6810, 428.2520, 163.1550],\n", - " [133.5150, 428.6750, 161.9500],\n", - " ...,\n", - " [177.7620, 463.8650, 166.9020],\n", - " [177.4130, 465.0800, 167.7550],\n", - " [176.8000, 464.9490, 168.8150]]),\n", + " 'residue_coordinates': tensor([[132.6810, 428.2520, 163.1550],\n", + " [133.5560, 429.2490, 159.5910],\n", + " [133.8750, 432.8980, 160.6290],\n", + " [136.1110, 431.8050, 163.5130],\n", + " [138.3420, 429.8920, 161.0830],\n", + " [138.5230, 432.9090, 158.7600],\n", + " [139.4710, 435.1730, 161.6750],\n", + " [142.1200, 432.6310, 162.6740],\n", + " [143.5890, 432.7500, 159.1600],\n", + " [143.6190, 436.5600, 159.1540],\n", + " [145.2600, 436.8040, 162.5830],\n", + " [147.8380, 434.1320, 161.7330],\n", + " [148.7390, 435.8920, 158.4790],\n", + " [149.0640, 439.2630, 160.2240],\n", + " [151.2220, 437.7670, 162.9840],\n", + " [153.4710, 435.8030, 160.6120],\n", + " [153.9420, 438.9180, 158.4710],\n", + " [156.1140, 440.2660, 161.3150],\n", + " [158.3330, 437.1860, 161.4250],\n", + " [161.8090, 436.4120, 160.1100],\n", + " [161.1120, 432.8370, 158.9350],\n", + " [157.4020, 432.0710, 159.3930],\n", + " [156.5290, 428.3870, 159.0310],\n", + " [154.0400, 428.1160, 156.1500],\n", + " [153.3520, 424.6590, 154.7510],\n", + " [152.8370, 424.8210, 150.9870],\n", + " [150.9700, 422.4160, 148.7320],\n", + " [153.5900, 422.6860, 145.9670],\n", + " [157.3050, 423.3410, 145.6600],\n", + " [158.4860, 426.6730, 144.2700],\n", + " [160.7730, 427.0880, 141.2590],\n", + " [163.9630, 429.0530, 141.9600],\n", + " [166.4230, 427.4330, 139.5550],\n", + " [167.6170, 430.8330, 138.3250],\n", + " [170.5180, 431.9210, 140.5320],\n", + " [169.7800, 435.6680, 140.3160],\n", + " [167.6790, 437.8790, 142.6110],\n", + " [167.3350, 435.1910, 145.2890],\n", + " [168.9090, 437.3000, 148.0580],\n", + " [166.1860, 439.9440, 148.5750],\n", + " [164.1010, 438.1300, 151.1890],\n", + " [163.0190, 438.8690, 154.7450],\n", + " [164.6750, 435.6560, 155.9860],\n", + " [168.1170, 436.6550, 154.6330],\n", + " [169.8040, 437.0930, 158.0010],\n", + " [173.2680, 438.4850, 158.5750],\n", + " [174.9270, 440.8490, 156.1460],\n", + " [175.9170, 440.8010, 152.5000],\n", + " [179.6060, 441.0910, 153.4330],\n", + " [180.8000, 439.9830, 156.8710],\n", + " [184.2540, 439.9980, 158.4580],\n", + " [185.5840, 437.2970, 160.7670],\n", + " [186.4140, 439.9000, 163.4480],\n", + " [182.9430, 441.4570, 163.7500],\n", + " [181.4930, 442.0910, 167.2100],\n", + " [178.0780, 440.5360, 167.9060],\n", + " [176.1650, 440.9290, 171.1790],\n", + " [173.0530, 438.9530, 172.1310],\n", + " [170.3990, 440.6990, 174.2170],\n", + " [166.7880, 440.0710, 175.2260],\n", + " [164.4480, 442.1010, 173.0340],\n", + " [160.9780, 443.6110, 173.3810],\n", + " [158.8330, 443.9000, 170.2730],\n", + " [160.1820, 442.9360, 166.8360],\n", + " [163.5010, 444.7230, 166.1630],\n", + " [164.6310, 442.4290, 163.3160],\n", + " [166.6330, 444.2560, 160.6240],\n", + " [166.1700, 447.5210, 162.5220],\n", + " [168.1350, 449.9450, 164.6440],\n", + " [168.0040, 449.0470, 168.3240],\n", + " [168.4210, 451.0540, 171.5220],\n", + " [169.0440, 450.0360, 175.1300],\n", + " [166.1650, 450.3680, 177.6100],\n", + " [166.7800, 449.8300, 181.3340],\n", + " [163.8480, 448.9150, 183.5760],\n", + " [163.3500, 443.9770, 187.9750],\n", + " [165.0240, 442.4930, 184.8870],\n", + " [168.1120, 443.0980, 182.7810],\n", + " [168.1280, 445.9210, 180.2050],\n", + " [166.7230, 445.0130, 176.8030],\n", + " [167.0690, 446.1330, 173.1930],\n", + " [164.0790, 447.8390, 171.5780],\n", + " [163.4630, 449.0630, 168.0350],\n", + " [164.4160, 452.7320, 168.0130],\n", + " [166.7460, 455.3190, 166.5790],\n", + " [167.5460, 459.0090, 166.8440],\n", + " [170.2010, 459.9620, 169.3810],\n", + " [169.5150, 456.8220, 171.4570],\n", + " [170.7440, 454.3880, 168.7860],\n", + " [172.8900, 451.6810, 170.3850],\n", + " [173.2420, 449.3000, 167.4490],\n", + " [171.4700, 447.3670, 164.7150],\n", + " [169.7840, 443.9650, 164.9670],\n", + " [170.8880, 441.4120, 162.3680],\n", + " [169.3320, 438.1640, 163.6510],\n", + " [166.7170, 436.9060, 166.1030],\n", + " [166.2830, 433.5290, 167.7900],\n", + " [162.5490, 433.4260, 168.5040],\n", + " [162.6440, 430.3540, 170.7620],\n", + " [164.9490, 432.1120, 173.2350],\n", + " [163.6530, 435.5760, 172.2210],\n", + " [167.2540, 436.7450, 171.8300],\n", + " [168.3710, 439.3650, 169.3060],\n", + " [171.8910, 439.6680, 167.8930],\n", + " [173.1360, 443.2500, 167.5870],\n", + " [176.0990, 444.7950, 165.8030],\n", + " [177.1670, 447.8660, 167.8270],\n", + " [177.4160, 451.2430, 166.1360],\n", + " [181.1790, 451.0810, 166.7480],\n", + " [181.3560, 448.4350, 163.9980],\n", + " [180.6020, 448.8920, 160.3060],\n", + " [177.8440, 446.8990, 158.6170],\n", + " [176.7540, 446.3160, 155.0150],\n", + " [173.3820, 444.6900, 154.4770],\n", + " [169.6430, 444.9660, 153.9760],\n", + " [167.6080, 446.9450, 156.5140],\n", + " [163.9630, 447.9270, 156.8800],\n", + " [163.1520, 451.2160, 155.1430],\n", + " [160.3870, 453.6570, 156.0420],\n", + " [158.9330, 453.6920, 152.5150],\n", + " [159.8050, 453.2460, 148.8360],\n", + " [161.2560, 456.7540, 148.4440],\n", + " [164.9420, 455.8330, 148.8520],\n", + " [167.3780, 455.9500, 145.9260],\n", + " [171.0380, 455.0610, 145.5060],\n", + " [173.5830, 457.5340, 146.9270],\n", + " [171.2360, 458.9430, 149.5740],\n", + " [171.8150, 459.8640, 153.2130],\n", + " [169.5910, 457.9090, 155.6000],\n", + " [168.4960, 458.3960, 159.2100],\n", + " [167.0870, 455.9020, 161.7110],\n", + " [163.6430, 457.0390, 162.8610],\n", + " [161.8700, 456.3550, 166.1660],\n", + " [160.7490, 452.9260, 164.8950],\n", + " [164.2440, 451.8750, 163.8110],\n", + " [163.4490, 452.3040, 160.1090],\n", + " [165.6820, 454.0140, 157.5590],\n", + " [164.2940, 457.2310, 156.0670],\n", + " [165.6810, 459.7290, 153.5780],\n", + " [167.3870, 462.7790, 155.0760],\n", + " [170.2060, 465.8340, 161.8360],\n", + " [172.1620, 462.7680, 160.6890],\n", + " [174.0280, 461.7040, 163.8180],\n", + " [175.2110, 458.5660, 161.9930],\n", + " [176.5410, 458.2410, 158.4450],\n", + " [174.5550, 455.7530, 156.3540],\n", + " [174.3580, 455.6030, 152.5600],\n", + " [171.8590, 453.6260, 150.4910],\n", + " [173.6300, 451.2730, 148.0810],\n", + " [170.4820, 450.1750, 146.2000],\n", + " [166.8520, 451.1980, 145.7810],\n", + " [164.0730, 450.1880, 148.1490],\n", + " [162.6710, 446.7750, 147.1980],\n", + " [159.1420, 445.8080, 148.2240],\n", + " [158.3160, 442.3640, 149.5950],\n", + " [155.0300, 443.1470, 151.4050],\n", + " [152.6800, 446.0960, 151.8500],\n", + " [155.0610, 447.4890, 154.4910],\n", + " [158.2010, 445.3460, 154.0190],\n", + " [160.8090, 447.5340, 152.2870],\n", + " [164.4130, 446.3150, 152.1360],\n", + " [167.3360, 448.5380, 151.1380],\n", + " [171.0310, 447.6630, 150.9500],\n", + " [172.8160, 450.1440, 153.2260],\n", + " [176.3550, 450.4540, 154.5850],\n", + " [176.6310, 452.0780, 158.0240],\n", + " [180.1600, 453.0970, 159.0310],\n", + " [179.9110, 454.9710, 162.3160],\n", + " [178.7370, 458.4030, 163.4610],\n", + " [179.1350, 461.9150, 162.0830],\n", + " [180.3160, 464.9940, 163.9950],\n", + " [195.1700, 454.0210, 194.1160],\n", + " [196.4220, 450.5570, 193.1610],\n", + " [195.0530, 447.5260, 191.3340],\n", + " [195.7530, 445.4320, 194.4410],\n", + " [195.6760, 446.8960, 197.9710],\n", + " [199.1230, 447.9300, 199.1640],\n", + " [198.4070, 447.0140, 202.7840],\n", + " [198.1130, 443.3080, 203.5090],\n", + " [195.0350, 441.7530, 205.1060],\n", + " [194.7040, 440.1720, 208.5300],\n", + " [191.7420, 437.9460, 207.6670],\n", + " [190.9460, 435.0990, 205.3140],\n", + " [188.0870, 435.6760, 202.8880],\n", + " [184.8300, 433.7320, 203.1830],\n", + " [184.1270, 431.8260, 199.9570],\n", + " [180.5450, 430.8500, 200.7460],\n", + " [178.2470, 433.3320, 199.0220],\n", + " [178.2770, 433.9260, 195.2680],\n", + " [176.3170, 437.2030, 195.0280],\n", + " [177.7690, 440.7330, 194.9660],\n", + " [181.3350, 439.3910, 195.1330],\n", + " [182.5820, 441.3460, 192.0940],\n", + " [182.3530, 444.9560, 193.3610],\n", + " [186.0870, 445.2240, 194.0290],\n", + " [188.7230, 447.5570, 192.6190],\n", + " [190.8760, 444.5870, 191.5490],\n", + " [188.2670, 443.5230, 188.9590],\n", + " [190.1360, 444.3010, 185.7360],\n", + " [188.8140, 444.1990, 182.1980],\n", + " [185.1300, 444.1560, 181.3470],\n", + " [182.1290, 442.2030, 182.6060],\n", + " [181.3330, 441.2700, 178.9860],\n", + " [184.3690, 440.6570, 176.7700],\n", + " [184.4240, 439.7520, 173.0740],\n", + " [187.1540, 437.5560, 171.6020],\n", + " [187.5170, 439.9750, 168.6500],\n", + " [188.4180, 443.0500, 170.7240],\n", + " [191.4360, 445.2100, 169.8910],\n", + " [193.7480, 445.6510, 172.8940],\n", + " [196.8200, 447.8990, 173.0280],\n", + " [199.4910, 448.6120, 175.6310],\n", + " [201.2080, 451.9090, 176.3780],\n", + " [203.6110, 453.4740, 178.8680],\n", + " [201.6130, 454.9210, 181.7570],\n", + " [202.0690, 458.3840, 183.2730],\n", + " [200.4970, 458.3690, 186.7180],\n", + " [197.7960, 455.8130, 187.5240],\n", + " [195.1460, 455.8470, 184.7720],\n", + " [193.6160, 452.5740, 185.9790],\n", + " [189.8600, 452.3800, 185.3150],\n", + " [189.9440, 455.8580, 183.7680],\n", + " [189.7400, 457.4310, 180.3410],\n", + " [193.1630, 457.9480, 178.8100],\n", + " [194.6770, 460.5170, 176.4640],\n", + " [197.9720, 460.6430, 174.6010],\n", + " [200.7710, 462.5710, 176.3210],\n", + " [203.7970, 463.7400, 174.3330],\n", + " [207.1150, 464.5820, 175.9770],\n", + " [210.1390, 466.5260, 174.8060],\n", + " [210.8850, 463.9390, 172.1200],\n", + " [213.6440, 461.8050, 173.6150],\n", + " [211.1280, 459.2430, 174.9140],\n", + " [208.0390, 457.7610, 173.2930],\n", + " [204.4770, 458.9110, 173.9310],\n", + " [202.5240, 457.8000, 177.0030],\n", + " [198.9190, 457.7220, 178.2440],\n", + " [197.5730, 459.9040, 181.0500],\n", + " [194.2310, 460.2350, 182.8060],\n", + " [192.1140, 462.6430, 180.7850],\n", + " [189.0250, 463.1720, 178.7000],\n", + " [187.1240, 465.8360, 176.8220],\n", + " [188.2850, 466.3320, 173.2420],\n", + " [191.5580, 464.4520, 173.8600],\n", + " [189.9950, 461.1280, 174.9010],\n", + " [191.8440, 458.2970, 173.1540],\n", + " [190.4670, 455.2690, 174.9900],\n", + " [189.7380, 453.5820, 178.3070],\n", + " [192.3390, 451.8830, 180.5000],\n", + " [191.2020, 448.5340, 181.9050],\n", + " [194.3800, 447.0280, 183.4050],\n", + " [197.8700, 447.9650, 184.5850],\n", + " [200.9840, 445.8270, 184.9660],\n", + " [202.8290, 447.6220, 187.7590],\n", + " [206.2120, 445.9180, 187.3400],\n", + " [206.6040, 447.1310, 183.7460],\n", + " [204.4430, 450.2380, 184.1830],\n", + " [202.2310, 449.1370, 181.2890],\n", + " [198.6660, 450.3790, 180.7720],\n", + " [196.2310, 448.2490, 178.7680],\n", + " [194.0550, 450.4240, 176.5260],\n", + " [190.8490, 449.7090, 174.6070],\n", + " [190.4360, 452.3080, 171.8240],\n", + " [187.3830, 454.5590, 171.7980],\n", + " [186.4670, 452.9730, 168.4480],\n", + " [185.9050, 449.6480, 170.2580],\n", + " [182.8890, 448.8910, 172.4330],\n", + " [183.5680, 448.6030, 176.1630],\n", + " [181.3330, 447.5400, 179.0590],\n", + " [182.7340, 447.5270, 182.5670],\n", + " [183.3280, 449.2260, 185.8920],\n", + " [184.8760, 452.6980, 185.6990],\n", + " [185.7140, 455.4170, 188.2030],\n", + " [182.9420, 457.9530, 188.8300],\n", + " [183.2930, 461.5650, 189.9350],\n", + " [182.7580, 462.1320, 193.6660],\n", + " [180.0620, 464.7490, 193.1030],\n", + " [176.4120, 463.9030, 192.5790],\n", + " [177.1550, 460.1730, 192.6930],\n", + " [173.8180, 459.5980, 194.4390],\n", + " [172.0770, 461.1030, 191.4040],\n", + " [173.6950, 458.5410, 189.0910],\n", + " [171.0060, 456.0190, 188.1270],\n", + " [170.8210, 453.3390, 185.4210],\n", + " [170.0180, 454.8270, 182.0350],\n", + " [171.8690, 458.1080, 182.6590],\n", + " [174.2320, 459.6520, 180.1210],\n", + " [177.8640, 459.9130, 181.2230],\n", + " [180.8780, 461.8410, 179.9490],\n", + " [184.5650, 461.8070, 180.8430],\n", + " [186.0650, 464.7990, 182.6440],\n", + " [189.5780, 466.2740, 182.6170],\n", + " [190.7120, 463.6340, 185.1390],\n", + " [189.2980, 460.6630, 183.2290],\n", + " [186.3560, 460.3000, 185.6240],\n", + " [182.7840, 459.6590, 184.5210],\n", + " [180.2130, 462.3320, 185.3590],\n", + " [176.5320, 462.8410, 184.6140],\n", + " [175.8580, 465.0300, 181.5790],\n", + " [178.1930, 465.7110, 174.9000],\n", + " [180.9150, 464.1190, 172.7670],\n", + " [181.2510, 460.5420, 174.1130],\n", + " [178.4430, 457.9660, 174.2140],\n", + " [178.5420, 456.4790, 177.7180],\n", + " [175.4730, 455.1590, 179.5500],\n", + " [175.4670, 454.0690, 183.1870],\n", + " [174.1210, 450.5430, 183.6830],\n", + " [173.9850, 450.6340, 187.5030],\n", + " [174.3640, 452.9240, 190.5240],\n", + " [177.5140, 454.2200, 192.1820],\n", + " [179.3060, 451.6570, 194.3540],\n", + " [181.4890, 453.2110, 197.0570],\n", + " [184.7390, 451.3110, 197.6330],\n", + " [186.4870, 454.0230, 199.6690],\n", + " [185.5270, 457.3810, 201.1790],\n", + " [186.7910, 459.0050, 197.9610],\n", + " [186.6010, 456.0430, 195.5320],\n", + " [183.3680, 455.3620, 193.6270],\n", + " [182.9110, 452.9430, 190.7280],\n", + " [180.0190, 452.5230, 188.3060],\n", + " [179.0910, 450.0250, 185.5960],\n", + " [178.9850, 451.7840, 182.2280],\n", + " [179.0510, 451.0080, 178.5100],\n", + " [181.0530, 453.1550, 176.0780],\n", + " [180.1320, 452.7170, 172.4060],\n", + " [182.0570, 455.4530, 170.6120],\n", + " [181.8140, 459.1820, 170.0770],\n", + " [178.5990, 461.0580, 169.3130],\n", + " [177.7620, 463.8650, 166.9020]]),\n", " 'residue_ids': tensor([ 4., 4., 4., ..., 182., 182., 182.]),\n", " 'chain_ids': tensor([0., 0., 0., ..., 1., 1., 1.])},\n", " 'id': '8phr__X4_UNDEFINED--8phr__W4_UNDEFINED',\n", @@ -906,7 +1568,7 @@ " 'target_id': '8phr__X4_UNDEFINED-R--8phr__W4_UNDEFINED-L'}" ] }, - "execution_count": 3, + "execution_count": 15, "metadata": {}, "output_type": "execute_result" } @@ -918,7 +1580,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 16, "id": "4a6f64b4-f027-4286-b444-68cd9f6b59a4", "metadata": {}, "outputs": [ @@ -928,7 +1590,7 @@ "torch.Size([1316, 3])" ] }, - "execution_count": 10, + "execution_count": 16, "metadata": {}, "output_type": "execute_result" } @@ -945,7 +1607,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 17, "id": "01025b2b-1962-43b3-8c4e-a33b6a3d6231", "metadata": {}, "outputs": [ @@ -956,7 +1618,7 @@ "Help on class PinderDataset in module pinder.core.loader.dataset:\n", "\n", "class PinderDataset(torch.utils.data.dataset.Dataset)\n", - " | PinderDataset(split: 'str | None' = None, index: 'pd.DataFrame | None' = None, metadata: 'pd.DataFrame | None' = None, monomer_priority: 'str' = 'holo', base_filters: 'list[PinderFilterBase]' = [], sub_filters: 'list[PinderFilterSubBase]' = [], structure_filters: 'list[StructureFilter]' = [], structure_transforms_target: 'list[StructureTransform]' = [], structure_transforms_feature: 'list[StructureTransform]' = [], transform: 'Callable[[Structure], torch.Tensor | dict[str, torch.Tensor]]' = <function structure2tensor_transform at 0x1e6b9a4d0>, target_transform: 'Callable[[Structure], torch.Tensor | dict[str, torch.Tensor]]' = <function structure2tensor_transform at 0x1e6b9a4d0>, ids: 'list[str] | None' = None, fallback_to_holo: 'bool' = True, use_canonical_apo: 'bool' = True, crop_equal_monomer_shapes: 'bool' = True, index_query: 'str | None' = None, metadata_query: 'str | None' = None, pre_specified_monomers: 'dict[str, str] | pd.DataFrame | None' = None, **kwargs: 'Any') -> 'None'\n", + " | PinderDataset(split: 'str | None' = None, index: 'pd.DataFrame | None' = None, metadata: 'pd.DataFrame | None' = None, monomer_priority: 'str' = 'holo', base_filters: 'list[PinderFilterBase]' = [], sub_filters: 'list[PinderFilterSubBase]' = [], structure_filters: 'list[StructureFilter]' = [], structure_transforms_target: 'list[StructureTransform]' = [], structure_transforms_feature: 'list[StructureTransform]' = [], transform: 'Callable[[Structure], torch.Tensor | dict[str, torch.Tensor]]' = <function structure2tensor_transform at 0x1f9f84d30>, target_transform: 'Callable[[Structure], torch.Tensor | dict[str, torch.Tensor]]' = <function structure2tensor_transform at 0x1f9f84d30>, ids: 'list[str] | None' = None, fallback_to_holo: 'bool' = True, use_canonical_apo: 'bool' = True, crop_equal_monomer_shapes: 'bool' = True, index_query: 'str | None' = None, metadata_query: 'str | None' = None, pre_specified_monomers: 'dict[str, str] | pd.DataFrame | None' = None, **kwargs: 'Any') -> 'None'\n", " | \n", " | Method resolution order:\n", " | PinderDataset\n", @@ -968,7 +1630,7 @@ " | \n", " | __getitem__(self, idx: 'int') -> 'dict[str, dict[str, torch.Tensor] | torch.Tensor]'\n", " | \n", - " | __init__(self, split: 'str | None' = None, index: 'pd.DataFrame | None' = None, metadata: 'pd.DataFrame | None' = None, monomer_priority: 'str' = 'holo', base_filters: 'list[PinderFilterBase]' = [], sub_filters: 'list[PinderFilterSubBase]' = [], structure_filters: 'list[StructureFilter]' = [], structure_transforms_target: 'list[StructureTransform]' = [], structure_transforms_feature: 'list[StructureTransform]' = [], transform: 'Callable[[Structure], torch.Tensor | dict[str, torch.Tensor]]' = <function structure2tensor_transform at 0x1e6b9a4d0>, target_transform: 'Callable[[Structure], torch.Tensor | dict[str, torch.Tensor]]' = <function structure2tensor_transform at 0x1e6b9a4d0>, ids: 'list[str] | None' = None, fallback_to_holo: 'bool' = True, use_canonical_apo: 'bool' = True, crop_equal_monomer_shapes: 'bool' = True, index_query: 'str | None' = None, metadata_query: 'str | None' = None, pre_specified_monomers: 'dict[str, str] | pd.DataFrame | None' = None, **kwargs: 'Any') -> 'None'\n", + " | __init__(self, split: 'str | None' = None, index: 'pd.DataFrame | None' = None, metadata: 'pd.DataFrame | None' = None, monomer_priority: 'str' = 'holo', base_filters: 'list[PinderFilterBase]' = [], sub_filters: 'list[PinderFilterSubBase]' = [], structure_filters: 'list[StructureFilter]' = [], structure_transforms_target: 'list[StructureTransform]' = [], structure_transforms_feature: 'list[StructureTransform]' = [], transform: 'Callable[[Structure], torch.Tensor | dict[str, torch.Tensor]]' = <function structure2tensor_transform at 0x1f9f84d30>, target_transform: 'Callable[[Structure], torch.Tensor | dict[str, torch.Tensor]]' = <function structure2tensor_transform at 0x1f9f84d30>, ids: 'list[str] | None' = None, fallback_to_holo: 'bool' = True, use_canonical_apo: 'bool' = True, crop_equal_monomer_shapes: 'bool' = True, index_query: 'str | None' = None, metadata_query: 'str | None' = None, pre_specified_monomers: 'dict[str, str] | pd.DataFrame | None' = None, **kwargs: 'Any') -> 'None'\n", " | Initialize self. See help(type(self)) for accurate signature.\n", " | \n", " | __len__(self) -> 'int'\n", @@ -1039,7 +1701,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 18, "id": "fcb50bed-7e0a-4d4b-a1d7-6bc003161aab", "metadata": {}, "outputs": [ @@ -1047,10 +1709,11 @@ "name": "stderr", "output_type": "stream", "text": [ - "2024-09-23 15:44:49,788 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=8, items=8\n", - "2024-09-23 15:44:50,077 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 0.29s\n", - "2024-09-23 15:44:50,350 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=5, items=5\n", - "2024-09-23 15:44:50,645 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 0.30s\n" + "2024-09-25 16:23:26,740 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=5, items=5\n", + "2024-09-25 16:23:27,432 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=5, items=5\n", + "2024-09-25 16:23:27,691 | pinder.core.loader.filters:436 | WARNING : Skipping FilterSubRmsds on 3muw__B33_P03316--3muw__B6_P03316 as holo monomers have been filtered out\n", + "2024-09-25 16:23:27,789 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=5, items=5\n", + "2024-09-25 16:23:28,201 | pinder.core.loader.structure:595 | ERROR : no common residues found! 2in2__A1_P03303--2rs3__C39_P03303-L\n" ] } ], @@ -1110,7 +1773,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 27, "id": "0de517fc-6e7f-4682-af48-980d27638b21", "metadata": {}, "outputs": [ @@ -1119,7 +1782,7 @@ "output_type": "stream", "text": [ "Processing...\n", - "2024-09-23 15:45:00,968 | pinder.core.loader.dataset:541 | INFO : Finished processing, only 5 systems\n", + "2024-09-25 16:29:35,300 | pinder.core.loader.dataset:543 | INFO : Finished processing, only 5 systems\n", "Done!\n" ] }, @@ -1129,7 +1792,7 @@ "PPIDataset(5)" ] }, - "execution_count": 6, + "execution_count": 27, "metadata": {}, "output_type": "execute_result" } @@ -1157,7 +1820,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 28, "id": "5392a214-7426-4be2-bc81-a00702c82c55", "metadata": {}, "outputs": [ @@ -1178,12 +1841,12 @@ " chain=[1],\n", " },\n", " ligand_atom={\n", - " x=[1198, 12],\n", + " x=[1198, 1],\n", " pos=[1198, 3],\n", " edge_index=[2, 11980],\n", " },\n", " receptor_atom={\n", - " x=[1358, 12],\n", + " x=[1358, 1],\n", " pos=[1358, 3],\n", " edge_index=[2, 13580],\n", " },\n", @@ -1194,7 +1857,7 @@ ")" ] }, - "execution_count": 7, + "execution_count": 28, "metadata": {}, "output_type": "execute_result" } @@ -1220,7 +1883,66 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 29, + "id": "7948dcbd-fcb9-422e-89be-fbf3d1c4f13c", + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "{'ligand_residue': 0,\n", + " 'receptor_residue': 0,\n", + " 'ligand_atom': 1,\n", + " 'receptor_atom': 1,\n", + " 'pdb': 0}" + ] + }, + "execution_count": 29, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "data_item.num_node_features" + ] + }, + { + "cell_type": "code", + "execution_count": 30, + "id": "ff827dac-c7e5-4e81-99ff-ff9e67c3cbbe", + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "{'x': tensor([[0.],\n", + " [1.],\n", + " [2.],\n", + " ...,\n", + " [2.],\n", + " [3.],\n", + " [8.]]), 'pos': tensor([[194.1170, 453.4250, 194.9300],\n", + " [195.1700, 454.0210, 194.1160],\n", + " [196.0630, 452.9460, 193.5050],\n", + " ...,\n", + " [177.4130, 465.0800, 167.7550],\n", + " [176.8000, 464.9490, 168.8150],\n", + " [176.7910, 463.7350, 165.7380]]), 'edge_index': tensor([[ 1, 4, 2, ..., 1186, 1187, 1182],\n", + " [ 0, 0, 0, ..., 1197, 1197, 1197]])}" + ] + }, + "execution_count": 30, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "data_item[\"ligand_atom\"]" + ] + }, + { + "cell_type": "code", + "execution_count": 31, "id": "6fa927a9-cde9-4f32-acf9-f5c989b32966", "metadata": {}, "outputs": [ @@ -1241,12 +1963,12 @@ " chain=[1],\n", " },\n", " ligand_atom={\n", - " x=[1198, 12],\n", + " x=[1198, 1],\n", " pos=[1198, 3],\n", " edge_index=[2, 11980],\n", " },\n", " receptor_atom={\n", - " x=[1358, 12],\n", + " x=[1358, 1],\n", " pos=[1358, 3],\n", " edge_index=[2, 13580],\n", " },\n", @@ -1257,7 +1979,7 @@ ")" ] }, - "execution_count": 8, + "execution_count": 31, "metadata": {}, "output_type": "execute_result" } @@ -1271,7 +1993,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 32, "id": "75e13a76-cf9f-47dd-90c2-370c0652074f", "metadata": {}, "outputs": [ @@ -1327,7 +2049,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 33, "id": "ce872929-1706-4a09-ad67-63457511099f", "metadata": { "scrolled": true @@ -1350,19 +2072,19 @@ " chain=[1],\n", " },\n", " ligand_atom={\n", - " x=[1032, 12],\n", + " x=[1032, 1],\n", " pos=[1032, 3],\n", " edge_index=[2, 10320],\n", " },\n", " receptor_atom={\n", - " x=[1441, 12],\n", + " x=[1441, 1],\n", " pos=[1441, 3],\n", " edge_index=[2, 14410],\n", " }\n", ")" ] }, - "execution_count": 10, + "execution_count": 33, "metadata": {}, "output_type": "execute_result" } @@ -1389,8 +2111,8 @@ "expected_num_feats = {\n", " 'ligand_residue': 0,\n", " 'receptor_residue': 0,\n", - " 'ligand_atom': 12,\n", - " 'receptor_atom': 12\n", + " 'ligand_atom': 1,\n", + " 'receptor_atom': 1\n", "}\n", "for k, v in expected_num_feats.items():\n", " assert holo_data.num_node_features[k] == v\n", @@ -1404,7 +2126,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 34, "id": "b2913a8f-2992-46de-ab74-1fca594d6088", "metadata": {}, "outputs": [ @@ -1425,19 +2147,19 @@ " chain=[1],\n", " },\n", " ligand_atom={\n", - " x=[1350, 12],\n", + " x=[1350, 1],\n", " pos=[1350, 3],\n", " edge_index=[2, 13500],\n", " },\n", " receptor_atom={\n", - " x=[1710, 12],\n", + " x=[1710, 1],\n", " pos=[1710, 3],\n", " edge_index=[2, 17100],\n", " }\n", ")" ] }, - "execution_count": 11, + "execution_count": 34, "metadata": {}, "output_type": "execute_result" } @@ -1457,8 +2179,8 @@ "expected_num_feats = {\n", " 'ligand_residue': 0,\n", " 'receptor_residue': 0,\n", - " 'ligand_atom': 12,\n", - " 'receptor_atom': 12\n", + " 'ligand_atom': 1,\n", + " 'receptor_atom': 1,\n", "}\n", "for k, v in expected_num_feats.items():\n", " assert apo_data.num_node_features[k] == v\n", @@ -1483,17 +2205,17 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 35, "id": "29ca7612-8a1b-4cf7-a790-cc2b5b26e7e5", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "<torch_geometric.loader.dataloader.DataLoader at 0x1fb60f550>" + "<torch_geometric.loader.dataloader.DataLoader at 0x20265ebf0>" ] }, - "execution_count": 12, + "execution_count": 35, "metadata": {}, "output_type": "execute_result" } @@ -1516,7 +2238,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 36, "id": "66f9a0ef-1c1f-47bd-ba86-f2c3340c34ec", "metadata": {}, "outputs": [ @@ -1526,7 +2248,7 @@ "PPIDataset(5)" ] }, - "execution_count": 13, + "execution_count": 36, "metadata": {}, "output_type": "execute_result" } @@ -1572,7 +2294,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 37, "id": "bb468005-5ffb-45e8-9f03-f073cb6f7527", "metadata": {}, "outputs": [], @@ -1696,7 +2418,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 38, "id": "def48617-4288-452f-af9e-55f3289d7788", "metadata": {}, "outputs": [ @@ -1719,7 +2441,7 @@ " ))" ] }, - "execution_count": 15, + "execution_count": 38, "metadata": {}, "output_type": "execute_result" } @@ -1744,7 +2466,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 39, "id": "c13a072b-ca2b-47bb-9ed1-2a88885aad93", "metadata": {}, "outputs": [], @@ -1755,20 +2477,20 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 40, "id": "84f1a37c-4ac5-4086-bfc8-260bc8f2de8d", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "(array([[-19.331, 10.568, 4.591],\n", - " [-18.082, 10.305, 3.883],\n", - " [-16.867, 10.692, 4.727],\n", + "(array([[-12.6210985, -9.128864 , 17.258345 ],\n", + " [-13.660538 , -8.840154 , 16.265753 ],\n", + " [-13.38884 , -7.5286074, 15.524057 ],\n", " ...,\n", - " [ 13.363, 11.96 , -6.092],\n", - " [ 15.081, 9.028, -5.759],\n", - " [ 12.459, 10.17 , -6.767]], dtype=float32),\n", + " [ 7.1754823, -19.776093 , 21.191608 ],\n", + " [ 9.592421 , -19.601936 , 19.197937 ],\n", + " [ 9.432583 , -17.757698 , 20.458267 ]], dtype=float32),\n", " array([[-13.215324 , -11.076905 , 15.214827 ],\n", " [-14.133494 , -10.301853 , 14.386162 ],\n", " [-13.614427 , -8.882867 , 14.150835 ],\n", @@ -1778,7 +2500,7 @@ " [ 7.0213795, -15.329907 , 18.152586 ]], dtype=float32))" ] }, - "execution_count": 17, + "execution_count": 40, "metadata": {}, "output_type": "execute_result" } @@ -1800,17 +2522,17 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 41, "id": "8c495bfe-3aa8-4544-b94e-3bcb6e149dba", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "<torch.utils.data.sampler.WeightedRandomSampler at 0x1fb60c5b0>" + "<torch.utils.data.sampler.WeightedRandomSampler at 0x200146500>" ] }, - "execution_count": 18, + "execution_count": 41, "metadata": {}, "output_type": "execute_result" } @@ -1855,7 +2577,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 42, "id": "cc7f7dc6-f01b-4d52-a4b5-e0dd19d68fe4", "metadata": {}, "outputs": [ @@ -1863,30 +2585,29 @@ "name": "stderr", "output_type": "stream", "text": [ - "2024-09-23 15:45:18,411 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=2, items=2\n", - "2024-09-23 15:45:18,707 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 0.30s\n" + "2024-09-25 16:31:53,018 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=1, items=1\n" ] }, { "data": { "text/plain": [ - "(tensor([[[37.2095, 8.0406, 72.5705],\n", - " [36.1588, 7.1319, 72.1171],\n", - " [35.5337, 7.6365, 70.8136],\n", + "(tensor([[[-44.9000, -13.0073, 3.9172],\n", + " [-44.8239, -14.3579, 3.3580],\n", + " [-44.6508, -14.3793, 1.8236],\n", " ...,\n", - " [40.5402, 3.1015, 96.2705],\n", - " [39.7635, 4.0274, 94.4056],\n", - " [39.5253, 3.4914, 95.5608]]]),\n", - " tensor([[[29.6114, 7.0679, 73.2040],\n", - " [30.3889, 6.7263, 72.0241],\n", - " [31.5403, 7.6852, 71.7204],\n", + " [-41.4551, -36.3519, 2.2509],\n", + " [-42.4746, -36.6704, 1.1575],\n", + " [-43.0579, -35.4178, 0.6238]]]),\n", + " tensor([[[-47.9769, -9.1210, 3.2415],\n", + " [-47.0982, -9.0194, 2.0802],\n", + " [-46.2697, -10.2855, 1.8961],\n", " ...,\n", - " [35.5366, -4.1661, 95.5403],\n", - " [34.4548, -4.3722, 96.2721],\n", - " [35.4055, -4.2196, 94.2242]]]))" + " [-35.2793, -42.3302, 2.4468],\n", + " [-34.2672, -43.3448, 1.9357],\n", + " [-34.0432, -43.2068, 0.4709]]]))" ] }, - "execution_count": 19, + "execution_count": 42, "metadata": {}, "output_type": "execute_result" } @@ -1917,17 +2638,17 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 43, "id": "fe172bdd-09eb-45ed-bc51-28202e5158b6", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "<torch.utils.data.dataloader.DataLoader at 0x1fb6404c0>" + "<torch.utils.data.dataloader.DataLoader at 0x1ff3c7850>" ] }, - "execution_count": 20, + "execution_count": 43, "metadata": {}, "output_type": "execute_result" } @@ -1974,7 +2695,7 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 44, "id": "b7602385-2893-4c09-afc3-6a10433c7ada", "metadata": {}, "outputs": [ @@ -1982,30 +2703,29 @@ "name": "stderr", "output_type": "stream", "text": [ - "2024-09-23 15:45:25,616 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=2, items=2\n", - "2024-09-23 15:45:25,901 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 0.28s\n" + "2024-09-25 16:31:59,644 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=10, items=15\n" ] }, { "data": { "text/plain": [ - "(tensor([[[226.8320, 169.1410, 206.0350],\n", - " [226.2280, 168.7600, 207.3040],\n", - " [227.3330, 168.7310, 208.3410],\n", + "(tensor([[[ 70.4514, -6.9500, 29.3370],\n", + " [ 69.9283, -6.6501, 30.6817],\n", + " [ 68.9000, -5.5045, 30.7376],\n", " ...,\n", - " [205.7270, 143.0570, 181.4730],\n", - " [206.4940, 142.1170, 181.2560],\n", - " [204.8250, 144.8850, 182.9280]]]),\n", - " tensor([[[226.8320, 169.1410, 206.0350],\n", - " [226.2280, 168.7600, 207.3040],\n", - " [227.3330, 168.7310, 208.3410],\n", + " [ 67.3974, -52.2529, 39.1974],\n", + " [ 65.9296, -51.8409, 39.2738],\n", + " [ 68.1239, -51.1915, 38.3785]]]),\n", + " tensor([[[ 68.1820, -6.3490, 28.9990],\n", + " [ 68.8730, -5.0680, 28.9240],\n", + " [ 68.3080, -4.1750, 27.8270],\n", " ...,\n", - " [205.7270, 143.0570, 181.4730],\n", - " [206.4940, 142.1170, 181.2560],\n", - " [204.8250, 144.8850, 182.9280]]]))" + " [ 68.4140, -52.5670, 40.9670],\n", + " [ 67.2560, -52.0200, 41.7820],\n", + " [ 69.1350, -51.4480, 40.2400]]]))" ] }, - "execution_count": 21, + "execution_count": 44, "metadata": {}, "output_type": "execute_result" } @@ -2035,7 +2755,7 @@ }, { "cell_type": "code", - "execution_count": 22, + "execution_count": 45, "id": "cce6f303-99e7-4d42-805d-72f39d9c61b4", "metadata": {}, "outputs": [ @@ -2074,7 +2794,7 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": 46, "id": "4fbf640e-3348-439c-a8d0-ae4bb2c86dc3", "metadata": {}, "outputs": [ @@ -2082,48 +2802,45 @@ "name": "stderr", "output_type": "stream", "text": [ - "2024-09-23 15:45:27,403 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=10, items=169\n", - "2024-09-23 15:45:30,832 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 3.43s\n", - "2024-09-23 15:45:31,248 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=5, items=5\n", - "2024-09-23 15:45:31,445 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 0.20s\n" + "2024-09-25 16:32:03,705 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=5, items=5\n" ] }, { "data": { "text/plain": [ - "(tensor([[[ -20.7939, 16.2259, 28.9029],\n", - " [ -20.3926, 16.6965, 27.5845],\n", - " [ -19.1855, 15.8943, 27.0868],\n", - " ...,\n", - " [ -3.5845, 7.8611, 8.0106],\n", - " [ -6.1668, 6.1222, 8.1268],\n", - " [ -5.3776, 5.6234, 9.3411]],\n", - " \n", - " [[ 5.1565, -8.1926, 18.2980],\n", - " [ 4.2819, -7.6345, 19.3660],\n", - " [ 3.1236, -8.5983, 19.6553],\n", + "(tensor([[[ 239.4760, 376.4950, 244.9000],\n", + " [ 238.9000, 377.8010, 245.2000],\n", + " [ 237.8190, 377.6950, 246.2690],\n", " ...,\n", " [-100.0000, -100.0000, -100.0000],\n", " [-100.0000, -100.0000, -100.0000],\n", - " [-100.0000, -100.0000, -100.0000]]]),\n", - " tensor([[[ -20.9630, 15.4670, 28.5250],\n", - " [ -20.3050, 16.5060, 27.7270],\n", - " [ -18.9740, 15.9710, 27.1630],\n", - " ...,\n", - " [ -0.7240, -5.2800, 4.0790],\n", - " [ -0.9060, -6.4480, 4.9780],\n", - " [ -2.0090, -6.1390, 5.9730]],\n", + " [-100.0000, -100.0000, -100.0000]],\n", " \n", - " [[ 5.0550, -8.1610, 18.0120],\n", - " [ 4.3920, -7.8030, 19.2620],\n", - " [ 3.3010, -8.8210, 19.5290],\n", + " [[ 31.4372, -103.9317, 46.1102],\n", + " [ 32.4872, -104.3322, 45.1591],\n", + " [ 32.0485, -104.2013, 43.6919],\n", + " ...,\n", + " [ 10.1052, -129.8667, 21.4974],\n", + " [ 13.3537, -129.0618, 23.8115],\n", + " [ 12.3266, -127.9412, 23.6833]]]),\n", + " tensor([[[ 239.4760, 376.4950, 244.9000],\n", + " [ 238.9000, 377.8010, 245.2000],\n", + " [ 237.8190, 377.6950, 246.2690],\n", " ...,\n", " [-100.0000, -100.0000, -100.0000],\n", " [-100.0000, -100.0000, -100.0000],\n", - " [-100.0000, -100.0000, -100.0000]]]))" + " [-100.0000, -100.0000, -100.0000]],\n", + " \n", + " [[ 31.9020, -105.5020, 46.4300],\n", + " [ 31.2640, -104.3600, 45.7100],\n", + " [ 31.5600, -104.3840, 44.1990],\n", + " ...,\n", + " [ 8.6080, -130.5800, 20.6600],\n", + " [ 7.2110, -130.2610, 21.1240],\n", + " [ 7.2070, -128.8110, 21.6200]]]))" ] }, - "execution_count": 23, + "execution_count": 46, "metadata": {}, "output_type": "execute_result" } diff --git a/examples/pinder-mlsb.ipynb b/examples/pinder-mlsb.ipynb index fde36cd..a51a6dd 100644 --- a/examples/pinder-mlsb.ipynb +++ b/examples/pinder-mlsb.ipynb @@ -232,20 +232,20 @@ { "data": { "text/plain": [ - "({'native': 'pdbs/8ir7__S1_P51765--8ir7__AA1_Q7DGD4.pdb',\n", - " 'holo_R': 'pdbs/8ir7__S1_P51765-R.pdb',\n", - " 'holo_L': 'pdbs/8ir7__AA1_Q7DGD4-L.pdb',\n", - " 'predicted_R': 'pdbs/af__P51765.pdb',\n", - " 'predicted_L': 'pdbs/af__Q7DGD4.pdb',\n", + "({'native': 'pdbs/6iat__C36_Q859I3--6iat__C40_Q859I3.pdb',\n", + " 'holo_R': 'pdbs/6iat__C36_Q859I3-R.pdb',\n", + " 'holo_L': 'pdbs/6iat__C40_Q859I3-L.pdb',\n", + " 'predicted_R': '',\n", + " 'predicted_L': '',\n", " 'apo_R': '',\n", " 'apo_L': '',\n", " 'apo_R_alt': [],\n", " 'apo_L_alt': []},\n", - " {'native': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/8ir7__S1_P51765--8ir7__AA1_Q7DGD4.pdb'),\n", - " 'holo_R': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/8ir7__S1_P51765-R.pdb'),\n", - " 'holo_L': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/8ir7__AA1_Q7DGD4-L.pdb'),\n", - " 'predicted_R': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/af__P51765.pdb'),\n", - " 'predicted_L': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/af__Q7DGD4.pdb'),\n", + " {'native': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/6iat__C36_Q859I3--6iat__C40_Q859I3.pdb'),\n", + " 'holo_R': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/6iat__C36_Q859I3-R.pdb'),\n", + " 'holo_L': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/6iat__C40_Q859I3-L.pdb'),\n", + " 'predicted_R': '',\n", + " 'predicted_L': '',\n", " 'apo_R': '',\n", " 'apo_L': '',\n", " 'apo_R_alt': [],\n", @@ -309,11 +309,11 @@ { "data": { "text/plain": [ - "{'native': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/6rao__H2_Q6HAD2--6rao__F1_Q6HAD0.pdb'),\n", - " 'holo_R_pdb': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/6rao__H2_Q6HAD2-R.pdb'),\n", - " 'holo_L_pdb': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/6rao__F1_Q6HAD0-L.pdb'),\n", - " 'predicted_R_pdb': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/af__Q6HAD2.pdb'),\n", - " 'predicted_L_pdb': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/af__Q6HAD0.pdb'),\n", + "{'native': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/7mu1__A37_Q9WZP2--7mu1__A48_Q9WZP2.pdb'),\n", + " 'holo_R_pdb': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/7mu1__A37_Q9WZP2-R.pdb'),\n", + " 'holo_L_pdb': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/7mu1__A48_Q9WZP2-L.pdb'),\n", + " 'predicted_R_pdb': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/af__Q9WZP2.pdb'),\n", + " 'predicted_L_pdb': PosixPath('/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/af__Q9WZP2.pdb'),\n", " 'apo_R_pdb': '',\n", " 'apo_L_pdb': '',\n", " 'apo_R_pdbs': [''],\n", @@ -359,7 +359,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 5, "id": "575049d7-e550-4b59-98db-0d7b045e391a", "metadata": {}, "outputs": [ @@ -367,23 +367,22 @@ "name": "stderr", "output_type": "stream", "text": [ - "2024-09-05 16:50:41,522 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=7, items=7\n", - "2024-09-05 16:50:41,943 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 0.42s\n" + "2024-09-25 16:32:28,261 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=7, items=7\n" ] }, { "data": { "text/plain": [ "Structure(\n", - " filepath=/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/6rao__H2_Q6HAD2-R.pdb,\n", + " filepath=/Users/danielkovtun/.local/share/pinder/2024-02/pdbs/7mu1__A37_Q9WZP2-R.pdb,\n", " uniprot_map=None,\n", - " pinder_id='6rao__H2_Q6HAD2-R',\n", - " atom_array=<class 'biotite.structure.AtomArray'> with shape (1737,),\n", + " pinder_id='7mu1__A37_Q9WZP2-R',\n", + " atom_array=<class 'biotite.structure.AtomArray'> with shape (2141,),\n", " pdb_engine='fastpdb',\n", ")" ] }, - "execution_count": 6, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } @@ -402,26 +401,26 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 6, "id": "a31f5f1d-7fac-4cde-a1f1-e151afeb17e7", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "array([[ 30.417, -28.254, 74.132],\n", - " [ 31.12 , -28.716, 75.321],\n", - " [ 32.127, -29.81 , 74.98 ],\n", - " [ 32.824, -29.725, 73.966],\n", - " [ 30.125, -29.23 , 76.361],\n", - " [ 29.491, -30.413, 75.911],\n", - " [ 32.233, -30.777, 75.9 ],\n", - " [ 32.949, -32.052, 75.825],\n", - " [ 34.468, -31.925, 75.898],\n", - " [ 35.158, -32.93 , 76.097]], dtype=float32)" + "array([[150.746, 157.31 , 247.742],\n", + " [150.862, 158.701, 248.154],\n", + " [150.855, 158.698, 249.688],\n", + " [150.926, 157.633, 250.298],\n", + " [149.724, 159.536, 247.537],\n", + " [149.737, 161.039, 247.82 ],\n", + " [148.383, 161.934, 247.037],\n", + " [146.994, 161.391, 248.026],\n", + " [150.77 , 159.87 , 250.317],\n", + " [150.906, 159.979, 251.762]], dtype=float32)" ] }, - "execution_count": 7, + "execution_count": 6, "metadata": {}, "output_type": "execute_result" } @@ -432,17 +431,17 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 7, "id": "3c9bceba-819b-4d32-b95a-86239ad6e1bf", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "'SLLERGLSKLTLNAWKDREGKIPAGSMSAMYNPETIQLDYQTRFDTEDTINTASQSNRYVISEPVGLNLTLLFDSQMPGNTTPIETQLAMLKSLCAVDAATGSPYFLRITWGKMRWENKGWFAGRARDLSVTYTLFDRDATPLRATVQLSLVADESFVIQQSLKTQSAPDRALVSVPDLASLPLLALSAGGVLASSVDYLSLAWDNDLDNLDDFQTGDFLRATK'" + "'MEFLKRSFAPLTEKQWQEIDNRAREIFKTQLYGRKFVDVEGPYGWEYAAHPLGEVEVLSDENEVVKWGLRKSLPLIELRATFTLDLWELDNLERGKPNVDLSSLEETVRKVAEFEDEVIFRGCEKSGVKGLLSFEERKIECGSTPKDLLEAIVRALSIFSKDGIEGPYTLVINTDRWINFLKEEAGHYPLEKRVEECLRGGKIITTPRIEDALVVSERGGDFKLILGQDLSIGYEDREKDAVRLFITETFTFQVVNPEALILLK'" ] }, - "execution_count": 8, + "execution_count": 7, "metadata": {}, "output_type": "execute_result" } @@ -453,17 +452,17 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 8, "id": "0c11d67a-c186-4710-bf4d-3589b1fe483f", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "'>6rao__H2_Q6HAD2-R\\nSLLERGLSKLTLNAWKDREGKIPAGSMSAMYNPETIQLDYQTRFDTEDTINTASQSNRYVISEPVGLNLTLLFDSQMPGNTTPIETQLAMLKSLCAVDAATGSPYFLRITWGKMRWENKGWFAGRARDLSVTYTLFDRDATPLRATVQLSLVADESFVIQQSLKTQSAPDRALVSVPDLASLPLLALSAGGVLASSVDYLSLAWDNDLDNLDDFQTGDFLRATK'" + "'>7mu1__A37_Q9WZP2-R\\nMEFLKRSFAPLTEKQWQEIDNRAREIFKTQLYGRKFVDVEGPYGWEYAAHPLGEVEVLSDENEVVKWGLRKSLPLIELRATFTLDLWELDNLERGKPNVDLSSLEETVRKVAEFEDEVIFRGCEKSGVKGLLSFEERKIECGSTPKDLLEAIVRALSIFSKDGIEGPYTLVINTDRWINFLKEEAGHYPLEKRVEECLRGGKIITTPRIEDALVVSERGGDFKLILGQDLSIGYEDREKDAVRLFITETFTFQVVNPEALILLK'" ] }, - "execution_count": 9, + "execution_count": 8, "metadata": {}, "output_type": "execute_result" } @@ -474,7 +473,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 9, "id": "3fd4c712-625c-4f80-ace4-b4c1a1b8a600", "metadata": {}, "outputs": [], @@ -516,7 +515,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 10, "id": "ee6840bb-f6db-4911-8bef-a900bf4a9c8e", "metadata": {}, "outputs": [ @@ -690,7 +689,7 @@ ")" ] }, - "execution_count": 11, + "execution_count": 10, "metadata": {}, "output_type": "execute_result" } @@ -736,7 +735,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 11, "id": "16e07a40-bc85-412d-bd52-858e4ce8d05b", "metadata": {}, "outputs": [ @@ -759,7 +758,7 @@ " ))" ] }, - "execution_count": 12, + "execution_count": 11, "metadata": {}, "output_type": "execute_result" } @@ -782,7 +781,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 12, "id": "764dae70-980e-4cd3-9393-78a26bcf6136", "metadata": {}, "outputs": [ @@ -792,7 +791,7 @@ "'PLGSMFERFTDRARRVVVLAQEEARMLNHNYIGTEHILLGLIHEGEGVAAKSLESLGISLEGVRSQVEEIIGQGQQAPSGHIPFTPRAKKVLELSLREALQLGHNYIGTEHILLGLIREGEGVAAQVLVKLGAELTRVRQQVIQLLSGY'" ] }, - "execution_count": 13, + "execution_count": 12, "metadata": {}, "output_type": "execute_result" } @@ -803,7 +802,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 13, "id": "b0d94de4-68bb-456f-9ac5-a6c93ad79613", "metadata": {}, "outputs": [ @@ -817,7 +816,7 @@ " [-14.842, -18.494, -12.077]], dtype=float32)" ] }, - "execution_count": 14, + "execution_count": 13, "metadata": {}, "output_type": "execute_result" } @@ -836,7 +835,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 14, "id": "a2965877-9130-4b0b-a9a0-e3352cd4d68f", "metadata": {}, "outputs": [ @@ -852,7 +851,7 @@ "])" ] }, - "execution_count": 15, + "execution_count": 14, "metadata": {}, "output_type": "execute_result" } @@ -886,7 +885,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 15, "id": "3e71a783-0929-413a-80e4-8a6ca6f46c74", "metadata": {}, "outputs": [ @@ -896,7 +895,7 @@ "PinderLoader(split=val, monomers=holo, systems=1958)" ] }, - "execution_count": 2, + "execution_count": 15, "metadata": {}, "output_type": "execute_result" } @@ -955,7 +954,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 16, "id": "2fc9dc84-d7ae-4765-82f1-4df75a45fd7f", "metadata": {}, "outputs": [], @@ -971,7 +970,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 17, "id": "4c3200cc-0f42-4737-91a6-a490f2af55ab", "metadata": {}, "outputs": [ @@ -979,7 +978,7 @@ "name": "stderr", "output_type": "stream", "text": [ - " 0%|▉ | 9/1958 [00:02<07:35, 4.28it/s]\n" + " 0%|█ | 9/1958 [00:02<07:39, 4.24it/s]\n" ] } ], @@ -998,7 +997,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 18, "id": "0625b00a-1208-48e6-908d-08de0be3f221", "metadata": {}, "outputs": [ @@ -1008,7 +1007,7 @@ "10" ] }, - "execution_count": 20, + "execution_count": 18, "metadata": {}, "output_type": "execute_result" } @@ -1019,17 +1018,17 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 19, "id": "d9154449-15c6-4095-b3be-6e64721324dc", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "<pinder.core.loader.dataset.PinderDataset at 0x1fdbac640>" + "<pinder.core.loader.dataset.PinderDataset at 0x216abf490>" ] }, - "execution_count": 3, + "execution_count": 19, "metadata": {}, "output_type": "execute_result" } @@ -1090,6 +1089,7 @@ "Each of the `target_complex` and `feature_complex` values are dictionaries with structural properties encoded by the `pinder.core.loader.geodata.structure2tensor` function by default:\n", "* `atom_coordinates`\n", "* `atom_types`\n", + "* `element_types`\n", "* `chain_ids`\n", "* `residue_coordinates`\n", "* `residue_types`\n", @@ -1100,20 +1100,27 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 20, "id": "38ec8e3d-ba0f-4ff2-a8d1-44be72e32ad6", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "{'target_complex': {'atom_types': tensor([[0., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", + "{'target_complex': {'atom_types': tensor([[0.],\n", + " [1.],\n", + " [2.],\n", + " ...,\n", + " [1.],\n", + " [2.],\n", + " [3.]]),\n", + " 'element_types': tensor([[3.],\n", + " [0.],\n", + " [0.],\n", " ...,\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [0., 0., 1., ..., 0., 0., 0.]]),\n", + " [0.],\n", + " [0.],\n", + " [2.]]),\n", " 'residue_types': tensor([[16.],\n", " [16.],\n", " [16.],\n", @@ -1128,22 +1135,351 @@ " [177.7620, 463.8650, 166.9020],\n", " [177.4130, 465.0800, 167.7550],\n", " [176.8000, 464.9490, 168.8150]]),\n", - " 'residue_coordinates': tensor([[131.7500, 429.3090, 163.5360],\n", - " [132.6810, 428.2520, 163.1550],\n", - " [133.5150, 428.6750, 161.9500],\n", - " ...,\n", - " [177.7620, 463.8650, 166.9020],\n", - " [177.4130, 465.0800, 167.7550],\n", - " [176.8000, 464.9490, 168.8150]]),\n", + " 'residue_coordinates': tensor([[132.6810, 428.2520, 163.1550],\n", + " [133.5560, 429.2490, 159.5910],\n", + " [133.8750, 432.8980, 160.6290],\n", + " [136.1110, 431.8050, 163.5130],\n", + " [138.3420, 429.8920, 161.0830],\n", + " [138.5230, 432.9090, 158.7600],\n", + " [139.4710, 435.1730, 161.6750],\n", + " [142.1200, 432.6310, 162.6740],\n", + " [143.5890, 432.7500, 159.1600],\n", + " [143.6190, 436.5600, 159.1540],\n", + " [145.2600, 436.8040, 162.5830],\n", + " [147.8380, 434.1320, 161.7330],\n", + " [148.7390, 435.8920, 158.4790],\n", + " [149.0640, 439.2630, 160.2240],\n", + " [151.2220, 437.7670, 162.9840],\n", + " [153.4710, 435.8030, 160.6120],\n", + " [153.9420, 438.9180, 158.4710],\n", + " [156.1140, 440.2660, 161.3150],\n", + " [158.3330, 437.1860, 161.4250],\n", + " [161.8090, 436.4120, 160.1100],\n", + " [161.1120, 432.8370, 158.9350],\n", + " [157.4020, 432.0710, 159.3930],\n", + " [156.5290, 428.3870, 159.0310],\n", + " [154.0400, 428.1160, 156.1500],\n", + " [153.3520, 424.6590, 154.7510],\n", + " [152.8370, 424.8210, 150.9870],\n", + " [150.9700, 422.4160, 148.7320],\n", + " [153.5900, 422.6860, 145.9670],\n", + " [157.3050, 423.3410, 145.6600],\n", + " [158.4860, 426.6730, 144.2700],\n", + " [160.7730, 427.0880, 141.2590],\n", + " [163.9630, 429.0530, 141.9600],\n", + " [166.4230, 427.4330, 139.5550],\n", + " [167.6170, 430.8330, 138.3250],\n", + " [170.5180, 431.9210, 140.5320],\n", + " [169.7800, 435.6680, 140.3160],\n", + " [167.6790, 437.8790, 142.6110],\n", + " [167.3350, 435.1910, 145.2890],\n", + " [168.9090, 437.3000, 148.0580],\n", + " [166.1860, 439.9440, 148.5750],\n", + " [164.1010, 438.1300, 151.1890],\n", + " [163.0190, 438.8690, 154.7450],\n", + " [164.6750, 435.6560, 155.9860],\n", + " [168.1170, 436.6550, 154.6330],\n", + " [169.8040, 437.0930, 158.0010],\n", + " [173.2680, 438.4850, 158.5750],\n", + " [174.9270, 440.8490, 156.1460],\n", + " [175.9170, 440.8010, 152.5000],\n", + " [179.6060, 441.0910, 153.4330],\n", + " [180.8000, 439.9830, 156.8710],\n", + " [184.2540, 439.9980, 158.4580],\n", + " [185.5840, 437.2970, 160.7670],\n", + " [186.4140, 439.9000, 163.4480],\n", + " [182.9430, 441.4570, 163.7500],\n", + " [181.4930, 442.0910, 167.2100],\n", + " [178.0780, 440.5360, 167.9060],\n", + " [176.1650, 440.9290, 171.1790],\n", + " [173.0530, 438.9530, 172.1310],\n", + " [170.3990, 440.6990, 174.2170],\n", + " [166.7880, 440.0710, 175.2260],\n", + " [164.4480, 442.1010, 173.0340],\n", + " [160.9780, 443.6110, 173.3810],\n", + " [158.8330, 443.9000, 170.2730],\n", + " [160.1820, 442.9360, 166.8360],\n", + " [163.5010, 444.7230, 166.1630],\n", + " [164.6310, 442.4290, 163.3160],\n", + " [166.6330, 444.2560, 160.6240],\n", + " [166.1700, 447.5210, 162.5220],\n", + " [168.1350, 449.9450, 164.6440],\n", + " [168.0040, 449.0470, 168.3240],\n", + " [168.4210, 451.0540, 171.5220],\n", + " [169.0440, 450.0360, 175.1300],\n", + " [166.1650, 450.3680, 177.6100],\n", + " [166.7800, 449.8300, 181.3340],\n", + " [163.8480, 448.9150, 183.5760],\n", + " [163.3500, 443.9770, 187.9750],\n", + " [165.0240, 442.4930, 184.8870],\n", + " [168.1120, 443.0980, 182.7810],\n", + " [168.1280, 445.9210, 180.2050],\n", + " [166.7230, 445.0130, 176.8030],\n", + " [167.0690, 446.1330, 173.1930],\n", + " [164.0790, 447.8390, 171.5780],\n", + " [163.4630, 449.0630, 168.0350],\n", + " [164.4160, 452.7320, 168.0130],\n", + " [166.7460, 455.3190, 166.5790],\n", + " [167.5460, 459.0090, 166.8440],\n", + " [170.2010, 459.9620, 169.3810],\n", + " [169.5150, 456.8220, 171.4570],\n", + " [170.7440, 454.3880, 168.7860],\n", + " [172.8900, 451.6810, 170.3850],\n", + " [173.2420, 449.3000, 167.4490],\n", + " [171.4700, 447.3670, 164.7150],\n", + " [169.7840, 443.9650, 164.9670],\n", + " [170.8880, 441.4120, 162.3680],\n", + " [169.3320, 438.1640, 163.6510],\n", + " [166.7170, 436.9060, 166.1030],\n", + " [166.2830, 433.5290, 167.7900],\n", + " [162.5490, 433.4260, 168.5040],\n", + " [162.6440, 430.3540, 170.7620],\n", + " [164.9490, 432.1120, 173.2350],\n", + " [163.6530, 435.5760, 172.2210],\n", + " [167.2540, 436.7450, 171.8300],\n", + " [168.3710, 439.3650, 169.3060],\n", + " [171.8910, 439.6680, 167.8930],\n", + " [173.1360, 443.2500, 167.5870],\n", + " [176.0990, 444.7950, 165.8030],\n", + " [177.1670, 447.8660, 167.8270],\n", + " [177.4160, 451.2430, 166.1360],\n", + " [181.1790, 451.0810, 166.7480],\n", + " [181.3560, 448.4350, 163.9980],\n", + " [180.6020, 448.8920, 160.3060],\n", + " [177.8440, 446.8990, 158.6170],\n", + " [176.7540, 446.3160, 155.0150],\n", + " [173.3820, 444.6900, 154.4770],\n", + " [169.6430, 444.9660, 153.9760],\n", + " [167.6080, 446.9450, 156.5140],\n", + " [163.9630, 447.9270, 156.8800],\n", + " [163.1520, 451.2160, 155.1430],\n", + " [160.3870, 453.6570, 156.0420],\n", + " [158.9330, 453.6920, 152.5150],\n", + " [159.8050, 453.2460, 148.8360],\n", + " [161.2560, 456.7540, 148.4440],\n", + " [164.9420, 455.8330, 148.8520],\n", + " [167.3780, 455.9500, 145.9260],\n", + " [171.0380, 455.0610, 145.5060],\n", + " [173.5830, 457.5340, 146.9270],\n", + " [171.2360, 458.9430, 149.5740],\n", + " [171.8150, 459.8640, 153.2130],\n", + " [169.5910, 457.9090, 155.6000],\n", + " [168.4960, 458.3960, 159.2100],\n", + " [167.0870, 455.9020, 161.7110],\n", + " [163.6430, 457.0390, 162.8610],\n", + " [161.8700, 456.3550, 166.1660],\n", + " [160.7490, 452.9260, 164.8950],\n", + " [164.2440, 451.8750, 163.8110],\n", + " [163.4490, 452.3040, 160.1090],\n", + " [165.6820, 454.0140, 157.5590],\n", + " [164.2940, 457.2310, 156.0670],\n", + " [165.6810, 459.7290, 153.5780],\n", + " [167.3870, 462.7790, 155.0760],\n", + " [170.2060, 465.8340, 161.8360],\n", + " [172.1620, 462.7680, 160.6890],\n", + " [174.0280, 461.7040, 163.8180],\n", + " [175.2110, 458.5660, 161.9930],\n", + " [176.5410, 458.2410, 158.4450],\n", + " [174.5550, 455.7530, 156.3540],\n", + " [174.3580, 455.6030, 152.5600],\n", + " [171.8590, 453.6260, 150.4910],\n", + " [173.6300, 451.2730, 148.0810],\n", + " [170.4820, 450.1750, 146.2000],\n", + " [166.8520, 451.1980, 145.7810],\n", + " [164.0730, 450.1880, 148.1490],\n", + " [162.6710, 446.7750, 147.1980],\n", + " [159.1420, 445.8080, 148.2240],\n", + " [158.3160, 442.3640, 149.5950],\n", + " [155.0300, 443.1470, 151.4050],\n", + " [152.6800, 446.0960, 151.8500],\n", + " [155.0610, 447.4890, 154.4910],\n", + " [158.2010, 445.3460, 154.0190],\n", + " [160.8090, 447.5340, 152.2870],\n", + " [164.4130, 446.3150, 152.1360],\n", + " [167.3360, 448.5380, 151.1380],\n", + " [171.0310, 447.6630, 150.9500],\n", + " [172.8160, 450.1440, 153.2260],\n", + " [176.3550, 450.4540, 154.5850],\n", + " [176.6310, 452.0780, 158.0240],\n", + " [180.1600, 453.0970, 159.0310],\n", + " [179.9110, 454.9710, 162.3160],\n", + " [178.7370, 458.4030, 163.4610],\n", + " [179.1350, 461.9150, 162.0830],\n", + " [180.3160, 464.9940, 163.9950],\n", + " [195.1700, 454.0210, 194.1160],\n", + " [196.4220, 450.5570, 193.1610],\n", + " [195.0530, 447.5260, 191.3340],\n", + " [195.7530, 445.4320, 194.4410],\n", + " [195.6760, 446.8960, 197.9710],\n", + " [199.1230, 447.9300, 199.1640],\n", + " [198.4070, 447.0140, 202.7840],\n", + " [198.1130, 443.3080, 203.5090],\n", + " [195.0350, 441.7530, 205.1060],\n", + " [194.7040, 440.1720, 208.5300],\n", + " [191.7420, 437.9460, 207.6670],\n", + " [190.9460, 435.0990, 205.3140],\n", + " [188.0870, 435.6760, 202.8880],\n", + " [184.8300, 433.7320, 203.1830],\n", + " [184.1270, 431.8260, 199.9570],\n", + " [180.5450, 430.8500, 200.7460],\n", + " [178.2470, 433.3320, 199.0220],\n", + " [178.2770, 433.9260, 195.2680],\n", + " [176.3170, 437.2030, 195.0280],\n", + " [177.7690, 440.7330, 194.9660],\n", + " [181.3350, 439.3910, 195.1330],\n", + " [182.5820, 441.3460, 192.0940],\n", + " [182.3530, 444.9560, 193.3610],\n", + " [186.0870, 445.2240, 194.0290],\n", + " [188.7230, 447.5570, 192.6190],\n", + " [190.8760, 444.5870, 191.5490],\n", + " [188.2670, 443.5230, 188.9590],\n", + " [190.1360, 444.3010, 185.7360],\n", + " [188.8140, 444.1990, 182.1980],\n", + " [185.1300, 444.1560, 181.3470],\n", + " [182.1290, 442.2030, 182.6060],\n", + " [181.3330, 441.2700, 178.9860],\n", + " [184.3690, 440.6570, 176.7700],\n", + " [184.4240, 439.7520, 173.0740],\n", + " [187.1540, 437.5560, 171.6020],\n", + " [187.5170, 439.9750, 168.6500],\n", + " [188.4180, 443.0500, 170.7240],\n", + " [191.4360, 445.2100, 169.8910],\n", + " [193.7480, 445.6510, 172.8940],\n", + " [196.8200, 447.8990, 173.0280],\n", + " [199.4910, 448.6120, 175.6310],\n", + " [201.2080, 451.9090, 176.3780],\n", + " [203.6110, 453.4740, 178.8680],\n", + " [201.6130, 454.9210, 181.7570],\n", + " [202.0690, 458.3840, 183.2730],\n", + " [200.4970, 458.3690, 186.7180],\n", + " [197.7960, 455.8130, 187.5240],\n", + " [195.1460, 455.8470, 184.7720],\n", + " [193.6160, 452.5740, 185.9790],\n", + " [189.8600, 452.3800, 185.3150],\n", + " [189.9440, 455.8580, 183.7680],\n", + " [189.7400, 457.4310, 180.3410],\n", + " [193.1630, 457.9480, 178.8100],\n", + " [194.6770, 460.5170, 176.4640],\n", + " [197.9720, 460.6430, 174.6010],\n", + " [200.7710, 462.5710, 176.3210],\n", + " [203.7970, 463.7400, 174.3330],\n", + " [207.1150, 464.5820, 175.9770],\n", + " [210.1390, 466.5260, 174.8060],\n", + " [210.8850, 463.9390, 172.1200],\n", + " [213.6440, 461.8050, 173.6150],\n", + " [211.1280, 459.2430, 174.9140],\n", + " [208.0390, 457.7610, 173.2930],\n", + " [204.4770, 458.9110, 173.9310],\n", + " [202.5240, 457.8000, 177.0030],\n", + " [198.9190, 457.7220, 178.2440],\n", + " [197.5730, 459.9040, 181.0500],\n", + " [194.2310, 460.2350, 182.8060],\n", + " [192.1140, 462.6430, 180.7850],\n", + " [189.0250, 463.1720, 178.7000],\n", + " [187.1240, 465.8360, 176.8220],\n", + " [188.2850, 466.3320, 173.2420],\n", + " [191.5580, 464.4520, 173.8600],\n", + " [189.9950, 461.1280, 174.9010],\n", + " [191.8440, 458.2970, 173.1540],\n", + " [190.4670, 455.2690, 174.9900],\n", + " [189.7380, 453.5820, 178.3070],\n", + " [192.3390, 451.8830, 180.5000],\n", + " [191.2020, 448.5340, 181.9050],\n", + " [194.3800, 447.0280, 183.4050],\n", + " [197.8700, 447.9650, 184.5850],\n", + " [200.9840, 445.8270, 184.9660],\n", + " [202.8290, 447.6220, 187.7590],\n", + " [206.2120, 445.9180, 187.3400],\n", + " [206.6040, 447.1310, 183.7460],\n", + " [204.4430, 450.2380, 184.1830],\n", + " [202.2310, 449.1370, 181.2890],\n", + " [198.6660, 450.3790, 180.7720],\n", + " [196.2310, 448.2490, 178.7680],\n", + " [194.0550, 450.4240, 176.5260],\n", + " [190.8490, 449.7090, 174.6070],\n", + " [190.4360, 452.3080, 171.8240],\n", + " [187.3830, 454.5590, 171.7980],\n", + " [186.4670, 452.9730, 168.4480],\n", + " [185.9050, 449.6480, 170.2580],\n", + " [182.8890, 448.8910, 172.4330],\n", + " [183.5680, 448.6030, 176.1630],\n", + " [181.3330, 447.5400, 179.0590],\n", + " [182.7340, 447.5270, 182.5670],\n", + " [183.3280, 449.2260, 185.8920],\n", + " [184.8760, 452.6980, 185.6990],\n", + " [185.7140, 455.4170, 188.2030],\n", + " [182.9420, 457.9530, 188.8300],\n", + " [183.2930, 461.5650, 189.9350],\n", + " [182.7580, 462.1320, 193.6660],\n", + " [180.0620, 464.7490, 193.1030],\n", + " [176.4120, 463.9030, 192.5790],\n", + " [177.1550, 460.1730, 192.6930],\n", + " [173.8180, 459.5980, 194.4390],\n", + " [172.0770, 461.1030, 191.4040],\n", + " [173.6950, 458.5410, 189.0910],\n", + " [171.0060, 456.0190, 188.1270],\n", + " [170.8210, 453.3390, 185.4210],\n", + " [170.0180, 454.8270, 182.0350],\n", + " [171.8690, 458.1080, 182.6590],\n", + " [174.2320, 459.6520, 180.1210],\n", + " [177.8640, 459.9130, 181.2230],\n", + " [180.8780, 461.8410, 179.9490],\n", + " [184.5650, 461.8070, 180.8430],\n", + " [186.0650, 464.7990, 182.6440],\n", + " [189.5780, 466.2740, 182.6170],\n", + " [190.7120, 463.6340, 185.1390],\n", + " [189.2980, 460.6630, 183.2290],\n", + " [186.3560, 460.3000, 185.6240],\n", + " [182.7840, 459.6590, 184.5210],\n", + " [180.2130, 462.3320, 185.3590],\n", + " [176.5320, 462.8410, 184.6140],\n", + " [175.8580, 465.0300, 181.5790],\n", + " [178.1930, 465.7110, 174.9000],\n", + " [180.9150, 464.1190, 172.7670],\n", + " [181.2510, 460.5420, 174.1130],\n", + " [178.4430, 457.9660, 174.2140],\n", + " [178.5420, 456.4790, 177.7180],\n", + " [175.4730, 455.1590, 179.5500],\n", + " [175.4670, 454.0690, 183.1870],\n", + " [174.1210, 450.5430, 183.6830],\n", + " [173.9850, 450.6340, 187.5030],\n", + " [174.3640, 452.9240, 190.5240],\n", + " [177.5140, 454.2200, 192.1820],\n", + " [179.3060, 451.6570, 194.3540],\n", + " [181.4890, 453.2110, 197.0570],\n", + " [184.7390, 451.3110, 197.6330],\n", + " [186.4870, 454.0230, 199.6690],\n", + " [185.5270, 457.3810, 201.1790],\n", + " [186.7910, 459.0050, 197.9610],\n", + " [186.6010, 456.0430, 195.5320],\n", + " [183.3680, 455.3620, 193.6270],\n", + " [182.9110, 452.9430, 190.7280],\n", + " [180.0190, 452.5230, 188.3060],\n", + " [179.0910, 450.0250, 185.5960],\n", + " [178.9850, 451.7840, 182.2280],\n", + " [179.0510, 451.0080, 178.5100],\n", + " [181.0530, 453.1550, 176.0780],\n", + " [180.1320, 452.7170, 172.4060],\n", + " [182.0570, 455.4530, 170.6120],\n", + " [181.8140, 459.1820, 170.0770],\n", + " [178.5990, 461.0580, 169.3130],\n", + " [177.7620, 463.8650, 166.9020]]),\n", " 'residue_ids': tensor([ 4., 4., 4., ..., 182., 182., 182.]),\n", " 'chain_ids': tensor([0., 0., 0., ..., 1., 1., 1.])},\n", - " 'feature_complex': {'atom_types': tensor([[0., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", + " 'feature_complex': {'atom_types': tensor([[0.],\n", + " [1.],\n", + " [2.],\n", " ...,\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [1., 0., 0., ..., 0., 0., 0.],\n", - " [0., 0., 1., ..., 0., 0., 0.]]),\n", + " [1.],\n", + " [2.],\n", + " [3.]]),\n", + " 'element_types': tensor([[3.],\n", + " [0.],\n", + " [0.],\n", + " ...,\n", + " [0.],\n", + " [0.],\n", + " [2.]]),\n", " 'residue_types': tensor([[16.],\n", " [16.],\n", " [16.],\n", @@ -1155,16 +1491,338 @@ " [132.6810, 428.2520, 163.1550],\n", " [133.5150, 428.6750, 161.9500],\n", " ...,\n", - " [198.0186, 449.2866, 161.9663],\n", - " [196.8790, 450.1770, 161.4823],\n", - " [195.8437, 450.2865, 162.1400]]),\n", - " 'residue_coordinates': tensor([[131.7500, 429.3090, 163.5360],\n", - " [132.6810, 428.2520, 163.1550],\n", - " [133.5150, 428.6750, 161.9500],\n", - " ...,\n", - " [198.0186, 449.2866, 161.9663],\n", - " [196.8790, 450.1770, 161.4823],\n", - " [195.8437, 450.2865, 162.1400]]),\n", + " [186.8651, 447.7225, 152.6899],\n", + " [185.4418, 447.8365, 153.2255],\n", + " [185.1119, 447.2595, 154.2621]]),\n", + " 'residue_coordinates': tensor([[132.6810, 428.2520, 163.1550],\n", + " [133.5560, 429.2490, 159.5910],\n", + " [133.8750, 432.8980, 160.6290],\n", + " [136.1110, 431.8050, 163.5130],\n", + " [138.3420, 429.8920, 161.0830],\n", + " [138.5230, 432.9090, 158.7600],\n", + " [139.4710, 435.1730, 161.6750],\n", + " [142.1200, 432.6310, 162.6740],\n", + " [143.5890, 432.7500, 159.1600],\n", + " [143.6190, 436.5600, 159.1540],\n", + " [145.2600, 436.8040, 162.5830],\n", + " [147.8380, 434.1320, 161.7330],\n", + " [148.7390, 435.8920, 158.4790],\n", + " [149.0640, 439.2630, 160.2240],\n", + " [151.2220, 437.7670, 162.9840],\n", + " [153.4710, 435.8030, 160.6120],\n", + " [153.9420, 438.9180, 158.4710],\n", + " [156.1140, 440.2660, 161.3150],\n", + " [158.3330, 437.1860, 161.4250],\n", + " [161.8090, 436.4120, 160.1100],\n", + " [161.1120, 432.8370, 158.9350],\n", + " [157.4020, 432.0710, 159.3930],\n", + " [156.5290, 428.3870, 159.0310],\n", + " [154.0400, 428.1160, 156.1500],\n", + " [153.3520, 424.6590, 154.7510],\n", + " [152.8370, 424.8210, 150.9870],\n", + " [150.9700, 422.4160, 148.7320],\n", + " [153.5900, 422.6860, 145.9670],\n", + " [157.3050, 423.3410, 145.6600],\n", + " [158.4860, 426.6730, 144.2700],\n", + " [160.7730, 427.0880, 141.2590],\n", + " [163.9630, 429.0530, 141.9600],\n", + " [166.4230, 427.4330, 139.5550],\n", + " [167.6170, 430.8330, 138.3250],\n", + " [170.5180, 431.9210, 140.5320],\n", + " [169.7800, 435.6680, 140.3160],\n", + " [167.6790, 437.8790, 142.6110],\n", + " [167.3350, 435.1910, 145.2890],\n", + " [168.9090, 437.3000, 148.0580],\n", + " [166.1860, 439.9440, 148.5750],\n", + " [164.1010, 438.1300, 151.1890],\n", + " [163.0190, 438.8690, 154.7450],\n", + " [164.6750, 435.6560, 155.9860],\n", + " [168.1170, 436.6550, 154.6330],\n", + " [169.8040, 437.0930, 158.0010],\n", + " [173.2680, 438.4850, 158.5750],\n", + " [174.9270, 440.8490, 156.1460],\n", + " [175.9170, 440.8010, 152.5000],\n", + " [179.6060, 441.0910, 153.4330],\n", + " [180.8000, 439.9830, 156.8710],\n", + " [184.2540, 439.9980, 158.4580],\n", + " [185.5840, 437.2970, 160.7670],\n", + " [186.4140, 439.9000, 163.4480],\n", + " [182.9430, 441.4570, 163.7500],\n", + " [181.4930, 442.0910, 167.2100],\n", + " [178.0780, 440.5360, 167.9060],\n", + " [176.1650, 440.9290, 171.1790],\n", + " [173.0530, 438.9530, 172.1310],\n", + " [170.3990, 440.6990, 174.2170],\n", + " [166.7880, 440.0710, 175.2260],\n", + " [164.4480, 442.1010, 173.0340],\n", + " [160.9780, 443.6110, 173.3810],\n", + " [158.8330, 443.9000, 170.2730],\n", + " [160.1820, 442.9360, 166.8360],\n", + " [163.5010, 444.7230, 166.1630],\n", + " [164.6310, 442.4290, 163.3160],\n", + " [166.6330, 444.2560, 160.6240],\n", + " [166.1700, 447.5210, 162.5220],\n", + " [168.1350, 449.9450, 164.6440],\n", + " [168.0040, 449.0470, 168.3240],\n", + " [168.4210, 451.0540, 171.5220],\n", + " [169.0440, 450.0360, 175.1300],\n", + " [166.1650, 450.3680, 177.6100],\n", + " [166.7800, 449.8300, 181.3340],\n", + " [163.8480, 448.9150, 183.5760],\n", + " [163.3500, 443.9770, 187.9750],\n", + " [165.0240, 442.4930, 184.8870],\n", + " [168.1120, 443.0980, 182.7810],\n", + " [168.1280, 445.9210, 180.2050],\n", + " [166.7230, 445.0130, 176.8030],\n", + " [167.0690, 446.1330, 173.1930],\n", + " [164.0790, 447.8390, 171.5780],\n", + " [163.4630, 449.0630, 168.0350],\n", + " [164.4160, 452.7320, 168.0130],\n", + " [166.7460, 455.3190, 166.5790],\n", + " [167.5460, 459.0090, 166.8440],\n", + " [170.2010, 459.9620, 169.3810],\n", + " [169.5150, 456.8220, 171.4570],\n", + " [170.7440, 454.3880, 168.7860],\n", + " [172.8900, 451.6810, 170.3850],\n", + " [173.2420, 449.3000, 167.4490],\n", + " [171.4700, 447.3670, 164.7150],\n", + " [169.7840, 443.9650, 164.9670],\n", + " [170.8880, 441.4120, 162.3680],\n", + " [169.3320, 438.1640, 163.6510],\n", + " [166.7170, 436.9060, 166.1030],\n", + " [166.2830, 433.5290, 167.7900],\n", + " [162.5490, 433.4260, 168.5040],\n", + " [162.6440, 430.3540, 170.7620],\n", + " [164.9490, 432.1120, 173.2350],\n", + " [163.6530, 435.5760, 172.2210],\n", + " [167.2540, 436.7450, 171.8300],\n", + " [168.3710, 439.3650, 169.3060],\n", + " [171.8910, 439.6680, 167.8930],\n", + " [173.1360, 443.2500, 167.5870],\n", + " [176.0990, 444.7950, 165.8030],\n", + " [177.1670, 447.8660, 167.8270],\n", + " [177.4160, 451.2430, 166.1360],\n", + " [181.1790, 451.0810, 166.7480],\n", + " [181.3560, 448.4350, 163.9980],\n", + " [180.6020, 448.8920, 160.3060],\n", + " [177.8440, 446.8990, 158.6170],\n", + " [176.7540, 446.3160, 155.0150],\n", + " [173.3820, 444.6900, 154.4770],\n", + " [169.6430, 444.9660, 153.9760],\n", + " [167.6080, 446.9450, 156.5140],\n", + " [163.9630, 447.9270, 156.8800],\n", + " [163.1520, 451.2160, 155.1430],\n", + " [160.3870, 453.6570, 156.0420],\n", + " [158.9330, 453.6920, 152.5150],\n", + " [159.8050, 453.2460, 148.8360],\n", + " [161.2560, 456.7540, 148.4440],\n", + " [164.9420, 455.8330, 148.8520],\n", + " [167.3780, 455.9500, 145.9260],\n", + " [171.0380, 455.0610, 145.5060],\n", + " [173.5830, 457.5340, 146.9270],\n", + " [171.2360, 458.9430, 149.5740],\n", + " [171.8150, 459.8640, 153.2130],\n", + " [169.5910, 457.9090, 155.6000],\n", + " [168.4960, 458.3960, 159.2100],\n", + " [167.0870, 455.9020, 161.7110],\n", + " [163.6430, 457.0390, 162.8610],\n", + " [161.8700, 456.3550, 166.1660],\n", + " [160.7490, 452.9260, 164.8950],\n", + " [164.2440, 451.8750, 163.8110],\n", + " [163.4490, 452.3040, 160.1090],\n", + " [165.6820, 454.0140, 157.5590],\n", + " [164.2940, 457.2310, 156.0670],\n", + " [165.6810, 459.7290, 153.5780],\n", + " [167.3870, 462.7790, 155.0760],\n", + " [170.2060, 465.8340, 161.8360],\n", + " [172.1620, 462.7680, 160.6890],\n", + " [174.0280, 461.7040, 163.8180],\n", + " [175.2110, 458.5660, 161.9930],\n", + " [176.5410, 458.2410, 158.4450],\n", + " [174.5550, 455.7530, 156.3540],\n", + " [174.3580, 455.6030, 152.5600],\n", + " [171.8590, 453.6260, 150.4910],\n", + " [173.6300, 451.2730, 148.0810],\n", + " [170.4820, 450.1750, 146.2000],\n", + " [166.8520, 451.1980, 145.7810],\n", + " [164.0730, 450.1880, 148.1490],\n", + " [162.6710, 446.7750, 147.1980],\n", + " [159.1420, 445.8080, 148.2240],\n", + " [158.3160, 442.3640, 149.5950],\n", + " [155.0300, 443.1470, 151.4050],\n", + " [152.6800, 446.0960, 151.8500],\n", + " [155.0610, 447.4890, 154.4910],\n", + " [158.2010, 445.3460, 154.0190],\n", + " [160.8090, 447.5340, 152.2870],\n", + " [164.4130, 446.3150, 152.1360],\n", + " [167.3360, 448.5380, 151.1380],\n", + " [171.0310, 447.6630, 150.9500],\n", + " [172.8160, 450.1440, 153.2260],\n", + " [176.3550, 450.4540, 154.5850],\n", + " [176.6310, 452.0780, 158.0240],\n", + " [180.1600, 453.0970, 159.0310],\n", + " [179.9110, 454.9710, 162.3160],\n", + " [178.7370, 458.4030, 163.4610],\n", + " [179.1350, 461.9150, 162.0830],\n", + " [180.3160, 464.9940, 163.9950],\n", + " [195.4340, 461.9335, 182.1035],\n", + " [199.2382, 461.9114, 182.0227],\n", + " [201.9684, 459.5313, 180.8911],\n", + " [203.4010, 459.6168, 184.4221],\n", + " [201.2254, 460.1810, 187.5138],\n", + " [201.1625, 463.8214, 188.5711],\n", + " [200.9260, 462.9902, 192.2737],\n", + " [204.0461, 461.5012, 193.8212],\n", + " [204.0666, 458.1489, 195.6112],\n", + " [204.6119, 457.4490, 199.2917],\n", + " [205.8504, 453.8792, 198.8491],\n", + " [208.7257, 452.0784, 197.1862],\n", + " [207.7980, 449.4805, 194.5819],\n", + " [208.4135, 445.7754, 195.1886],\n", + " [210.6612, 444.3414, 192.4637],\n", + " [210.1697, 440.6754, 193.3148],\n", + " [207.5283, 439.2731, 190.9761],\n", + " [207.8597, 439.3451, 187.1904],\n", + " [204.2639, 438.5888, 186.1246],\n", + " [201.5404, 441.1361, 185.3079],\n", + " [203.9241, 444.0497, 185.9199],\n", + " [203.2558, 445.7530, 182.5636],\n", + " [199.5896, 446.7999, 182.9544],\n", + " [200.4436, 450.4320, 183.6891],\n", + " [199.5210, 453.6368, 181.8842],\n", + " [203.2026, 454.6235, 181.6131],\n", + " [203.8955, 451.7040, 179.2375],\n", + " [204.5535, 453.5907, 175.9981],\n", + " [205.0174, 452.1659, 172.5296],\n", + " [204.0168, 448.6487, 171.5671],\n", + " [204.5046, 445.2215, 173.1233],\n", + " [205.9230, 444.0098, 169.7873],\n", + " [208.0113, 446.5703, 167.8936],\n", + " [209.7071, 446.1658, 164.5108],\n", + " [212.9677, 447.9385, 163.6932],\n", + " [211.5590, 448.9689, 160.2797],\n", + " [208.5749, 450.9334, 161.6230],\n", + " [207.8057, 454.4637, 160.4340],\n", + " [207.4872, 456.9118, 163.3431],\n", + " [206.4332, 460.5624, 163.0761],\n", + " [206.0788, 463.4231, 165.5477],\n", + " [203.4709, 466.1752, 165.5817],\n", + " [202.2743, 469.0646, 167.7365],\n", + " [199.6173, 467.7885, 170.1333],\n", + " [196.2579, 469.4412, 170.8270],\n", + " [194.9515, 468.0990, 174.1181],\n", + " [196.1949, 464.7333, 175.3846],\n", + " [195.9083, 462.1365, 172.5968],\n", + " [198.1073, 459.6493, 174.4645],\n", + " [197.1774, 456.0215, 173.7158],\n", + " [194.3844, 457.2024, 171.4133],\n", + " [193.6677, 457.3959, 167.7107],\n", + " [194.6959, 460.7277, 166.2377],\n", + " [193.3968, 462.9168, 163.4242],\n", + " [194.8157, 465.9834, 161.7135],\n", + " [193.5975, 469.3353, 163.0516],\n", + " [194.0021, 472.4931, 160.9684],\n", + " [193.9675, 475.9664, 162.5033],\n", + " [193.4755, 479.4159, 161.0357],\n", + " [196.7072, 479.1398, 159.0498],\n", + " [199.2380, 481.0833, 161.1038],\n", + " [200.4355, 477.9101, 162.8583],\n", + " [201.1263, 474.4388, 161.5022],\n", + " [198.7341, 471.4980, 161.7173],\n", + " [198.3870, 469.4143, 164.8834],\n", + " [196.9634, 466.0464, 165.9660],\n", + " [193.8728, 465.6269, 168.1384],\n", + " [192.0453, 462.6648, 169.6378],\n", + " [189.6005, 461.3958, 167.0345],\n", + " [188.5610, 458.5793, 164.7638],\n", + " [185.9219, 457.6053, 162.2491],\n", + " [186.6821, 458.7163, 158.6997],\n", + " [189.3552, 461.1924, 159.8627],\n", + " [191.6279, 458.6501, 161.5795],\n", + " [195.2363, 459.3693, 160.6062],\n", + " [197.1180, 457.1342, 163.0350],\n", + " [197.6513, 456.0197, 166.6202],\n", + " [199.5711, 457.9891, 169.2464],\n", + " [201.9258, 455.8545, 171.3396],\n", + " [204.0223, 458.4030, 173.2702],\n", + " [204.0654, 462.0508, 174.3389],\n", + " [206.9754, 464.2809, 175.3246],\n", + " [205.3117, 466.7347, 177.6991],\n", + " [208.0995, 469.3304, 177.8176],\n", + " [207.9500, 469.9574, 174.0591],\n", + " [204.2863, 468.9828, 173.6828],\n", + " [205.2161, 466.4121, 171.0357],\n", + " [203.0047, 463.4515, 170.1065],\n", + " [204.5949, 460.3627, 168.5532],\n", + " [202.3941, 458.9509, 165.7863],\n", + " [202.4135, 455.6142, 163.9592],\n", + " [200.5412, 455.9816, 160.6380],\n", + " [197.4668, 453.8614, 159.9738],\n", + " [199.3793, 452.3290, 157.0461],\n", + " [201.8117, 450.7604, 159.5502],\n", + " [200.9911, 447.7578, 161.7207],\n", + " [200.6235, 448.4547, 165.4404],\n", + " [200.1784, 446.1145, 168.4132],\n", + " [199.8529, 447.5739, 171.8820],\n", + " [197.7348, 448.8400, 174.7466],\n", + " [195.1268, 451.4528, 173.8197],\n", + " [192.3477, 453.2565, 175.6605],\n", + " [188.9569, 451.5234, 175.5765],\n", + " [185.5207, 453.1102, 175.8322],\n", + " [183.9646, 452.9510, 179.3080],\n", + " [180.7992, 451.2673, 178.0513],\n", + " [180.4683, 447.5265, 177.5932],\n", + " [184.0987, 446.9803, 178.5930],\n", + " [183.1029, 443.7189, 180.2918],\n", + " [181.8425, 442.4591, 176.9255],\n", + " [185.2580, 443.0276, 175.3308],\n", + " [186.8817, 439.6114, 174.8690],\n", + " [189.8907, 438.4270, 172.8485],\n", + " [189.0413, 438.0299, 169.1817],\n", + " [186.5213, 440.8977, 169.1051],\n", + " [186.4875, 443.5345, 166.3745],\n", + " [187.2138, 447.0861, 167.5288],\n", + " [186.7567, 450.5166, 165.9644],\n", + " [187.8187, 454.0125, 166.9865],\n", + " [185.1741, 456.5018, 168.1070],\n", + " [185.0113, 460.3016, 167.8790],\n", + " [187.2229, 460.5884, 170.9843],\n", + " [189.9023, 458.1826, 169.7563],\n", + " [188.6959, 455.3909, 172.0528],\n", + " [188.3371, 451.7683, 170.9875],\n", + " [184.8400, 450.2790, 171.0850],\n", + " [183.3118, 446.9541, 170.0985],\n", + " [181.7845, 446.9279, 166.6165],\n", + " [183.4827, 449.0777, 160.0576],\n", + " [186.3409, 451.0179, 158.4578],\n", + " [189.4116, 450.1909, 160.6042],\n", + " [190.7996, 446.6886, 161.1856],\n", + " [191.3849, 446.4283, 164.9391],\n", + " [191.1396, 443.1729, 166.9038],\n", + " [191.2964, 442.9523, 170.6910],\n", + " [193.9518, 440.5240, 171.9330],\n", + " [192.9439, 440.5845, 175.6207],\n", + " [190.2838, 441.8338, 178.0451],\n", + " [189.7749, 445.3017, 179.4824],\n", + " [192.2175, 446.2191, 182.2554],\n", + " [190.9081, 448.9066, 184.6113],\n", + " [193.6014, 451.3525, 185.7371],\n", + " [191.2417, 453.9911, 187.1604],\n", + " [187.5045, 454.2755, 187.8168],\n", + " [187.1856, 455.8765, 184.3634],\n", + " [190.3867, 454.6044, 182.6770],\n", + " [190.3628, 451.2543, 180.8545],\n", + " [193.0865, 449.8934, 178.5754],\n", + " [193.0575, 446.9304, 176.2036],\n", + " [195.6519, 445.1075, 174.1079],\n", + " [194.7845, 445.4580, 170.4237],\n", + " [196.3712, 445.1063, 166.9902],\n", + " [195.6411, 447.6097, 164.2096],\n", + " [196.5773, 446.4442, 160.7041],\n", + " [195.1365, 449.0989, 158.4050],\n", + " [191.7716, 450.0980, 157.0157],\n", + " [189.1553, 447.6691, 155.7140],\n", + " [186.8651, 447.7225, 152.6899]]),\n", " 'residue_ids': tensor([ 4., 4., 4., ..., 182., 182., 182.]),\n", " 'chain_ids': tensor([0., 0., 0., ..., 1., 1., 1.])},\n", " 'id': '8phr__X4_UNDEFINED--8phr__W4_UNDEFINED',\n", @@ -1172,7 +1830,7 @@ " 'target_id': '8phr__X4_UNDEFINED-R--8phr__W4_UNDEFINED-L'}" ] }, - "execution_count": 4, + "execution_count": 20, "metadata": {}, "output_type": "execute_result" } @@ -1184,7 +1842,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 21, "id": "edd68e94-0782-47a5-a9cb-d6f8d1db00f1", "metadata": {}, "outputs": [ @@ -1192,10 +1850,8 @@ "name": "stderr", "output_type": "stream", "text": [ - "2024-09-23 15:43:35,437 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=5, items=5\n", - "2024-09-23 15:43:35,771 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 0.33s\n", - "2024-09-23 15:43:35,997 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=7, items=7\n", - "2024-09-23 15:43:36,256 | pinder.core.utils.cloud.process_many:23 | INFO : runtime succeeded: 0.26s\n" + "2024-09-25 16:33:12,882 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=5, items=5\n", + "2024-09-25 16:33:13,349 | pinder.core.utils.cloud:375 | INFO : Gsutil process_many=download_to_filename, threads=7, items=7\n" ] } ], @@ -1232,150 +1888,154 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 22, "id": "608249db-4ba3-4391-b8da-79a8550ba974", "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "{'target_complex': {'atom_types': tensor([[[ 0., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", + "{'target_complex': {'atom_types': tensor([[[ 0.],\n", + " [ 1.],\n", + " [ 2.],\n", " ...,\n", - " [ 0., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.]],\n", + " [-1.],\n", + " [-1.],\n", + " [-1.]],\n", " \n", - " [[ 0., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", + " [[ 0.],\n", + " [ 1.],\n", + " [ 2.],\n", " ...,\n", - " [-1., -1., -1., ..., -1., -1., -1.],\n", - " [-1., -1., -1., ..., -1., -1., -1.],\n", - " [-1., -1., -1., ..., -1., -1., -1.]]]),\n", - " 'residue_types': tensor([[[15.],\n", - " [15.],\n", - " [15.],\n", - " ...,\n", - " [15.],\n", - " [15.],\n", - " [15.]],\n", - " \n", - " [[12.],\n", - " [12.],\n", - " [12.],\n", + " [ 1.],\n", + " [ 2.],\n", + " [ 3.]]]),\n", + " 'residue_types': tensor([[[ 2.],\n", + " [ 2.],\n", + " [ 2.],\n", " ...,\n", " [-1.],\n", " [-1.],\n", - " [-1.]]]),\n", - " 'atom_coordinates': tensor([[[ 194.5170, 179.2660, -91.8800],\n", - " [ 194.9840, 179.8980, -90.6150],\n", - " [ 193.8100, 180.4120, -89.7870],\n", - " ...,\n", - " [ 167.9860, 256.5550, -26.2400],\n", - " [ 168.9990, 256.8070, -25.2210],\n", - " [ 170.4040, 256.5630, -25.7840]],\n", + " [-1.]],\n", " \n", - " [[ -90.1810, -82.1340, -226.8990],\n", - " [ -90.2500, -81.9540, -225.4530],\n", - " [ -90.5700, -80.5080, -225.0850],\n", + " [[13.],\n", + " [13.],\n", + " [13.],\n", + " ...,\n", + " [13.],\n", + " [13.],\n", + " [13.]]]),\n", + " 'atom_coordinates': tensor([[[ 289.1240, 316.4350, 305.0190],\n", + " [ 290.4980, 316.8960, 304.8630],\n", + " [ 291.3100, 316.6540, 306.1310],\n", " ...,\n", " [-100.0000, -100.0000, -100.0000],\n", " [-100.0000, -100.0000, -100.0000],\n", - " [-100.0000, -100.0000, -100.0000]]]),\n", - " 'residue_coordinates': tensor([[[ 194.5170, 179.2660, -91.8800],\n", - " [ 194.9840, 179.8980, -90.6150],\n", - " [ 193.8100, 180.4120, -89.7870],\n", - " ...,\n", - " [ 167.9860, 256.5550, -26.2400],\n", - " [ 168.9990, 256.8070, -25.2210],\n", - " [ 170.4040, 256.5630, -25.7840]],\n", + " [-100.0000, -100.0000, -100.0000]],\n", " \n", - " [[ -90.1810, -82.1340, -226.8990],\n", - " [ -90.2500, -81.9540, -225.4530],\n", - " [ -90.5700, -80.5080, -225.0850],\n", + " [[ 169.2570, 175.1550, 105.7850],\n", + " [ 170.4880, 175.1580, 106.5660],\n", + " [ 170.5260, 176.3570, 107.5090],\n", + " ...,\n", + " [ 158.9320, 185.6340, 166.0330],\n", + " [ 158.8780, 185.2340, 164.5630],\n", + " [ 158.0010, 184.4790, 164.1430]]]),\n", + " 'residue_coordinates': tensor([[[ 290.4980, 316.8960, 304.8630],\n", + " [ 291.8970, 317.5740, 308.3580],\n", + " [ 295.3220, 319.0930, 308.9830],\n", " ...,\n", " [-100.0000, -100.0000, -100.0000],\n", " [-100.0000, -100.0000, -100.0000],\n", - " [-100.0000, -100.0000, -100.0000]]]),\n", - " 'residue_ids': tensor([[ 1., 1., 1., ..., 280., 280., 280.],\n", - " [ 1., 1., 1., ..., -99., -99., -99.]]),\n", - " 'chain_ids': tensor([[ 0., 0., 0., ..., 1., 1., 1.],\n", - " [ 0., 0., 0., ..., -1., -1., -1.]])},\n", - " 'feature_complex': {'atom_types': tensor([[[ 0., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", - " ...,\n", - " [ 0., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.]],\n", + " [-100.0000, -100.0000, -100.0000]],\n", " \n", - " [[ 0., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", - " [ 1., 0., 0., ..., 0., 0., 0.],\n", + " [[ 170.4880, 175.1580, 106.5660],\n", + " [ 171.8100, 177.5960, 109.1870],\n", + " [ 174.0830, 180.6050, 108.7410],\n", " ...,\n", - " [-1., -1., -1., ..., -1., -1., -1.],\n", - " [-1., -1., -1., ..., -1., -1., -1.],\n", - " [-1., -1., -1., ..., -1., -1., -1.]]]),\n", - " 'residue_types': tensor([[[15.],\n", - " [15.],\n", - " [15.],\n", + " [ 153.4260, 188.1030, 169.2780],\n", + " [ 155.3650, 185.4840, 167.3250],\n", + " [ 158.9320, 185.6340, 166.0330]]]),\n", + " 'residue_ids': tensor([[ 1.0000e+00, 1.0000e+00, 1.0000e+00, ..., -9.9000e+01,\n", + " -9.9000e+01, -9.9000e+01],\n", + " [ 2.1500e+02, 2.1500e+02, 2.1500e+02, ..., 1.1670e+03,\n", + " 1.1670e+03, 1.1670e+03]]),\n", + " 'chain_ids': tensor([[ 0., 0., 0., ..., -1., -1., -1.],\n", + " [ 0., 0., 0., ..., 1., 1., 1.]])},\n", + " 'feature_complex': {'atom_types': tensor([[[ 0.],\n", + " [ 1.],\n", + " [ 2.],\n", " ...,\n", - " [15.],\n", - " [15.],\n", - " [15.]],\n", + " [-1.],\n", + " [-1.],\n", + " [-1.]],\n", " \n", - " [[12.],\n", - " [12.],\n", - " [12.],\n", + " [[ 0.],\n", + " [ 1.],\n", + " [ 2.],\n", + " ...,\n", + " [ 1.],\n", + " [ 2.],\n", + " [ 3.]]]),\n", + " 'residue_types': tensor([[[ 2.],\n", + " [ 2.],\n", + " [ 2.],\n", " ...,\n", " [-1.],\n", " [-1.],\n", - " [-1.]]]),\n", - " 'atom_coordinates': tensor([[[ 194.5170, 179.2660, -91.8800],\n", - " [ 194.9840, 179.8980, -90.6150],\n", - " [ 193.8100, 180.4120, -89.7870],\n", - " ...,\n", - " [ 178.4873, 215.5139, -38.6835],\n", - " [ 178.2736, 215.6114, -40.1233],\n", - " [ 179.1470, 216.7183, -40.7253]],\n", + " [-1.]],\n", " \n", - " [[ -90.1810, -82.1340, -226.8990],\n", - " [ -90.2500, -81.9540, -225.4530],\n", - " [ -90.5700, -80.5080, -225.0850],\n", + " [[13.],\n", + " [13.],\n", + " [13.],\n", + " ...,\n", + " [13.],\n", + " [13.],\n", + " [13.]]]),\n", + " 'atom_coordinates': tensor([[[ 289.1240, 316.4350, 305.0190],\n", + " [ 290.4980, 316.8960, 304.8630],\n", + " [ 291.3100, 316.6540, 306.1310],\n", " ...,\n", " [-100.0000, -100.0000, -100.0000],\n", " [-100.0000, -100.0000, -100.0000],\n", - " [-100.0000, -100.0000, -100.0000]]]),\n", - " 'residue_coordinates': tensor([[[ 194.5170, 179.2660, -91.8800],\n", - " [ 194.9840, 179.8980, -90.6150],\n", - " [ 193.8100, 180.4120, -89.7870],\n", - " ...,\n", - " [ 178.4873, 215.5139, -38.6835],\n", - " [ 178.2736, 215.6114, -40.1233],\n", - " [ 179.1470, 216.7183, -40.7253]],\n", + " [-100.0000, -100.0000, -100.0000]],\n", " \n", - " [[ -90.1810, -82.1340, -226.8990],\n", - " [ -90.2500, -81.9540, -225.4530],\n", - " [ -90.5700, -80.5080, -225.0850],\n", + " [[ 169.2570, 175.1550, 105.7850],\n", + " [ 170.4880, 175.1580, 106.5660],\n", + " [ 170.5260, 176.3570, 107.5090],\n", + " ...,\n", + " [ 109.5580, 141.3806, 149.9941],\n", + " [ 110.3494, 140.1194, 150.3209],\n", + " [ 111.2073, 140.1200, 151.2038]]]),\n", + " 'residue_coordinates': tensor([[[ 290.4980, 316.8960, 304.8630],\n", + " [ 291.8970, 317.5740, 308.3580],\n", + " [ 295.3220, 319.0930, 308.9830],\n", " ...,\n", " [-100.0000, -100.0000, -100.0000],\n", " [-100.0000, -100.0000, -100.0000],\n", - " [-100.0000, -100.0000, -100.0000]]]),\n", - " 'residue_ids': tensor([[ 1., 1., 1., ..., 280., 280., 280.],\n", - " [ 1., 1., 1., ..., -99., -99., -99.]]),\n", - " 'chain_ids': tensor([[ 0., 0., 0., ..., 1., 1., 1.],\n", - " [ 0., 0., 0., ..., -1., -1., -1.]])},\n", - " 'id': ['2fte__A43_P49861--2fte__G44_P49861',\n", - " '3jc8__JB1_Q306N5--3jc8__NB1_Q306N4'],\n", - " 'sample_id': ['2fte__A43_P49861-R--2fte__G44_P49861-L',\n", - " '3jc8__JB1_Q306N5-R--af__Q306N4'],\n", - " 'target_id': ['2fte__A43_P49861-R--2fte__G44_P49861-L',\n", - " '3jc8__JB1_Q306N5-R--3jc8__NB1_Q306N4-L']}" + " [-100.0000, -100.0000, -100.0000]],\n", + " \n", + " [[ 170.4880, 175.1580, 106.5660],\n", + " [ 171.8100, 177.5960, 109.1870],\n", + " [ 174.0830, 180.6050, 108.7410],\n", + " ...,\n", + " [ 106.3922, 144.9902, 154.8819],\n", + " [ 109.4120, 143.4231, 153.1913],\n", + " [ 109.5580, 141.3806, 149.9941]]]),\n", + " 'residue_ids': tensor([[ 1.0000e+00, 1.0000e+00, 1.0000e+00, ..., -9.9000e+01,\n", + " -9.9000e+01, -9.9000e+01],\n", + " [ 2.1500e+02, 2.1500e+02, 2.1500e+02, ..., 1.1670e+03,\n", + " 1.1670e+03, 1.1670e+03]]),\n", + " 'chain_ids': tensor([[ 0., 0., 0., ..., -1., -1., -1.],\n", + " [ 0., 0., 0., ..., 1., 1., 1.]])},\n", + " 'id': ['7wl3__A23_A0A866W289--7wl3__A24_A0A866W289',\n", + " '8ae1__A1_Q9RRB6--8ae1__B1_Q9RRB6'],\n", + " 'sample_id': ['7wl3__A23_A0A866W289-R--7wl3__A24_A0A866W289-L',\n", + " '8ae1__A1_Q9RRB6-R--8ae1__B1_Q9RRB6-L'],\n", + " 'target_id': ['7wl3__A23_A0A866W289-R--7wl3__A24_A0A866W289-L',\n", + " '8ae1__A1_Q9RRB6-R--8ae1__B1_Q9RRB6-L']}" ] }, - "execution_count": 6, + "execution_count": 22, "metadata": {}, "output_type": "execute_result" } diff --git a/src/pinder-core/pinder/core/loader/dataset.py b/src/pinder-core/pinder/core/loader/dataset.py index f817af3..6a0c89e 100644 --- a/src/pinder-core/pinder/core/loader/dataset.py +++ b/src/pinder-core/pinder/core/loader/dataset.py @@ -52,10 +52,12 @@ def structure2tensor_transform(structure: Structure) -> dict[str, torch.Tensor]: + calpha = structure.filter("atom_name", mask=["CA"]) props: dict[str, torch.Tensor] = structure2tensor( atom_coordinates=structure.coords, - atom_types=structure.atom_array.element, - residue_coordinates=structure.coords, + atom_types=structure.atom_array.atom_name, + element_types=structure.atom_array.element, + residue_coordinates=calpha.coords, residue_types=structure.atom_array.res_name, residue_ids=structure.atom_array.res_id, chain_ids=structure.atom_array.chain_id, diff --git a/src/pinder-core/pinder/core/loader/geodata.py b/src/pinder-core/pinder/core/loader/geodata.py index 5d95aba..8e75fae 100644 --- a/src/pinder-core/pinder/core/loader/geodata.py +++ b/src/pinder-core/pinder/core/loader/geodata.py @@ -30,6 +30,7 @@ def structure2tensor( atom_coordinates: NDArray[np.double] | None = None, atom_types: NDArray[np.str_] | None = None, + element_types: NDArray[np.str_] | None = None, residue_coordinates: NDArray[np.double] | None = None, residue_ids: NDArray[np.int_] | None = None, residue_types: NDArray[np.str_] | None = None, @@ -38,14 +39,16 @@ def structure2tensor( ) -> dict[str, torch.Tensor]: property_dict = {} if atom_types is not None: - types_array_ele = np.zeros( - (len(atom_types), len(set(list(pc.ELE2NUM.values())))) - ) + unknown_name_idx = max(pc.ALL_ATOM_POSNS.values()) + 1 + types_array_at = np.zeros((len(atom_types), 1)) for i, name in enumerate(atom_types): - types_array_ele[i, pc.ELE2NUM.get(name, "C")] = 1.0 - - property_dict["atom_types"] = torch.tensor(types_array_ele).type(dtype) - + types_array_at[i] = pc.ALL_ATOM_POSNS.get(name, unknown_name_idx) + property_dict["atom_types"] = torch.tensor(types_array_at).type(dtype) + if element_types is not None: + types_array_ele = np.zeros((len(element_types), 1)) + for i, name in enumerate(element_types): + types_array_ele[i] = pc.ELE2NUM.get(name, pc.ELE2NUM["other"]) + property_dict["element_types"] = torch.tensor(types_array_ele).type(dtype) if residue_types is not None: unknown_name_idx = max(pc.AA_TO_INDEX.values()) + 1 types_array_res = np.zeros((len(residue_types), 1)) @@ -119,14 +122,16 @@ def from_structure_pair( lig_calpha = ligand.filter("atom_name", mask=["CA"]) rec_props = structure2tensor( atom_coordinates=receptor.coords, - atom_types=receptor.atom_array.element, + atom_types=receptor.atom_array.atom_name, + element_types=receptor.atom_array.element, residue_coordinates=rec_calpha.coords, residue_types=rec_calpha.atom_array.res_name, residue_ids=rec_calpha.atom_array.res_id, ) lig_props = structure2tensor( atom_coordinates=ligand.coords, - atom_types=ligand.atom_array.element, + atom_types=ligand.atom_array.atom_name, + element_types=ligand.atom_array.element, residue_coordinates=lig_calpha.coords, residue_types=lig_calpha.atom_array.res_name, residue_ids=lig_calpha.atom_array.res_id,
Confusing features in dataset returned by `get_torch_loader` I'm trying to use the dataloaders returned by `pinder.core.loader.dataset.get_torch_loader` for all-atom representations of the protein complexes. When I iterate over the keys present in a sample from one of these datasets, I get: ``` from pinder.core.loader.dataset import PinderDataset, get_torch_loader train, val = [get_torch_loader(PinderDataset(split=split)) for split in ["train", "val"]] for key in train.dataset[0].keys(): print(key, type(train.dataset[0][key])) if type(train.dataset[0][key]) == dict: for key2 in train.dataset[0][key].keys(): print(" ", key2, type(train.dataset[0][key][key2]), train.dataset[0][key][key2].shape) ### ------- Output ------- ### target_complex <class 'dict'> atom_types <class 'torch.Tensor'> torch.Size([2556, 12]) residue_types <class 'torch.Tensor'> torch.Size([2556, 1]) atom_coordinates <class 'torch.Tensor'> torch.Size([2556, 3]) residue_coordinates <class 'torch.Tensor'> torch.Size([2556, 3]) residue_ids <class 'torch.Tensor'> torch.Size([2556]) chain_ids <class 'torch.Tensor'> torch.Size([2556]) feature_complex <class 'dict'> atom_types <class 'torch.Tensor'> torch.Size([2556, 12]) residue_types <class 'torch.Tensor'> torch.Size([2556, 1]) atom_coordinates <class 'torch.Tensor'> torch.Size([2556, 3]) residue_coordinates <class 'torch.Tensor'> torch.Size([2556, 3]) residue_ids <class 'torch.Tensor'> torch.Size([2556]) chain_ids <class 'torch.Tensor'> torch.Size([2556]) id <class 'str'> sample_id <class 'str'> target_id <class 'str'> ``` I have the following questions: **What is the difference between `atom_coordinates` and `residue_coordinates`?** For at least the first 10 examples in the train dataset, I find that ``` for i in range(10): print((train.dataset[i]['feature_complex']['residue_coordinates'] == train.dataset[i]['feature_complex']['atom_coordinates']).all()) ``` returns `True`. **Can the loader be modified to also return atom name information?** The `atom_types` tensor provides only a one-hot encoding of element type, for example, running ``` train.dataset[0]['target_complex']['atom_types'].unique(dim=0) ``` returns ``` tensor([[0., 0., 0., 0., 1., 0., 0., 0., 0., 0., 0., 0.], [0., 0., 0., 1., 0., 0., 0., 0., 0., 0., 0., 0.], [0., 0., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0.], [1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]]) ``` This is confusing when compared to the `Structure` class, in which `atom_name` is encoded as elements of `constants.BB_ATOMS` and `constants.SC_ATOMS` (e.g. 'N', 'CA', 'C', 'O', 'CB', 'CG', etc.). **It would be useful/less confusing if the dataloader returned by `get_torch_loader` contained information that corresponded more closely to the data provided in the `Structure` class.**
Hi @eswan01, thanks for the feedback on the example transform implementation. I agree that it would make sense to rename the misleading `atom_types` key to reflect that its actually encodings of elements and not atom types and also introduce an atom type encoding. ## Regarding your first question > What is the difference between atom_coordinates and residue_coordinates? In the `PinderDataset` (torch dataset), there is no difference. It appears this was an oversight when hijacking the existing transform that was targeting the torch-geometric dataset. In the torch-geometric dataset, the difference is that `residue_coordinates` tracks only the C-alpha atom coordinates (one per residue) and `atom_coordinates` tracks all-atom. Note the `receptor.filter("atom_name", mask=["CA"])` below: https://github.com/pinder-org/pinder/blob/bb62635bcb4186cf4f45696fc3da5082bb899f0a/src/pinder-core/pinder/core/loader/geodata.py#L118-L133 That `structure2tensor` function really just serves as an example transform for how one could go from `Structure` instances to Tensor-encoded data items. In the `PinderDataset` implementation, the _default_ torch-API transform defined is the `structure2tensor_transform` which essentially just wraps the `structure2tensor` method such that it accepts a `Structure` as input and returns a dict of tensors. https://github.com/pinder-org/pinder/blob/bb62635bcb4186cf4f45696fc3da5082bb899f0a/src/pinder-core/pinder/core/loader/dataset.py#L238-L254 As you can see below, the current version uses all-atom coordinates for both `residue_coordinates` and `atom_coordinates` (the oversight): https://github.com/pinder-org/pinder/blob/bb62635bcb4186cf4f45696fc3da5082bb899f0a/src/pinder-core/pinder/core/loader/dataset.py#L54-L63 I will push a fix to that default transform shortly 👍 ## Regarding the second question > Can the loader be modified to also return atom name information? As I alluded to above, we can definitely adjust the info being returned by the default transform as you suggested. I will try to include that in the upcoming patch for the `residue_coordinates` bug. That being said, the short answer to > Can the loader be modified to also return atom name information? > It would be useful/less confusing if the dataloader returned by get_torch_loader contained information that corresponded more closely to the data provided in the Structure class. > **Absolutely!** You can define whatever transform you desire, that's why the `PinderLoader` default return value of `__getitem__` contains a tuple of `(PinderSystem, Structure(<feature complex>), Structure(<target complex>))` https://github.com/pinder-org/pinder/blob/bb62635bcb4186cf4f45696fc3da5082bb899f0a/src/pinder-core/pinder/core/loader/dataset.py#L293-L299 You can specify your own `transform` and `target_transform` to apply to the `feature_complex` `Structure` and `target_complex` `Structure`. This closely follows the transform/target_transform concepts from the `torch` datasets + dataloader tutorial: https://pytorch.org/tutorials/beginner/basics/data_tutorial.html#creating-a-custom-dataset-for-your-files
2024-09-25T20:48:43
0.0
[]
[]
pinder-org/pinder
pinder-org__pinder-18
ab4daaa24a873fadca3fcf265bea1b9eae817d82
diff --git a/src/pinder-core/pinder/core/index/system.py b/src/pinder-core/pinder/core/index/system.py index 12736df..7c46edd 100644 --- a/src/pinder-core/pinder/core/index/system.py +++ b/src/pinder-core/pinder/core/index/system.py @@ -51,6 +51,41 @@ def _align_monomers_with_mask( return monomer1, monomer2 +def unbound_rmsd_with_mask_fallback( + mobile: Structure, + fixed: Structure, +) -> float: + """Calculates the RMSD after superposition between two monomer structures. + + The method wraps the `Structure.superimpose` method, initially trying to superimpose + without masking non-common atoms and annotations. If the initial alignment fails, this method + falls back to masked superposition where differing atoms are removed prior to superposition. + + Parameters: + mobile (Structure): The unbound monomer to superimpose to the reference (fixed) structure. + fixed (Structure): The fixed reference monomer to superimpose the mobile structure to. + + Returns: + raw_rmsd (float): The RMSD between the mobile and fixed structure after superposition (without outlier rejection). + + """ + raw_rmsd: float + try: + _, raw_rmsd, _ = mobile.superimpose(fixed) + except ValueError as e: + log.debug( + f"Failed to superimpose {mobile.pinder_id}->{fixed.pinder_id} without cropping, re-trying with atom masking..." + ) + mobile, fixed = mobile.align_common_sequence( + fixed, + remove_differing_atoms=True, + renumber_residues=False, + remove_differing_annotations=False, + ) + _, raw_rmsd, _ = mobile.superimpose(fixed) + return raw_rmsd + + class PinderSystem: """Represents a system within the Pinder framework designed to handle and process structural data. It provides functionality to load, align, and analyze @@ -475,11 +510,10 @@ def unbound_rmsd(self, monomer_name: MonomerName) -> dict[str, float]: holo_R = self.aligned_holo_R holo_L = self.aligned_holo_L - # Even if atom counts are identical, annotation categories must be the same assert isinstance(apo_R, Structure) assert isinstance(apo_L, Structure) - _, rms_R, _ = apo_R.superimpose(holo_R) - _, rms_L, _ = apo_L.superimpose(holo_L) + rms_R = unbound_rmsd_with_mask_fallback(apo_R, holo_R) + rms_L = unbound_rmsd_with_mask_fallback(apo_L, holo_L) return { "monomer_name": monomer_name.value, "receptor_rmsd": rms_R, diff --git a/src/pinder-core/pinder/core/loader/loader.py b/src/pinder-core/pinder/core/loader/loader.py index 441a67c..08545b4 100644 --- a/src/pinder-core/pinder/core/loader/loader.py +++ b/src/pinder-core/pinder/core/loader/loader.py @@ -364,6 +364,8 @@ def __getitem__(self, idx: int) -> tuple[PinderSystem, Structure, Structure]: system, self.base_filters, self.sub_filters ) if not isinstance(system, PinderSystem): + # Select a new random system, previous one failed filters + idx = random.choice(list(range(len(self)))) continue if self.pre_specified_monomers is not None: diff --git a/src/pinder-core/pinder/core/loader/structure.py b/src/pinder-core/pinder/core/loader/structure.py index c4cd330..f8fd7f2 100644 --- a/src/pinder-core/pinder/core/loader/structure.py +++ b/src/pinder-core/pinder/core/loader/structure.py @@ -657,9 +657,12 @@ def _superimpose_common_atoms( # Only run fallback if number of anchors is the issue if "anchor" not in str(error): raise - fixed_common_mask = struc.filter_intersection(fixed, mobile) + fixed_masked, mobile_masked = surgery.fix_annotation_mismatch( + fixed, mobile, ["element", "ins_code", "b_factor"] + ) + fixed_common_mask = struc.filter_intersection(fixed_masked, mobile_masked) fixed_coord = fixed.coord[fixed_common_mask] - mobile_common_mask = struc.filter_intersection(mobile, fixed) + mobile_common_mask = struc.filter_intersection(mobile_masked, fixed_masked) mobile_coord = mobile.coord[mobile_common_mask] _, transformation = struc.superimpose(fixed_coord, mobile_coord) mobile_superimposed = transformation.apply(mobile) diff --git a/src/pinder-core/pinder/core/structure/superimpose.py b/src/pinder-core/pinder/core/structure/superimpose.py index 343e8b1..19599ee 100644 --- a/src/pinder-core/pinder/core/structure/superimpose.py +++ b/src/pinder-core/pinder/core/structure/superimpose.py @@ -100,7 +100,9 @@ def superimpose_chain( if len(anchor_indices) < min_anchors: # Fallback: Match all CA atoms if len(fixed_ca_indices) != len(mobile_ca_indices): - raise ValueError("Tried fallback, but number of CA atoms does not match") + raise ValueError( + "Tried fallback, but number of CA atoms does not match and insufficient anchors were found" + ) fixed_anchor_indices = fixed_ca_indices mobile_anchor_indices = mobile_ca_indices else: diff --git a/src/pinder-core/pinder/core/structure/surgery.py b/src/pinder-core/pinder/core/structure/surgery.py index 43d2fd9..9848ad6 100644 --- a/src/pinder-core/pinder/core/structure/surgery.py +++ b/src/pinder-core/pinder/core/structure/surgery.py @@ -32,7 +32,7 @@ def remove_annotations( def fix_annotation_mismatch( ref: AtomArray, decoys: AtomArrayStack, - categories: list[str] = ["element", "ins_code"], + categories: list[str] = ["element", "ins_code", "b_factor"], ) -> tuple[AtomArray, AtomArrayStack]: for annot in ref.get_annotation_categories(): ref_annot = ref.get_annotation(annot)
`BadStructureError` exception on writing a PDB file I’m trying to save some PDB files into a location with `PinderDefaultWriter`. I get the following exception at some point: ``` Traceback (most recent call last): loaded = loader[i] File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/loader.py", line 398, in __getitem__ self.writer.write(system) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/writer.py", line 33, in write structure.to_pdb(pinder_path / structure.filepath.name) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/structure.py", line 83, in to_pdb write_pdb(self.atom_array, filepath) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/structure/atoms.py", line 908, in write_pdb strucio.save_structure(filepath, arr) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/general.py", line 174, in save_structure file.set_structure(array, **kwargs) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/pdb/file.py", line 579, in set_structure _check_pdb_compatibility(array, hybrid36) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/pdb/file.py", line 1210, in _check_pdb_compatibili ty raise BadStructureError( biotite.structure.BadStructureError: 3 pre-decimal columns for B-factor are available, but array would require 4 ``` My loader is like this: ```python loader = PinderLoader( split="train", base_filters = base_filters, writer=PinderDefaultWriter(outdir) ) ``` And my filters are just ```python base_filters = [ filters.FilterByMissingHolo(), filters.FilterMetadataFields(pinder_af2 = ('is not', True)) ] ``` `BadStructureError` exception on writing a PDB file I’m trying to save some PDB files into a location with `PinderDefaultWriter`. I get the following exception at some point: ``` Traceback (most recent call last): loaded = loader[i] File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/loader.py", line 398, in __getitem__ self.writer.write(system) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/writer.py", line 33, in write structure.to_pdb(pinder_path / structure.filepath.name) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/structure.py", line 83, in to_pdb write_pdb(self.atom_array, filepath) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/structure/atoms.py", line 908, in write_pdb strucio.save_structure(filepath, arr) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/general.py", line 174, in save_structure file.set_structure(array, **kwargs) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/pdb/file.py", line 579, in set_structure _check_pdb_compatibility(array, hybrid36) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/pdb/file.py", line 1210, in _check_pdb_compatibili ty raise BadStructureError( biotite.structure.BadStructureError: 3 pre-decimal columns for B-factor are available, but array would require 4 ``` My loader is like this: ```python loader = PinderLoader( split="train", base_filters = base_filters, writer=PinderDefaultWriter(outdir) ) ``` And my filters are just ```python base_filters = [ filters.FilterByMissingHolo(), filters.FilterMetadataFields(pinder_af2 = ('is not', True)) ] ``` `BadStructureError` exception on writing a PDB file I’m trying to save some PDB files into a location with `PinderDefaultWriter`. I get the following exception at some point: ``` Traceback (most recent call last): loaded = loader[i] File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/loader.py", line 398, in __getitem__ self.writer.write(system) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/writer.py", line 33, in write structure.to_pdb(pinder_path / structure.filepath.name) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/structure.py", line 83, in to_pdb write_pdb(self.atom_array, filepath) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/pinder/core/structure/atoms.py", line 908, in write_pdb strucio.save_structure(filepath, arr) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/general.py", line 174, in save_structure file.set_structure(array, **kwargs) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/pdb/file.py", line 579, in set_structure _check_pdb_compatibility(array, hybrid36) File "/home/greg/miniconda/envs/pinder/lib/python3.10/site-packages/biotite/structure/io/pdb/file.py", line 1210, in _check_pdb_compatibili ty raise BadStructureError( biotite.structure.BadStructureError: 3 pre-decimal columns for B-factor are available, but array would require 4 ``` My loader is like this: ```python loader = PinderLoader( split="train", base_filters = base_filters, writer=PinderDefaultWriter(outdir) ) ``` And my filters are just ```python base_filters = [ filters.FilterByMissingHolo(), filters.FilterMetadataFields(pinder_af2 = ('is not', True)) ] ```
2024-09-23T19:14:54
0.0
[]
[]
pinder-org/pinder
pinder-org__pinder-11
8ad1ead7a174736635c13fa7266d9ca54cf9f44e
diff --git a/README.md b/README.md index 997d47e..b194eeb 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ I/O operations. fastpdb is a dependency of pinder-core, and pip will attempt to install it for you during the installation of pinder. Pre-built wheels of fastpdb are available on PyPI for the following platforms: 1. Linux with `glibc>=2.34` (e.g., Debian 12, Ubuntu 22.04, RHEL 9, etc.) -2. Intel-based (x86, not Apple Silicon) MacOS Sierra (10.12) or newer +2. MacOS Sierra (10.12) or newer 3. Windows If your platform doesn't match these conditions, you will not get a wheel and @@ -50,24 +50,12 @@ environment. This can be done using [`mamba`](https://github.com/mamba-org/mamba) or `conda` (you can swap `mamba` for `conda` for the same functionality): -**Linux and Intel-based (x86-64) CPU architecture** ```bash mamba create --name pinder python=3.10 mamba activate pinder ``` -**Apple Silicon-based (ARM) CPU architecture** - -Unfortunately, until all pinder dependencies have an ARM wheel on PyPi, we have to instruct conda to use an osx-64 target arch. - -```bash -CONDA_SUBDIR=osx-64 mamba create --name pinder python=3.10 -mamba activate pinder -mamba env config vars set CONDA_SUBDIR=osx-64 -mamba deactivate -mamba activate pinder -``` or via `venv` from the Python standard library: @@ -388,31 +376,7 @@ Each model decoy should have exactly two chains: {R, L} for {Receptor, Ligand}, ``` For more details on the implementations of the eval metrics, see the [eval docs](examples/eval/). - - -### 📨 pinder_create_submission - -It is recommended to run through the `pinder_eval` script at least once to get familiar with the format and any common issues encountered with input validation. Once you are ready to submit your method to the leaderboard, use the `pinder_create_submission` CLI script to create a single archive to upload: - -``` -pinder_create_submission --help - -usage: pinder_create_submission [-h] --eval_dir eval_dir [--submission_name submission_name] - -optional arguments: - -h, --help show this help message and exit - --eval_dir eval_dir, -f eval_dir - Path to eval - --submission_name submission_name, -s submission_name, -n submission_name - Optional name for submission - -``` - -This will create a single archive which would be uploaded to a google drive that will be configured shortly. - -Leaderboards will be generated based on the valid submissions received. - -For more details on leaderboard generation, see the [Quarto dashboard](examples/eval/leaderboard/pinder-eval.qmd) and the [MethodMetrics](src/pinder-eval/pinder/eval/dockq/method.py) implementation. +For more details on leaderboard generation, see the [MethodMetrics](src/pinder-eval/pinder/eval/dockq/method.py) implementation. ## 4. 🧪 Training set diff --git a/src/pinder-core/pinder/core/index/system.py b/src/pinder-core/pinder/core/index/system.py index e627c32..a4a173b 100644 --- a/src/pinder-core/pinder/core/index/system.py +++ b/src/pinder-core/pinder/core/index/system.py @@ -85,6 +85,7 @@ def __init__( apo_ligand_pdb_code: str = "", metadata: MetadataEntry | None = None, dataset_path: Path | None = None, + pdb_engine: str = "fastpdb", **kwargs: dict[str, Any], ) -> None: """Initializes a PinderSystem instance. @@ -108,36 +109,59 @@ def __init__( self.pdbs_path = self.pinder_root / "pdbs" self.test_pdbs_path = self.pinder_root / "test_set_pdbs" self.mappings_path = self.pinder_root / "mappings" + self.pdb_engine = pdb_engine self.download_entry() - self.native = self.load_structure(self.pdbs_path / self.entry.pinder_pdb) + self.native = self.load_structure( + self.pdbs_path / self.entry.pinder_pdb, pdb_engine=self.pdb_engine + ) holo_pdb_path = ( self.test_pdbs_path if self.entry.test_system else self.pdbs_path ) - self.holo_receptor = self.load_structure(holo_pdb_path / self.entry.holo_R_pdb) - self.holo_ligand = self.load_structure(holo_pdb_path / self.entry.holo_L_pdb) + self.holo_receptor = self.load_structure( + holo_pdb_path / self.entry.holo_R_pdb, pdb_engine=self.pdb_engine + ) + self.holo_ligand = self.load_structure( + holo_pdb_path / self.entry.holo_L_pdb, pdb_engine=self.pdb_engine + ) # Can be multiple apo, we grab canonical unless pdb codes provided self.apo_receptor = self.load_structure( - self.pdbs_path / self.entry.apo_R_pdb, chain_id="R" + self.pdbs_path / self.entry.apo_R_pdb, + chain_id="R", + pdb_engine=self.pdb_engine, ) self.apo_ligand = self.load_structure( - self.pdbs_path / self.entry.apo_L_pdb, chain_id="L" + self.pdbs_path / self.entry.apo_L_pdb, + chain_id="L", + pdb_engine=self.pdb_engine, ) canon_L = self.entry.apo_L_pdb.split("__")[0] canon_R = self.entry.apo_R_pdb.split("__")[0] alt_r = self.load_alt_apo_structure( - self.entry.apo_R_alt, apo_receptor_pdb_code, canon_R, chain_id="R" + self.entry.apo_R_alt, + apo_receptor_pdb_code, + canon_R, + chain_id="R", + pdb_engine=self.pdb_engine, ) self.apo_receptor = alt_r or self.apo_receptor alt_l = self.load_alt_apo_structure( - self.entry.apo_L_alt, apo_ligand_pdb_code, canon_L, chain_id="L" + self.entry.apo_L_alt, + apo_ligand_pdb_code, + canon_L, + chain_id="L", + pdb_engine=self.pdb_engine, ) self.apo_ligand = alt_l or self.apo_ligand self.pred_receptor = self.load_structure( - self.pdbs_path / self.entry.predicted_R_pdb, chain_id="R" + self.pdbs_path / self.entry.predicted_R_pdb, + chain_id="R", + pdb_engine=self.pdb_engine, ) self.pred_ligand = self.load_structure( - self.pdbs_path / self.entry.predicted_L_pdb, chain_id="L" + self.pdbs_path / self.entry.predicted_L_pdb, + chain_id="L", + pdb_engine=self.pdb_engine, ) # Create native-aligned holo receptor and ligand prior to filtering on # common uniprot indices. To be used when creating unbound complexes. @@ -636,6 +660,7 @@ def load_alt_apo_structure( code: str, canon_code: str, chain_id: str | None = None, + pdb_engine: str = "fastpdb", ) -> Structure | None: """Loads an alternate apo structure based on the provided PDB codes, if available. @@ -643,6 +668,8 @@ def load_alt_apo_structure( alt_pdbs (List[str]): A list of alternative PDB file paths. code (str): The specific code to identify the alternate apo structure. canon_code (str): The canonical code for the apo structure. + chain_id (str, optional): The chain ID to assign to the structure. Defaults to None (leave as is). + pdb_engine (str, optional): The PDB engine to use for reading the structure. Defaults to "fastpdb". Returns: Optional[Structure]: The loaded Structure object if found, otherwise None. @@ -650,18 +677,24 @@ def load_alt_apo_structure( if (code != "") & (code != canon_code): apo = [f for f in alt_pdbs if f.split("__")[0] == code] if apo: - return self.load_structure(self.pdbs_path / apo[0], chain_id=chain_id) + return self.load_structure( + self.pdbs_path / apo[0], chain_id=chain_id, pdb_engine=pdb_engine + ) log.warning(f"Alternate apo PDB not found with code {code}") return None @staticmethod def load_structure( - pdb_file: Path | None, chain_id: str | None = None + pdb_file: Path | None, + chain_id: str | None = None, + pdb_engine: str = "fastpdb", ) -> Structure | None: """Loads a structure from a PDB file if it exists and is valid. Parameters: - pdb_file (Optional[Path]): The file path to the PDB file. + pdb_file (Path, optional): The file path to the PDB file. + chain_id (str, optional): The chain ID to assign to the structure. Defaults to None (leave as is). + pdb_engine (str, optional): The PDB engine to use for reading the structure. Defaults to "fastpdb". Returns: Optional[Structure]: @@ -670,7 +703,7 @@ def load_structure( if not pdb_file or Path(pdb_file).suffix != ".pdb": return None map_pqt = PinderSystem._get_mapping_pqt(pdb_file) - loaded: Structure = Structure(pdb_file, map_pqt) + loaded: Structure = Structure(pdb_file, map_pqt, pdb_engine=pdb_engine) if chain_id: chain_arr = np.array([chain_id] * loaded.atom_array.shape[0]) loaded.atom_array.set_annotation("chain_id", chain_arr) diff --git a/src/pinder-core/pinder/core/loader/dataset.py b/src/pinder-core/pinder/core/loader/dataset.py index b2a9519..8a296f6 100644 --- a/src/pinder-core/pinder/core/loader/dataset.py +++ b/src/pinder-core/pinder/core/loader/dataset.py @@ -40,6 +40,7 @@ def __init__( k: int = 10, parallel: bool = False, max_workers: int | None = None, + fallback_to_holo: bool = True, ) -> None: self.node_types = node_types self.split = split @@ -57,6 +58,7 @@ def __init__( self.k = k self.parallel = parallel self.max_workers = max_workers + self.fallback_to_holo = fallback_to_holo default_file_dir = Path(root) / "filenames" self.filenames_dir = default_file_dir if filenames_dir: @@ -105,6 +107,7 @@ def process_single_file( output_file: Path, add_edges: bool = True, k: int = 10, + fallback_to_holo: bool = True, ) -> bool: try: data = PairedPDB.from_pinder_system( @@ -114,6 +117,7 @@ def process_single_file( node_types=node_types, add_edges=add_edges, k=k, + fallback_to_holo=fallback_to_holo, ) torch.save(data, output_file) return True @@ -134,6 +138,7 @@ def process_single_file_parallel( bool, int, bool, + bool, ], ) -> str | None: ( @@ -147,6 +152,7 @@ def process_single_file_parallel( add_edges, k, force_reload, + fallback_to_holo, ) = args if not hasattr(system, "entry"): return None @@ -170,6 +176,7 @@ def process_single_file_parallel( to_write, add_edges, k, + fallback_to_holo, ) if processed: return pinder_id @@ -189,6 +196,7 @@ def process_parallel(self) -> None: self.add_edges, self.k, self.force_reload, + self.fallback_to_holo, ) for dimer in self.loader.dimers ) @@ -238,6 +246,7 @@ def process(self) -> None: to_write, self.add_edges, self.k, + self.fallback_to_holo, ) if processed: self.filenames.add(pinder_id) diff --git a/src/pinder-core/pinder/core/loader/geodata.py b/src/pinder-core/pinder/core/loader/geodata.py index 8fa87eb..ff7edec 100644 --- a/src/pinder-core/pinder/core/loader/geodata.py +++ b/src/pinder-core/pinder/core/loader/geodata.py @@ -79,10 +79,17 @@ def from_pinder_system( monomer2: str = "holo_ligand", add_edges: bool = True, k: int = 10, + fallback_to_holo: bool = True, ) -> PairedPDB: chain1_struc = getattr(system, monomer1) + if chain1_struc is None and fallback_to_holo: + log.debug(f"No {monomer1} found, falling back to holo_receptor") + chain1_struc = getattr(system, "holo_receptor") chain1_struc.filter("element", mask=["H"], negate=True, copy=False) chain2_struc = getattr(system, monomer2) + if chain2_struc is None and fallback_to_holo: + log.debug(f"No {monomer2} found, falling back to holo_ligand") + chain2_struc = getattr(system, "holo_ligand") chain2_struc.filter("element", mask=["H"], negate=True, copy=False) return cls.from_structure_pair( node_types=node_types, diff --git a/src/pinder-core/pinder/core/loader/structure.py b/src/pinder-core/pinder/core/loader/structure.py index c297af4..2ca96e2 100644 --- a/src/pinder-core/pinder/core/loader/structure.py +++ b/src/pinder-core/pinder/core/loader/structure.py @@ -45,6 +45,7 @@ class Structure: uniprot_map: Union[Optional[Path], Optional[pd.DataFrame]] = None pinder_id: Optional[str] = None atom_array: AtomArray = None + pdb_engine: str = "fastpdb" @staticmethod def read_pdb(path: Path, pdb_engine: str = "fastpdb") -> AtomArray: @@ -107,7 +108,10 @@ def __add__(self, other: Structure) -> Structure: uniprot_map = None return Structure( - filepath=combined_pdb, uniprot_map=uniprot_map, atom_array=combined_arr + filepath=combined_pdb, + uniprot_map=uniprot_map, + atom_array=combined_arr, + pdb_engine=self.pdb_engine, ) def filter( @@ -127,6 +131,7 @@ def filter( uniprot_map=self.uniprot_mapping, pinder_id=self.pinder_id, atom_array=arr, + pdb_engine=self.pdb_engine, ) self.atom_array = self.atom_array[atom_mask] return None @@ -184,12 +189,14 @@ def align_common_sequence( uniprot_map=self.uniprot_map, pinder_id=self.pinder_id, atom_array=target_at, + pdb_engine=self.pdb_engine, ) other_struct = Structure( filepath=other.filepath, uniprot_map=other.uniprot_map, pinder_id=other.pinder_id, atom_array=ref_at, + pdb_engine=self.pdb_engine, ) return self_struct, other_struct other.atom_array = ref_at @@ -307,6 +314,7 @@ def superimpose( uniprot_map=self.uniprot_map, pinder_id=self.pinder_id, atom_array=superimposed, + pdb_engine=self.pdb_engine, ), raw_rmsd, refined_rmsd, @@ -493,7 +501,7 @@ def _attr_from_atom_array( def __post_init__(self) -> None: # pydantic v2 renames this to dataclass post_init if self.atom_array is None: - self.atom_array = self.read_pdb(self.filepath) + self.atom_array = self.read_pdb(self.filepath, pdb_engine=self.pdb_engine) if not self.pinder_id: self.pinder_id = self.filepath.stem diff --git a/src/pinder-data/pinder/data/pipeline/tasks.py b/src/pinder-data/pinder/data/pipeline/tasks.py index 45ce966..fa5871f 100644 --- a/src/pinder-data/pinder/data/pipeline/tasks.py +++ b/src/pinder-data/pinder/data/pipeline/tasks.py @@ -51,30 +51,6 @@ def foldseek_pdb_glob(data_dir: Path) -> list[Path]: return list(data_dir.glob("*.pdb")) -def plm_embedding_glob(data_dir: Path) -> list[Path]: - return list(data_dir.glob("embeddings_*.npz")) - - -def plm_embedding_pairs(data_dir: Path) -> list[tuple[Path, Path]]: - npz_files = plm_embedding_glob(data_dir) - npz_pairs = [] - for i in range(len(npz_files)): - for j in range(i + 1, len(npz_files)): - chunk1 = npz_files[i] - chunk2 = npz_files[j] - output_dir = chunk1.parent / "similarities" - output_file = output_dir / f"similarities_{chunk1.stem}_{chunk2.stem}.txt" - if output_file.is_file(): - continue - npz_pairs.append((chunk1, chunk2)) - return npz_pairs - - -def plm_embedding_fasta(data_dir: Path) -> list[Path]: - fasta_file = list(data_dir.glob("*.fasta")) - return fasta_file - - def graph_type_glob(data_dir: Path) -> list[tuple[str, bool]]: graph_specs = [] for g in data_dir.glob("cleaned_*_alignment_graph.pkl"): @@ -115,9 +91,6 @@ def putative_apo_pairings(data_dir: Path) -> pd.DataFrame: "two_char_codes": two_char_code_rsync, "pdb_ids": pdb_id_glob, "foldseek": foldseek_pdb_glob, - "plm_fasta": plm_embedding_fasta, - "plm_embeddings": plm_embedding_glob, - "plm_embedding_pairs": plm_embedding_pairs, "graph_types": graph_type_glob, "putative_apo_pairings": putative_apo_pairings, }
APO and predicted structures will not load with PairedPDB from PinderSystems passed to function Hello, Systems are loaded with loader = PinderLoader(base_filters=base_filters, sub_filters=sub_filters) The function calls apo_data = PairedPDB.from_pinder_system( system=system, monomer1="apo_receptor", monomer2="apo_ligand", node_types=nodes, ) Which results in errors for every ID in the available metadata obtained with get_metadata() apo_data = PairedPDB.from_pinder_system( File "/home/kimlab5/mmcfee/miniconda3/envs/pinder/lib/python3.10/site-packages/pinder/core/loader/geodata.py", line 84, in from_pinder_system chain1_struc.filter("element", mask=["H"], negate=True, copy=False) AttributeError: 'NoneType' object has no attribute 'filter' Do you have any idea whats going on? Or do you have a better way to extract coordinates and atoms types for subsets of specific pinder systems and process them for saving? Thanks!
2024-08-19T19:47:35
0.0
[]
[]
jaraco/pip-run
jaraco__pip-run-86
926a0b5a713c1e19398129707ee576ad9e922cbc
diff --git a/README.rst b/README.rst index 74d20d6..caa565b 100644 --- a/README.rst +++ b/README.rst @@ -347,27 +347,26 @@ For specifics, see `pip_run.run() Environment Persistence ======================= -``pip-run`` honors the ``PIP_RUN_MODE`` variable. If unset or -set to ``ephemeral``, dependencies are installed to an ephemeral -temporary directory on each invocation (and deleted after). -Setting this variable to ``persist`` will instead create or re-use -a directory in the user's cache, only installing the dependencies if -the directory doesn't already exist. A separate cache is maintained -for each combination of requirements specified. - -``persist`` mode can greatly improve startup performance at the -expense of staleness and accumulated cruft. - -Without ``PIP_RUN_MODE=persist`` (or with ``=ephemeral``), ``pip-run`` will -re-install dependencies every time a script runs, silently adding to the -startup time while dependencies are installed into an ephemeral environment, -depending on how many dependencies there are and whether the dependencies have -been previously downloaded to the local pip cache. Use ``pip-run -v ...`` to -see the installation activity. +``pip-run`` honors the ``PIP_RUN_RETENTION_STRATEGY`` variable. If unset or +set to ``destroy``, dependencies are installed to a temporary directory on +each invocation (and deleted after). Setting this variable to ``persist`` will +instead create or re-use a directory in the user's cache, only installing the +dependencies if the directory doesn't already exist. A separate cache is +maintained for each combination of requirements specified. + +``persist`` strategy can greatly improve startup performance at the expense of +staleness and accumulated cruft. + +Without ``PIP_RUN_RETENTION_STRATEGY=persist`` (or with ``=destroy``), +``pip-run`` will re-install dependencies every time a script runs, silently +adding to the startup time while dependencies are installed into an ephemeral +environment, depending on how many dependencies there are and whether the +dependencies have been previously downloaded to the local pip cache. Use +``pip-run -v ...`` to see the installation activity. The location of the cache can be revealed with this command:: - py -c 'import importlib; print(importlib.import_module("pip_run.mode.persist").paths.user_cache_path)' + py -c 'import importlib; print(importlib.import_module("pip_run.retention.persist").paths.user_cache_path)' Limitations diff --git a/newsfragments/84.feature.rst b/newsfragments/84.feature.rst new file mode 100644 index 0000000..91a1925 --- /dev/null +++ b/newsfragments/84.feature.rst @@ -0,0 +1,1 @@ +Renamed PIP_RUN_MODE variable to PIP_RUN_RETENTION_STRATEGY. Also renamed the default value of 'ephemeral' to 'destroy'. If PIP_RUN_MODE is used, a warning is emitted. diff --git a/pip_run/deps.py b/pip_run/deps.py index b6cad31..48e9eaa 100644 --- a/pip_run/deps.py +++ b/pip_run/deps.py @@ -8,6 +8,7 @@ import pathlib import types import importlib +import warnings import packaging.requirements from jaraco.context import suppress @@ -53,9 +54,19 @@ def __bool__(self): return bool(self.requirement or self.package) -def mode(): - mode = os.environ.get('PIP_RUN_MODE', 'ephemeral') - return importlib.import_module(f'.mode.{mode}', package=__package__) +def _mode_compat(): + if mode := os.environ.get('PIP_RUN_MODE'): # pragma: no cover + warnings.warn( + 'PIP_RUN_MODE is deprecated. Use PIP_RUN_RETENTION_STRATEGY instead.', + ) + return mode.replace('ephemeral', 'destroy') + + +def retention_strategy(): + strategy = ( + os.environ.get('PIP_RUN_RETENTION_STRATEGY') or _mode_compat() or 'destroy' + ) + return importlib.import_module(f'.retention.{strategy}', package=__package__) @suppress(FileNotFoundError) @@ -82,7 +93,7 @@ def empty(path): @contextlib.contextmanager def load(*args): - with mode().context(args) as target: + with retention_strategy().context(args) as target: cmd = (sys.executable, '-m', 'pip', 'install', '-t', sp(target)) + args env = dict(os.environ, PIP_QUIET="1") if Install.parse(args) and empty(target): diff --git a/pip_run/mode/__init__.py b/pip_run/retention/__init__.py similarity index 100% rename from pip_run/mode/__init__.py rename to pip_run/retention/__init__.py diff --git a/pip_run/mode/ephemeral.py b/pip_run/retention/destroy.py similarity index 100% rename from pip_run/mode/ephemeral.py rename to pip_run/retention/destroy.py diff --git a/pip_run/mode/persist.py b/pip_run/retention/persist.py similarity index 100% rename from pip_run/mode/persist.py rename to pip_run/retention/persist.py
Consider renaming PIP_RUN_MODE In #82, I'm considering renaming the variable name "mode". The name is too general - doesn't convey its specific purpose. Here are some alternatives I'm considering: - _target_: building on the name of the parameter used by pip - _install target_: incorporating the name of the command and parameter used by pip - _env_: inspired by the name of the "environment" - _environment_: full spelling of above - _retention_: captures the concept around persisting or not - _strategy_ suffix: any of the above with "strategy" appended I'm liking PIP_RUN_ENVIRONMENT_STRATEGY and PIP_RUN_RETENTION_STRATEGY best.
I'm planning to proceed with (PIP_RUN_) RETENTION_STRATEGY. It's a little verbose, but communicates the purpose best, IMO.
2023-10-01T16:20:12
0.0
[]
[]
virejdasani/pythOwO
virejdasani__pythOwO-9
881f6cabf939768fe1401427657b3624b29d0ce4
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e72a96d --- /dev/null +++ b/.gitignore @@ -0,0 +1,166 @@ +# Created by https://www.toptal.com/developers/gitignore/api/python +# Edit at https://www.toptal.com/developers/gitignore?templates=python + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +# End of https://www.toptal.com/developers/gitignore/api/python diff --git a/README.md b/README.md index a586683..3e45037 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,12 @@ This is pythOwO <h2 align="center">Contributing</h2> <p align="center">All contributions are welcome, just make a pull request!</p> +Unit tests are available through the unittest module. New test files must start with `test*.py` to be detected. + +```sh +python -m unittest +``` + > Pythowo logo [credit](https://www.reddit.com/r/ProgrammerHumor/comments/vkkyyv/say_hello_to_pythowo_make_sure_to_treat_her_well/) diff --git a/pythowo.py b/pythowo.py index 2d845be..e49a7a0 100644 --- a/pythowo.py +++ b/pythowo.py @@ -1514,6 +1514,42 @@ def multed_by(self, other): else: return None, Value.illegal_operation(self, other) + def get_comparison_eq(self, other): + if isinstance(other, String): + return Number(int(self.value == other.value)).set_context(self.context), None + else: + return None, Value.illegal_operation(self, other) + + def get_comparison_ne(self, other): + if isinstance(other, String): + return Number(int(self.value != other.value)).set_context(self.context), None + else: + return None, Value.illegal_operation(self, other) + + def get_comparison_lt(self, other): + if isinstance(other, String): + return Number(int(self.value < other.value)).set_context(self.context), None + else: + return None, Value.illegal_operation(self, other) + + def get_comparison_gt(self, other): + if isinstance(other, String): + return Number(int(self.value > other.value)).set_context(self.context), None + else: + return None, Value.illegal_operation(self, other) + + def get_comparison_lte(self, other): + if isinstance(other, String): + return Number(int(self.value <= other.value)).set_context(self.context), None + else: + return None, Value.illegal_operation(self, other) + + def get_comparison_gte(self, other): + if isinstance(other, String): + return Number(int(self.value >= other.value)).set_context(self.context), None + else: + return None, Value.illegal_operation(self, other) + def is_true(self): return len(self.value) > 0
can't compare strings. I cant compare strings in conditional statements. for example this code produces an error: > pwease baka = "hewwo" pwease awoo = "hewwo" IF awoo==baka THWEN pwint("they are equal ") EWSE pwint("twy again") the error message is > Traceback (most recent call last): File test.pyowo, line 4, in <program> owo, whats this? Runtime Error? Oh nwo! : Illegal operation IF awoo==baka THWEN pwint("yay") EWSE pwint("twy again") __^^^^^^^^^^
Looks like `String`s don't have the comparison operators implemented. They're defaulting to `Value`'s implementation that returns an illegal operation error. This can be fixed by overriding the [Value comparison operators](https://github.com/virejdasani/pythOwO/blob/main/pythowo.py#L1343-L1359) with an implementation [around here](https://github.com/virejdasani/pythOwO/blob/main/pythowo.py#L1505-L1518).
2022-06-27T00:27:34
0.0
[]
[]
IBM/nl2flow
IBM__nl2flow-60
76cb94b5132832ee8d8dda5decb5e09b2dae40ea
diff --git a/pyproject.toml b/pyproject.toml index d3c9e05..b730775 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "nl2flow" -version = "0.0.1" +version = "0.0.0" description = "NL2Flow: A PDDL interface to flow construction" readme = "README.md" requires-python = ">=3.8"
Documentation / Wiki + [x] [Home](https://github.com/IBM/nl2flow/wiki) + [x] [01. What is Planning?](https://github.com/IBM/nl2flow/wiki/01.-What-is-Planning%3F) + [ ] 02. Why planning? + [ ] 03. Examples of NL2Flow Domain + [x] [04. The NL2Flow API](https://github.com/IBM/nl2flow/wiki/04.-The-NL2Flow-API) + [x] [05. Operators](https://github.com/IBM/nl2flow/wiki/05.-Operators) + [x] [06. Slots](https://github.com/IBM/nl2flow/wiki/06.-Slots) + [ ] 07. Mapping + [ ] 08. Type Hierarchy + [ ] 09. Memory + [x] [10. Constraints](https://github.com/IBM/nl2flow/wiki/10.-Constraints) + [x] [11. Preferences](https://github.com/IBM/nl2flow/wiki/11.-Preferences) + [x] [12. Goals](https://github.com/IBM/nl2flow/wiki/12.-Goals) + [x] [13. Variable LifeCycle](https://github.com/IBM/nl2flow/wiki/13.-Variable-LifeCycle) + [x] [14. Validator API](https://github.com/IBM/nl2flow/wiki/14.-Validator-API) + [ ] 15. Intermediate Representations: Sketches
2024-04-28T18:54:16
0.0
[]
[]
IBM/nl2flow
IBM__nl2flow-59
58662a4f287227121d33fedc498ee36f0ceff354
diff --git a/nl2flow/compile/basic_compilations/compile_goals.py b/nl2flow/compile/basic_compilations/compile_goals.py index b95b6a1..f56ad1b 100644 --- a/nl2flow/compile/basic_compilations/compile_goals.py +++ b/nl2flow/compile/basic_compilations/compile_goals.py @@ -15,6 +15,7 @@ CostOptions, MemoryState, HasDoneState, + NL2FlowOptions, ) @@ -44,23 +45,39 @@ def get_orphaned_items(compilation: Any, goal_items: List[str]) -> List[str]: def compile_goal_item(compilation: Any, goal_item: GoalItem, goal_predicates: Set[Any], **kwargs: Any) -> None: + optimization_options: Set[NL2FlowOptions] = set(kwargs["optimization_options"]) + if goal_item.goal_type == GoalType.OPERATOR: goal = goal_item.goal_name if isinstance(goal, Step): new_goal_predicate = f"has_done_{goal.name}" - new_goal_parameters = [ - compilation.constant_map[p.item_id] if isinstance(p, Parameter) else compilation.constant_map[p] - for p in goal.parameters - ] + new_goal_parameters = ( + [] + if NL2FlowOptions.multi_instance not in optimization_options + else [ + compilation.constant_map[p.item_id] if isinstance(p, Parameter) else compilation.constant_map[p] + for p in goal.parameters + ] + ) - try_level = 1 - for historical_step in compilation.flow_definition.history: - try_level += int(goal == historical_step) + if NL2FlowOptions.allow_retries in optimization_options: + try_level = 1 + for historical_step in compilation.flow_definition.history: + try_level += int(goal == historical_step) - try_level_parameter = compilation.constant_map[f"try_level_{try_level}"] - new_goal_parameters.append(try_level_parameter) - goal_predicates.add(getattr(compilation, new_goal_predicate)(*new_goal_parameters)) + try_level_parameter = compilation.constant_map[f"try_level_{try_level}"] + new_goal_parameters.append(try_level_parameter) + + if new_goal_parameters: + goal_predicates.add(getattr(compilation, new_goal_predicate)(*new_goal_parameters)) + else: + goal_predicates.add( + compilation.has_done( + compilation.constant_map[goal.name], + compilation.constant_map[HasDoneState.present.value], + ) + ) elif isinstance(goal, str): goal_predicates.add( @@ -129,7 +146,7 @@ def compile_goals(compilation: Any, **kwargs: Any) -> None: for goal_items in list_of_goal_items: for goal_item in goal_items.goals: - compile_goal_item(compilation, goal_item, goal_predicates) + compile_goal_item(compilation, goal_item, goal_predicates, **kwargs) if debug_flag is None or debug_flag != SolutionQuality.SOUND: compilation.problem.goal = land(*goal_predicates, flat=True) @@ -138,7 +155,7 @@ def compile_goals(compilation: Any, **kwargs: Any) -> None: for goal_index, goal_items in enumerate(list_of_goal_items): goal_predicates = set() for goal_item in goal_items.goals: - compile_goal_item(compilation, goal_item, goal_predicates) + compile_goal_item(compilation, goal_item, goal_predicates, **kwargs) compilation.problem.action( f"{RestrictedOperations.GOAL.value}-{goal_index}", @@ -184,7 +201,7 @@ def compile_goals(compilation: Any, **kwargs: Any) -> None: for goal_item_index, goal_item in enumerate(goals): precondition_set: Set[Any] = set() - compile_goal_item(compilation, goal_item, precondition_set) + compile_goal_item(compilation, goal_item, precondition_set, **kwargs) compilation.problem.action( f"{RestrictedOperations.GOAL.value}-{goal_index}-{goal_item_index}", parameters=[], diff --git a/nl2flow/compile/basic_compilations/compile_history.py b/nl2flow/compile/basic_compilations/compile_history.py index d2df21d..bedf52d 100644 --- a/nl2flow/compile/basic_compilations/compile_history.py +++ b/nl2flow/compile/basic_compilations/compile_history.py @@ -1,8 +1,8 @@ from nl2flow.compile.basic_compilations.utils import add_memory_item_to_constant_map from nl2flow.compile.schemas import Parameter, MemoryItem, Constraint, Step -from nl2flow.compile.options import MemoryState, HasDoneState, TypeOptions, BasicOperations +from nl2flow.compile.options import MemoryState, HasDoneState, TypeOptions, BasicOperations, NL2FlowOptions from nl2flow.compile.basic_compilations.utils import is_this_a_datum -from typing import Any, Optional +from typing import Any, Optional, Set def get_predicate_from_constraint(compilation: Any, constraint: Constraint) -> Optional[Any]: @@ -34,7 +34,9 @@ def get_predicate_from_constraint(compilation: Any, constraint: Constraint) -> O return None -def get_predicate_from_step(compilation: Any, step: Step, num_try: int = 0) -> Optional[Any]: +def get_predicate_from_step(compilation: Any, step: Step, index: int = 0, **kwargs: Any) -> Optional[Any]: + optimization_options: Set[NL2FlowOptions] = set(kwargs["optimization_options"]) + # noinspection PyBroadException try: if step.name.startswith(BasicOperations.SLOT_FILLER.value): @@ -53,38 +55,47 @@ def get_predicate_from_step(compilation: Any, step: Step, num_try: int = 0) -> O ) else: + step_predicate = compilation.has_done( + compilation.constant_map[step.name], + compilation.constant_map[HasDoneState.past.value], + ) + compilation.init.add(step_predicate) + has_done_predicate_name = f"has_done_{step.name}" - parameter_names = [p.item_id if isinstance(p, Parameter) else p for p in step.parameters] - parameter_names.append(f"try_level_{num_try}") + parameter_names = ( + [p.item_id if isinstance(p, Parameter) else p for p in step.parameters] + if NL2FlowOptions.multi_instance in optimization_options + else [] + ) + + if NL2FlowOptions.allow_retries in optimization_options: + num_try = index + 1 + parameter_names.append(f"try_level_{num_try}") - step_predicate = getattr(compilation, has_done_predicate_name)( - *[compilation.constant_map[p] for p in parameter_names] + step_predicate = ( + None + if not parameter_names + else getattr(compilation, has_done_predicate_name)( + *[compilation.constant_map[p] for p in parameter_names] + ) ) return step_predicate except Exception as e: - print(f"Error generating constraint predicate: {e}") + print(f"Error generating step predicate: {e}") return None def compile_history(compilation: Any, **kwargs: Any) -> None: - multi_instance: bool = kwargs.get("multi_instance", True) - for index, step in enumerate(compilation.flow_definition.history): - step_predicate = compilation.has_done( - compilation.constant_map[step.name], - compilation.constant_map[HasDoneState.past.value], - ) - compilation.init.add(step_predicate) + indices_of_interest = [i for i, h in enumerate(compilation.flow_definition.history) if h.name == step.name] - if multi_instance: - indices_of_interest = [i for i, h in enumerate(compilation.flow_definition.history) if h.name == step.name] - num_try = indices_of_interest.index(index) + 1 + index_of_operation = indices_of_interest.index(index) + step_predicate = get_predicate_from_step(compilation, step, index_of_operation, **kwargs) - parameterized_step_predicate = get_predicate_from_step(compilation, step, num_try) - if parameterized_step_predicate: - compilation.init.add(parameterized_step_predicate) + if step_predicate: + compilation.init.add(step_predicate) for constraint in compilation.flow_definition.constraints: constraint_predicate = get_predicate_from_constraint(compilation, constraint) diff --git a/nl2flow/compile/basic_compilations/compile_operators.py b/nl2flow/compile/basic_compilations/compile_operators.py index 26a9d81..fca4298 100644 --- a/nl2flow/compile/basic_compilations/compile_operators.py +++ b/nl2flow/compile/basic_compilations/compile_operators.py @@ -20,6 +20,7 @@ CostOptions, MemoryState, HasDoneState, + NL2FlowOptions, ) @@ -27,7 +28,7 @@ def compile_operators(compilation: Any, **kwargs: Any) -> None: flow_definition: FlowDefinition = compilation.flow_definition list_of_actions: List[OperatorDefinition] = flow_definition.operators debug_flag: Optional[SolutionQuality] = kwargs.get("debug_flag", None) - multi_instance: bool = kwargs.get("multi_instance", True) + optimization_options: Set[NL2FlowOptions] = set(kwargs["optimization_options"]) variable_life_cycle: Set[LifeCycleOptions] = set(kwargs["variable_life_cycle"]) mapping_options: Set[MappingOptions] = set(kwargs["mapping_options"]) @@ -61,34 +62,31 @@ def compile_operators(compilation: Any, **kwargs: Any) -> None: else: type_of_param = get_type_of_constant(compilation, param) - x = compilation.lang.variable( - f"x{index_of_param}{index_of_nested_input}", compilation.type_map[type_of_param] - ) + if NL2FlowOptions.multi_instance in optimization_options: + x = compilation.lang.variable( + f"x{index_of_param}{index_of_nested_input}", compilation.type_map[type_of_param] + ) - parameter_list.append(x) - type_list.append(type_of_param) + parameter_list.append(x) + type_list.append(type_of_param) - compilation.init.add(compilation.been_used(compilation.constant_map[param])) + precondition_list.append(compilation.mapped_to(x, compilation.constant_map[param])) + add_effect_list.append(compilation.been_used(x)) - add_effect_list.extend( - [ - compilation.been_used(x), - compilation.been_used(compilation.constant_map[param]), - ] - ) - precondition_list.extend( - [ - compilation.mapped_to(x, compilation.constant_map[param]), - compilation.known( - compilation.constant_map[param], - compilation.constant_map[MemoryState.KNOWN.value], - ), - ] + if NL2FlowOptions.multi_instance in optimization_options: + precondition_list.append(neg(compilation.not_usable(x))) + + compilation.init.add(compilation.been_used(compilation.constant_map[param])) + add_effect_list.append(compilation.been_used(compilation.constant_map[param])) + precondition_list.append( + compilation.known( + compilation.constant_map[param], + compilation.constant_map[MemoryState.KNOWN.value], + ) ) if MappingOptions.prohibit_direct in mapping_options: compilation.init.add(compilation.not_usable(compilation.constant_map[param])) - precondition_list.append(neg(compilation.not_usable(x))) if LifeCycleOptions.uncertain_on_use in variable_life_cycle: del_effect_list.append( @@ -109,43 +107,14 @@ def compile_operators(compilation: Any, **kwargs: Any) -> None: constraint_predicate = compile_constraints(compilation, constraint, **kwargs) precondition_list.append(constraint_predicate) - if multi_instance: - new_has_done_predicate_name = f"has_done_{operator.name}" - has_done_parameters = [compilation.type_map[type_name] for type_name in type_list] - has_done_parameters.append(compilation.type_map[TypeOptions.RETRY.value]) - - new_has_done_predicate = compilation.lang.predicate( - new_has_done_predicate_name, - *has_done_parameters, + if ( + NL2FlowOptions.allow_retries in optimization_options + or NL2FlowOptions.multi_instance in optimization_options + ): + add_multi_instance_properties( + compilation, operator, parameter_list, type_list, precondition_list, add_effect_list, **kwargs ) - setattr(compilation, new_has_done_predicate_name, new_has_done_predicate) - - pre_level = compilation.lang.variable("pre_level", compilation.type_map[TypeOptions.RETRY.value]) - post_level = compilation.lang.variable("post_level", compilation.type_map[TypeOptions.RETRY.value]) - - precondition_list.extend( - [ - getattr(compilation, new_has_done_predicate_name)(*parameter_list, pre_level), - neg(getattr(compilation, new_has_done_predicate_name)(*parameter_list, post_level)), - compilation.connected(compilation.constant_map[operator.name], pre_level, post_level), - ] - ) - - add_effect_list.append(getattr(compilation, new_has_done_predicate_name)(*parameter_list, post_level)) - - for try_level in range(operator.max_try): - compilation.init.add( - compilation.connected( - compilation.constant_map[operator.name], - compilation.constant_map[f"try_level_{try_level}"], - compilation.constant_map[f"try_level_{try_level + 1}"], - ) - ) - - add_enabler_action_for_operator(compilation, operator, parameter_list, new_has_done_predicate_name) - parameter_list.extend([pre_level, post_level]) - else: precondition_list.append( neg( @@ -193,6 +162,67 @@ def compile_operators(compilation: Any, **kwargs: Any) -> None: ) +def add_multi_instance_properties( + compilation: Any, + operator: OperatorDefinition, + parameter_list: List[Any], + type_list: List[str], + precondition_list: List[Any], + add_effect_list: List[Any], + **kwargs: Any, +) -> None: + optimization_options: Set[NL2FlowOptions] = set(kwargs["optimization_options"]) + new_has_done_predicate_name = f"has_done_{operator.name}" + has_done_parameters = [] + + if NL2FlowOptions.multi_instance in optimization_options: + has_done_parameters = [compilation.type_map[type_name] for type_name in type_list] + + if NL2FlowOptions.allow_retries in optimization_options: + has_done_parameters.append(compilation.type_map[TypeOptions.RETRY.value]) + + new_has_done_predicate = compilation.lang.predicate( + new_has_done_predicate_name, + *has_done_parameters, + ) + + setattr(compilation, new_has_done_predicate_name, new_has_done_predicate) + + if NL2FlowOptions.allow_retries in optimization_options: + pre_level = compilation.lang.variable("pre_level", compilation.type_map[TypeOptions.RETRY.value]) + post_level = compilation.lang.variable("post_level", compilation.type_map[TypeOptions.RETRY.value]) + + precondition_list.extend( + [ + getattr(compilation, new_has_done_predicate_name)(*parameter_list, pre_level), + neg(getattr(compilation, new_has_done_predicate_name)(*parameter_list, post_level)), + compilation.connected(compilation.constant_map[operator.name], pre_level, post_level), + ] + ) + + add_effect_list.append(getattr(compilation, new_has_done_predicate_name)(*parameter_list, post_level)) + + for try_level in range(operator.max_try): + compilation.init.add( + compilation.connected( + compilation.constant_map[operator.name], + compilation.constant_map[f"try_level_{try_level}"], + compilation.constant_map[f"try_level_{try_level + 1}"], + ) + ) + + add_enabler_action_for_operator(compilation, operator, parameter_list, new_has_done_predicate_name) + parameter_list.extend([pre_level, post_level]) + + else: + precondition_list.append( + neg(getattr(compilation, new_has_done_predicate_name)(*parameter_list)), + ) + + add_effect_list.append(getattr(compilation, new_has_done_predicate_name)(*parameter_list)) + # add_enabler_action_for_operator(compilation, operator, parameter_list, new_has_done_predicate_name) + + def add_enabler_action_for_operator( compilation: Any, operator: OperatorDefinition, @@ -202,6 +232,7 @@ def add_enabler_action_for_operator( enabler_predicate = getattr(compilation, new_has_done_predicate_name)( *parameter_list, compilation.constant_map["try_level_0"] ) + shadow_predicate = getattr(compilation, new_has_done_predicate_name)( *parameter_list, compilation.constant_map["try_level_1"] ) diff --git a/nl2flow/compile/basic_compilations/compile_reference.py b/nl2flow/compile/basic_compilations/compile_reference.py index 920a0ca..b238c54 100644 --- a/nl2flow/compile/basic_compilations/compile_reference.py +++ b/nl2flow/compile/basic_compilations/compile_reference.py @@ -25,8 +25,8 @@ def compile_reference(compilation: Any, **kwargs: Any) -> None: if isinstance(r, Step) and r.name == item.name: indices_of_interest.append(i) - index_of_operation = indices_of_interest.index(index) + 1 - step_predicate = get_predicate_from_step(compilation, item, index_of_operation) + index_of_operation = indices_of_interest.index(index) + step_predicate = get_predicate_from_step(compilation, item, index_of_operation, **kwargs) elif isinstance(item, Constraint): step_predicate = get_predicate_from_constraint(compilation, item) diff --git a/nl2flow/compile/compilations.py b/nl2flow/compile/compilations.py index d27064e..308fb31 100644 --- a/nl2flow/compile/compilations.py +++ b/nl2flow/compile/compilations.py @@ -39,6 +39,7 @@ ) from nl2flow.compile.options import ( + NL2FlowOptions, SlotOptions, MappingOptions, TypeOptions, @@ -104,6 +105,8 @@ def __init__(self, flow_definition: FlowDefinition): def compile(self, **kwargs: Any) -> Tuple[PDDL, List[Transform]]: debug_flag: Optional[SolutionQuality] = kwargs.get("debug_flag", None) + optimization_options: Set[NL2FlowOptions] = set(kwargs["optimization_options"]) + slot_options: Set[SlotOptions] = set(kwargs["slot_options"]) reserved_types = [ TypeOptions.ROOT, @@ -111,9 +114,11 @@ def compile(self, **kwargs: Any) -> Tuple[PDDL, List[Transform]]: TypeOptions.HAS_DONE, TypeOptions.STATUS, TypeOptions.MEMORY, - TypeOptions.RETRY, ] + if NL2FlowOptions.allow_retries in optimization_options: + reserved_types.append(TypeOptions.RETRY) + for reserved_type in reserved_types: add_type_item_to_type_map(self, TypeItem(name=reserved_type.value, parent=None)) @@ -207,12 +212,13 @@ def compile(self, **kwargs: Any) -> Tuple[PDDL, List[Transform]]: self.lang.Real, ) - self.connected = self.lang.predicate( - "connected", - self.type_map[TypeOptions.OPERATOR.value], - self.type_map[TypeOptions.RETRY.value], - self.type_map[TypeOptions.RETRY.value], - ) + if NL2FlowOptions.allow_retries in optimization_options: + self.connected = self.lang.predicate( + "connected", + self.type_map[TypeOptions.OPERATOR.value], + self.type_map[TypeOptions.RETRY.value], + self.type_map[TypeOptions.RETRY.value], + ) self.free = self.lang.predicate( "free", @@ -236,13 +242,13 @@ def compile(self, **kwargs: Any) -> Tuple[PDDL, List[Transform]]: ) ) - add_retry_states(self) + if NL2FlowOptions.allow_retries in optimization_options: + add_retry_states(self) + compile_operators(self, **kwargs) compile_confirmation(self, **kwargs) add_extra_objects(self, **kwargs) - slot_options: Set[SlotOptions] = set(kwargs["slot_options"]) - if len(slot_options) > 1: compile_new_object_maps(self, **kwargs) get_goodness_map(self) diff --git a/nl2flow/compile/flow.py b/nl2flow/compile/flow.py index 232c66f..7748d65 100644 --- a/nl2flow/compile/flow.py +++ b/nl2flow/compile/flow.py @@ -11,6 +11,7 @@ ConfirmOptions, LifeCycleOptions, GoalOptions, + NL2FlowOptions, LOOKAHEAD, ) @@ -26,6 +27,7 @@ def __init__( self._variable_life_cycle: Set[LifeCycleOptions] = set() self._goal_type = GoalOptions.AND_AND self._lookahead: int = LOOKAHEAD + self._optimization_options: Set[NL2FlowOptions] = {NL2FlowOptions.multi_instance, NL2FlowOptions.allow_retries} self._slot_options: Set[SlotOptions] = { SlotOptions.higher_cost, SlotOptions.relaxed, @@ -108,6 +110,14 @@ def lookahead(self) -> int: def lookahead(self, lookahead: int) -> None: self._lookahead = lookahead + @property + def optimization_options(self) -> Set[NL2FlowOptions]: + return self._optimization_options + + @optimization_options.setter + def optimization_options(self, options: Set[NL2FlowOptions]) -> None: + self._optimization_options = options + @property def flow_definition(self) -> FlowDefinition: return self._flow_definition @@ -188,6 +198,7 @@ def compile_to_pddl( mapping_options=self.mapping_options, confirm_options=self.confirm_options, variable_life_cycle=self.variable_life_cycle, + optimization_options=self.optimization_options, goal_type=self.goal_type, lookahead=self.lookahead, debug_flag=debug_flag, diff --git a/nl2flow/compile/options.py b/nl2flow/compile/options.py index 0a89973..ccd199f 100644 --- a/nl2flow/compile/options.py +++ b/nl2flow/compile/options.py @@ -6,6 +6,11 @@ SLOT_GOODNESS: float = 0.5 +class NL2FlowOptions(enum.Enum): + multi_instance = "MULTI_INSTANCE" + allow_retries = "ALLOW_RETRIES" + + class RestrictedOperations(enum.Enum): UNTOKENIZE = "untokenize" TOKENIZE = "tokenize"
Planned Optimizations + [x] Enforce redundant orders #13 + [x] Flag to toggle between parameterized and unparameterized compilations #59 + [ ] Connected components filter to reduce number of operators [[link](https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.components.connected_components.html)] + [ ] Action-splitter for parameterized compilation [[link](https://github.com/melahi/enhanced-action-splitter)]
2024-04-28T18:53:03
0.0
[]
[]
IBM/nl2flow
IBM__nl2flow-34
917a794bc5549b44ee306c455f4ededf17b3cf1d
diff --git a/nl2flow/compile/basic_compilations/compile_goals.py b/nl2flow/compile/basic_compilations/compile_goals.py index 9a0250d..334da90 100644 --- a/nl2flow/compile/basic_compilations/compile_goals.py +++ b/nl2flow/compile/basic_compilations/compile_goals.py @@ -7,7 +7,7 @@ from nl2flow.compile.basic_compilations.utils import unpack_list_of_signature_items from nl2flow.compile.basic_compilations.compile_constraints import compile_constraints -from nl2flow.compile.schemas import GoalItem, GoalItems, MemoryItem +from nl2flow.compile.schemas import GoalItem, GoalItems, MemoryItem, Constraint from nl2flow.plan.schemas import Step, Parameter from nl2flow.compile.options import ( TypeOptions, @@ -75,8 +75,8 @@ def compile_goal_item(compilation: Any, goal_item: GoalItem, goal_predicates: Se else: TypeError("Unrecognized goal type.") - elif goal_item.goal_type == GoalType.CONSTRAINT: - temp = compile_constraints(compilation, goal_item.goal_name) # type: ignore + elif goal_item.goal_type == GoalType.CONSTRAINT and isinstance(goal_item.goal_name, Constraint): + temp = compile_constraints(compilation, goal_item.goal_name) goal_predicates.add(temp) else: @@ -179,7 +179,8 @@ def compile_goals(compilation: Any, **kwargs: Any) -> None: new_goal = getattr(compilation, new_goal_predicate_name)() goal_predicates.add(new_goal) - for goal_item_index, goal_item in enumerate(goal_items.goals): + goals = goal_items.goals if isinstance(goal_items.goals, List) else [goal_items.goals] + for goal_item_index, goal_item in enumerate(goals): precondition_set: Set[Any] = set() compile_goal_item(compilation, goal_item, precondition_set) diff --git a/nl2flow/compile/basic_compilations/compile_operators.py b/nl2flow/compile/basic_compilations/compile_operators.py index a2bbb37..aa11957 100644 --- a/nl2flow/compile/basic_compilations/compile_operators.py +++ b/nl2flow/compile/basic_compilations/compile_operators.py @@ -47,7 +47,7 @@ def compile_operators(compilation: Any, **kwargs: Any) -> None: type_list = list() for index_of_input, o_input in enumerate(operator.inputs): - for param in o_input.parameters: + for index_of_nested_input, param in enumerate(o_input.parameters): add_to_condition_list_pre_check(compilation, param) index_of_param = index_of_input + list(o_input.parameters).index(param) @@ -57,7 +57,9 @@ def compile_operators(compilation: Any, **kwargs: Any) -> None: else: type_of_param = get_type_of_constant(compilation, param) - x = compilation.lang.variable(f"x{index_of_param}", compilation.type_map[type_of_param]) + x = compilation.lang.variable( + f"x{index_of_param}{index_of_nested_input}", compilation.type_map[type_of_param] + ) parameter_list.append(x) type_list.append(type_of_param) diff --git a/nl2flow/compile/flow.py b/nl2flow/compile/flow.py index e30071f..a7c214b 100644 --- a/nl2flow/compile/flow.py +++ b/nl2flow/compile/flow.py @@ -30,11 +30,11 @@ def __init__( SlotOptions.relaxed, } - self._compilation: Any = None + self._compilation: ClassicPDDL = ClassicPDDL(self.flow_definition) @property def compilation(self) -> ClassicPDDL: - return self._compilation # type: ignore + return self._compilation @property def variable_life_cycle(self) -> Set[LifeCycleOptions]: diff --git a/nl2flow/plan/options.py b/nl2flow/plan/options.py index d137bd4..9cfb7fe 100644 --- a/nl2flow/plan/options.py +++ b/nl2flow/plan/options.py @@ -1,3 +1,3 @@ -TIMEOUT = 10 +TIMEOUT = 1800 NUM_PLANS = 10 QUALITY_BOUND = 1.0 diff --git a/nl2flow/plan/planners.py b/nl2flow/plan/planners.py index e5b89ff..647a257 100644 --- a/nl2flow/plan/planners.py +++ b/nl2flow/plan/planners.py @@ -1,34 +1,47 @@ from nl2flow.compile.flow import Flow from nl2flow.compile.utils import revert_string_transform -from nl2flow.plan.schemas import RawPlannerResult, RawPlan, PlannerResponse, ClassicalPlan -from nl2flow.plan.options import QUALITY_BOUND, NUM_PLANS +from nl2flow.plan.schemas import RawPlannerResult, RawPlan, PlannerResponse, ClassicalPlan as Plan +from nl2flow.plan.options import QUALITY_BOUND, NUM_PLANS, TIMEOUT from nl2flow.plan.utils import parse_action, group_items +from nl2flow.compile.schemas import PDDL from nl2flow.compile.options import ( SlotOptions, MappingOptions, ConfirmOptions, ) -from nl2flow.compile.schemas import PDDL from abc import ABC, abstractmethod from typing import Any, List, Set, Dict from pathlib import Path from kstar_planner import planners +from concurrent.futures import TimeoutError +from pebble import ProcessPool import tempfile class Planner(ABC): + def __init__(self) -> None: + self._timeout: float = TIMEOUT + + @property + def timeout(self) -> float: + return self._timeout + + @timeout.setter + def timeout(self, set_timeout: float) -> None: + self._timeout = set_timeout + @abstractmethod - def plan(self, pddl: PDDL, **kwargs: Dict[str, Any]) -> Any: + def plan(self, pddl: PDDL, **kwargs: Dict[str, Any]) -> PlannerResponse: pass @abstractmethod - def parse(self, raw_plans: List[RawPlan], **kwargs: Any) -> PlannerResponse: + def parse(self, raw_plans: List[RawPlan], **kwargs: Any) -> List[Plan]: pass @classmethod - def pretty_print_plan(cls, plan: ClassicalPlan) -> str: + def pretty_print_plan(cls, plan: Plan) -> str: pretty = "" for step, action in enumerate(plan.plan): @@ -43,61 +56,96 @@ def pretty_print_plan(cls, plan: ClassicalPlan) -> str: return pretty @classmethod - def pretty_print(cls, planner_response: PlannerResponse) -> str: + def pretty_print_plan_verbose(cls, plan: Plan) -> str: pretty = "" - for index, plan in enumerate(planner_response.list_of_plans): - pretty += f"\n\n---- Plan #{index} ----\n" - pretty += f"Cost: {plan.cost}, Length: {plan.length}\n\n" - pretty += cls.pretty_print_plan(plan) + for step, action in enumerate(plan.plan): + inputs = ", ".join([f"{item.item_id} ({item.item_type})" for item in action.inputs]) + outputs = ", ".join([f"{item.item_id} ({item.item_type})" for item in action.outputs]) + + pretty += ( + f"Step {step}: {action.name}, " + f"Inputs: {inputs if action.inputs else None}, " + f"Outputs: {outputs if action.outputs else None}\n" + ) return pretty - @staticmethod - def pretty_print_verbose(planner_response: PlannerResponse) -> str: + @classmethod + def pretty_print(cls, planner_response: PlannerResponse, verbose: bool = False) -> str: pretty = "" for index, plan in enumerate(planner_response.list_of_plans): pretty += f"\n\n---- Plan #{index} ----\n" pretty += f"Cost: {plan.cost}, Length: {plan.length}\n\n" - - for step, action in enumerate(plan.plan): - inputs = ", ".join([f"{item.item_id} ({item.item_type})" for item in action.inputs]) - outputs = ", ".join([f"{item.item_id} ({item.item_type})" for item in action.outputs]) - - pretty += ( - f"Step {step}: {action.name}, " - f"Inputs: {inputs if action.inputs else None}, " - f"Outputs: {outputs if action.outputs else None}\n" - ) + pretty += cls.pretty_print_plan(plan) if not verbose else cls.pretty_print_plan_verbose(plan) return pretty class Kstar(Planner): - def plan(self, pddl: PDDL, **kwargs: Any) -> PlannerResponse: - with ( - tempfile.NamedTemporaryFile() as domain_temp, - tempfile.NamedTemporaryFile() as problem_temp, - ): + @staticmethod + def call_to_planner(pddl: PDDL) -> RawPlannerResult: + with tempfile.NamedTemporaryFile() as domain_temp, tempfile.NamedTemporaryFile() as problem_temp: domain_file = Path(tempfile.gettempdir()) / domain_temp.name problem_file = Path(tempfile.gettempdir()) / problem_temp.name domain_file.write_text(pddl.domain) problem_file.write_text(pddl.problem) - result = planners.plan_unordered_topq( + planner_result = planners.plan_unordered_topq( domain_file=domain_file, problem_file=problem_file, quality_bound=QUALITY_BOUND, number_of_plans_bound=NUM_PLANS, ) + result = RawPlannerResult(list_of_plans=planner_result.get("plans", [])) + result.error_running_planner = False + result.is_no_solution = len(result.list_of_plans) == 0 + result.is_timeout = False + return result + + def raw_plan(self, pddl: PDDL) -> RawPlannerResult: + pool = ProcessPool() + cc = pool.schedule(self.call_to_planner, args=[pddl], timeout=self.timeout) + + # noinspection PyBroadException + try: + raw_planner_result: RawPlannerResult = cc.result() + return raw_planner_result + + except TimeoutError as error: + return RawPlannerResult( + is_timeout=True, + stderr=error, + ) + + except Exception as error: + return RawPlannerResult( + error_running_planner=True, + is_timeout=False, + stderr=error, + ) + + def plan(self, pddl: PDDL, **kwargs: Any) -> PlannerResponse: + raw_planner_result = self.raw_plan(pddl) + planner_response = PlannerResponse.initialize_from_raw_plans(raw_planner_result) + # noinspection PyBroadException + try: + planner_response.list_of_plans = self.parse(raw_planner_result.list_of_plans, **kwargs) + planner_response.is_parse_error = ( + len(planner_response.list_of_plans) == 0 and planner_response.is_no_solution is False + ) + + return planner_response - raw_planner_result = RawPlannerResult.model_validate(result) - return self.parse(raw_planner_result.plans, **kwargs) + except Exception as error: + planner_response.is_parse_error = True + planner_response.stderr = error + return planner_response - def parse(self, raw_plans: List[RawPlan], **kwargs: Any) -> PlannerResponse: - planner_response = PlannerResponse() + def parse(self, raw_plans: List[RawPlan], **kwargs: Any) -> List[Plan]: + list_of_plans = list() flow: Flow = kwargs["flow"] slot_options: Set[SlotOptions] = flow.slot_options @@ -105,7 +153,7 @@ def parse(self, raw_plans: List[RawPlan], **kwargs: Any) -> PlannerResponse: confirm_options: Set[ConfirmOptions] = flow.confirm_options for plan in raw_plans: - new_plan = ClassicalPlan(cost=plan.cost, reference=plan.actions) + new_plan = Plan(cost=plan.cost, reference=plan.actions) actions = plan.actions for action in actions: @@ -130,6 +178,6 @@ def parse(self, raw_plans: List[RawPlan], **kwargs: Any) -> PlannerResponse: new_plan = group_items(new_plan, ConfirmOptions.group_confirms) new_plan.length = len(new_plan.plan) - planner_response.list_of_plans.append(new_plan) + list_of_plans.append(new_plan) - return planner_response + return list_of_plans diff --git a/nl2flow/plan/schemas.py b/nl2flow/plan/schemas.py index a414890..a5b7160 100644 --- a/nl2flow/plan/schemas.py +++ b/nl2flow/plan/schemas.py @@ -46,14 +46,28 @@ class ClassicalPlan(BaseModel): plan: List[Action] = [] -class PlannerResponse(BaseModel): +class RawPlannerResult(BaseModel): + list_of_plans: List[RawPlan] = [] + error_running_planner: Optional[bool] = None + is_no_solution: Optional[bool] = None + is_timeout: Optional[bool] = None + stderr: Optional[Any] = None + + +class PlannerResponse(RawPlannerResult): list_of_plans: List[ClassicalPlan] = [] + is_parse_error: Optional[bool] = None + + @classmethod + def initialize_from_raw_plans(cls, raw_planner_result: RawPlannerResult) -> PlannerResponse: + return PlannerResponse( + error_running_planner=raw_planner_result.error_running_planner, + is_no_solution=raw_planner_result.is_no_solution, + is_timeout=raw_planner_result.is_timeout, + stderr=raw_planner_result.stderr, + ) class RawPlan(BaseModel): actions: List[str] cost: float = 0.0 - - -class RawPlannerResult(BaseModel): - plans: List[RawPlan] diff --git a/nl2flow/plan/utils.py b/nl2flow/plan/utils.py index 11936cb..affd5ef 100644 --- a/nl2flow/plan/utils.py +++ b/nl2flow/plan/utils.py @@ -124,18 +124,20 @@ def __add_parameters(signatures: List[SignatureItem]) -> List[Parameter]: parameters = temp[1:] elif action_name.startswith(BasicOperations.CONSTRAINT.value): - new_action_name = action_name.replace(f"{BasicOperations.CONSTRAINT.value}_", "") + new_action_name = action_name.replace(f"{BasicOperations.CONSTRAINT.value}_", "", 1) for v in ConstraintState: new_action_name = new_action_name.replace(f"_to_{string_transform(str(v.value), transforms)}", "") - new_action_name = revert_string_transform(new_action_name, transforms) # type: ignore + reverted_new_action_name = revert_string_transform(new_action_name, transforms) or "" for v in ConstraintState: if action_name.endswith(f"_to_{string_transform(str(v.value), transforms)}"): - new_action_name = f"{BasicOperations.CONSTRAINT.value}({new_action_name}) = {v.value}" + reverted_new_action_name = ( + f"{BasicOperations.CONSTRAINT.value}({reverted_new_action_name}) = {v.value}" + ) - new_action.name = new_action_name + new_action.name = reverted_new_action_name new_action.inputs = [ Parameter( diff --git a/pyproject.toml b/pyproject.toml index 329a18d..d3c9e05 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ classifiers = [ # # For an analysis of this field vs pip's requirements files see: # https://packaging.python.org/discussions/install-requires-vs-requirements/ -dependencies = ["pydantic>=2.4.2", "pyyaml", "tarski", "StrEnum", "kstar-planner", "forbiditerative", "haikunator"] +dependencies = ["pydantic>=2.4.2", "pyyaml", "tarski", "StrEnum", "kstar-planner", "forbiditerative", "haikunator", "Pebble"] [project.optional-dependencies] dev = ["check-manifest", "pytest", "pytest-mock", "black", "pylint", "flake8", "pre-commit", "Flake8-pyproject", "coverage", "pytest-mock", "types-PyYAML"] @@ -140,7 +140,7 @@ py-version=3.9 max-line-length = 120 [tool.flake8] -extend-ignore = ["E203"] +extend-ignore = ["E203", "E501"] count = true max-line-length = 120 max-complexity = 18
Empty plans on bulk plan generation
2024-03-27T04:31:51
0.0
[]
[]
RoboEden/jux
RoboEden__jux-10
2b242a9c5b6e3976d0e03be7c44ad344449471ff
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f95fc8..bd6f834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,23 @@ # Change Log + +## v3.0.0 +Major Change: + - Migrate to `luxai-s2==3.0.0`. + +## v2.2.0 +Major Change: + - Migrate to `luxai-s2==2.2.0`. + - Python 3.7 is no longer supported. Please use python 3.8 or above. + - Add support for python 3.11. + - Migrate to jax 0.4.16. But to be compatible with pytorch, we use `jax[cuda11_cudnn82]==0.4.7` by default. + +Fix: + - Class properties work correctly in batched mode now. + ## v2.1.1 Major changes: - - Upgrade luxai_s2 dependency to v2.1.9. - - Fix batching issue for data with properties. `env.state.board.valid_spawns_mask` correctly works now. + - Upgrade luxai_s2 dependency to v2.1.9. + - Fix batching issue for data with properties. `env.state.board.valid_spawns_mask` correctly works now. ## v2.1.0 Major changes: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 060a94d..abb450b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,21 +1,23 @@ # Development Setup -We are going to support `python>=3.7,<3.11`. +We are going to support `python>=3.8,<3.12`. -## Install requirements -Make sure you have nvcc, cuda-toolkit and cudnn installed. There are two ways to get them ready, either by conda or docker (recommended). - -For conda users, you can install them with the following commands. +### Install JAX +JAX is a main dependency of JUX, and must be installed by user manually. ```sh -conda install -c nvidia cuda-nvcc cuda-python -conda install cudnn +pip install --upgrade "jax[cuda11_cudnn82]==0.4.7" -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html ``` -For docker users, you can use the [NVIDIA CUDA docker image](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/cuda) or the [PyTorch docker image](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/pytorch), which has all of them ready and compatible with each other. -### Install JAX -Please follow the [official installation guide](https://github.com/google/jax#installation) to install JAX. Note: JAX must be compatible with your cuDNN. -- If cudnn >= 8.2 and < 8.6, please install `"jax[cuda11_cudnn82]"`. -- If cudnn >= 8.6, please install `"jax[cuda11_cudnn86]"`. +You can test whether jax is installed successfully by running the following command. +```sh +python -c "import jax.numpy as jnp; \ + a = jnp.convolve(jnp.array([1, 2, 3]), jnp.array([0, 1, 0.5])); \ + print(a); \ + print(a.device());" +# You shall get something like this: +# [0. 1. 2.5 4. 1.5] +# gpu:0 +``` ### Install JUX Finally, upgrade your pip and install JUX. diff --git a/README.md b/README.md index 6c50d7a..dd5b66e 100644 --- a/README.md +++ b/README.md @@ -2,20 +2,23 @@ JUX is a <ins>J</ins>ax-accelerated game core for L<ins>ux</ins> AI Challenge Season 2, aimed to maximize game environment throughput for reinforcement learning (RL) training. ## Installation -### Install dependencies -One of the main dependencies is JAX, which in turn relies on NVCC, CUDA Toolkit and cuDNN. There are two ways to get them ready, either by conda or docker (recommended). -For conda users, you can install them with the following commands. +### Install JAX +JAX is a main dependency of JUX, and must be installed by user manually. ```sh -conda install -c nvidia cuda-nvcc cuda-python -conda install cudnn +pip install --upgrade "jax[cuda11_cudnn82]==0.4.7" -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html ``` -For docker users, you can use the [NVIDIA CUDA docker image](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/cuda) or the [PyTorch docker image](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/pytorch), which has all of them ready and compatible with each other. -### Install JAX -Please follow the [official installation guide](https://github.com/google/jax#installation) to install JAX. Note: JAX must be compatible with your cuDNN. -- If cudnn >= 8.2 and < 8.6, please install `"jax[cuda11_cudnn82]"`. -- If cudnn >= 8.6, please install `"jax[cuda11_cudnn86]"`. +You can test whether jax is installed successfully by running the following command. +```sh +python -c "import jax.numpy as jnp; \ + a = jnp.convolve(jnp.array([1, 2, 3]), jnp.array([0, 1, 0.5])); \ + print(a); \ + print(a.device());" +# You shall get something like this: +# [0. 1. 2.5 4. 1.5] +# gpu:0 +``` ### Install JUX Finally, upgrade your pip and install JUX. @@ -25,7 +28,7 @@ pip install juxai-s2 ``` ## Usage -See [tutorial.ipynb](tutorial.ipynb) for a quick start. JUX is guaranteed to implement the same game logic as `luxai_s2==2.1.9`, if players' input actions are valid. When players' input actions are invalid, JUX and LuxAI-S2 may process them differently. +See [tutorial.ipynb](tutorial.ipynb) for a quick start. JUX is guaranteed to implement the same game logic as `luxai_s2==3.0.0`, if players' input actions are valid. When players' input actions are invalid, JUX and LuxAI-S2 may process them differently. ## Performance JUX maps all game logic to array operators in JAX so that we can harvest the computational power of modern GPUs and support tons of environments running in parallel. We benchmarked JUX on several different GPUs, and increased the throughput by hundreds to thousands of times, compared with the original single-thread Python implementation. diff --git a/jux/__init__.py b/jux/__init__.py index 55fa725..4eb28e3 100644 --- a/jux/__init__.py +++ b/jux/__init__.py @@ -1,1 +1,1 @@ -__version__ = '2.1.1' +__version__ = '3.0.0' diff --git a/jux/actions.py b/jux/actions.py index bb00d93..8aea26f 100644 --- a/jux/actions.py +++ b/jux/actions.py @@ -171,7 +171,7 @@ def is_valid(self, max_transfer_amount) -> bool: class ActionQueue(NamedTuple): - data: UnitAction # UnitAction[UNIT_ACTION_QUEUE_SIZE, 5] + data: UnitAction # UnitAction[UNIT_ACTION_QUEUE_SIZE] front: jnp.int8 = jnp.int8(0) rear: jnp.int8 = jnp.int8(0) count: jnp.int8 = jnp.int8(0) diff --git a/jux/config.py b/jux/config.py index 0dc4f85..e55b0ae 100644 --- a/jux/config.py +++ b/jux/config.py @@ -38,7 +38,7 @@ class EnvConfig(NamedTuple): ### Variable parameters that don't affect game logic much ### max_episode_length: int = 1000 - map_size: int = 48 + map_size: int = 64 verbose: int = 1 # this can be disabled to improve env FPS but assume your actions are well formatted @@ -48,8 +48,8 @@ class EnvConfig(NamedTuple): ### Constants ### # you can only ever transfer in/out 3000 as this is the max cargo space. max_transfer_amount: int = 3000 - MIN_FACTORIES: int = 2 - MAX_FACTORIES: int = 5 + MIN_FACTORIES: int = 4 + MAX_FACTORIES: int = 10 CYCLE_LENGTH: int = 50 DAY_LENGTH: int = 30 UNIT_ACTION_QUEUE_SIZE: int = 20 # when set to 1, then no action queue is used diff --git a/jux/factory.py b/jux/factory.py index 81f7883..2523d1b 100644 --- a/jux/factory.py +++ b/jux/factory.py @@ -25,7 +25,7 @@ def num_id(self): @property def occupancy(self) -> Position: edge_pos = self.pos.pos[..., None, :] + direct2delta_xy[1:] # [4, 2] - corner_pos = edge_pos + direct2delta_xy[[2, 3, 4, 1], ] # [4, 2] + corner_pos = edge_pos + direct2delta_xy[[2, 3, 4, 1], :] # [4, 2] occupy = jnp.concatenate([self.pos.pos[..., None, :], edge_pos, corner_pos], axis=-2) # [9, 2] occupy = Position(occupy) return occupy diff --git a/jux/state/state.py b/jux/state/state.py index 9f8e49a..10d4d74 100644 --- a/jux/state/state.py +++ b/jux/state/state.py @@ -39,7 +39,7 @@ class State(NamedTuple): env_cfg: EnvConfig seed: jnp.uint32 # the seed for reproducibility - rng_state: jax.random.KeyArray # current rng state + rng_state: jax.Array # current rng state env_steps: jnp.int16 board: Board @@ -111,8 +111,8 @@ def factory_idx(self): @property def factory_mask(self): - factory_mask = self.factory_idx < self.n_factories[:, None] - chex.assert_shape(factory_mask, (2, self.MAX_N_FACTORIES)) + factory_mask = self.factory_idx < self.n_factories[..., None] + chex.assert_shape(factory_mask, (..., 2, self.MAX_N_FACTORIES)) return factory_mask @property @@ -128,8 +128,8 @@ def unit_idx(self): @property def unit_mask(self): - unit_mask = self.unit_idx < self.n_units[:, None] - chex.assert_shape(unit_mask, (2, self.MAX_N_UNITS)) + unit_mask = self.unit_idx < self.n_units[..., None] + chex.assert_shape(unit_mask, (..., 2, self.MAX_N_UNITS)) return unit_mask @property @@ -818,12 +818,12 @@ def _handle_transfer_actions(self, actions: UnitAction, valid: Array) -> 'State' target_pos = Position(self.units.pos.pos + direct2delta_xy[actions.direction]) # int[2, U, 2] target_factory_id = self.board.factory_occupancy_map[target_pos.x, target_pos.y] # int[2, U] target_factory_idx = self.factory_id2idx.at[target_factory_id] \ - .get('fill', fill_value=imax(self.factory_id2idx.dtype)) # int[2, U, 2] + .get(mode='fill', fill_value=imax(self.factory_id2idx.dtype)) # int[2, U, 2] there_is_a_factory = target_factory_idx[..., 1] < self.n_factories[target_factory_idx[..., 0]] # bool[2, U] target_unit_id = self.board.units_map[target_pos.x, target_pos.y] # int[2, U] target_unit_idx = self.unit_id2idx.at[target_unit_id] \ - .get('fill', fill_value=imax(self.unit_id2idx.dtype)) # int[2, U, 2] + .get(mode='fill', fill_value=imax(self.unit_id2idx.dtype)) # int[2, U, 2] there_is_an_unit = target_unit_idx[..., 1] < self.n_units[target_unit_idx[..., 0]] # bool[2, U] transfer_to_factory = valid & there_is_a_factory # bool[2, U] diff --git a/jux/utils/__init__.py b/jux/utils/__init__.py index 5af731d..dce39ce 100644 --- a/jux/utils/__init__.py +++ b/jux/utils/__init__.py @@ -9,6 +9,7 @@ import luxai_s2 import numpy as np from luxai_s2 import LuxAI_S2 +from luxai_s2.config import UnitConfig INT32_MAX = jnp.iinfo(jnp.int32).max INT16_MAX = jnp.iinfo(jnp.int16).max @@ -64,12 +65,17 @@ def load_replay(replay: str) -> Tuple[LuxAI_S2, Generator[Dict, None, None]]: if 'configuration' in replay: # kaggle replay seed = replay['configuration']['seed'] - env = LuxAI_S2() + replay['configuration']['env_cfg']['ROBOTS'] = { + 'HEAVY': UnitConfig(**replay['configuration']['env_cfg']['ROBOTS']['HEAVY']), + 'LIGHT': UnitConfig(**replay['configuration']['env_cfg']['ROBOTS']['LIGHT']), + } + env = LuxAI_S2(**replay['configuration']['env_cfg']) env.reset(seed=seed) actions = get_actions_from_replay(replay, replay['version']) elif 'observations' in replay and 'actions' in replay: # luxai_runner replay env = LuxAI_S2() + env.env_cfg.map_size = len(replay['observations'][0]['board']['rubble']) env.reset() # load board diff --git a/pyproject.toml b/pyproject.toml index a3b6e49..9aad378 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "juxai-s2" description = "JUX is a jax-accelerated engine for Lux-2022." -requires-python = ">=3.7, <3.11" +requires-python = ">=3.8, <3.12" license = { file = "LICENSE" } readme = "README.md" authors = [ @@ -21,8 +21,8 @@ classifiers = [ "Topic :: Scientific/Engineering :: Artificial Intelligence", ] dependencies = [ - "luxai-s2==2.1.9", - # "jax[cuda]", + "luxai-s2==3.0.0", + "jax[cuda11_cudnn82]==0.4.7", "chex", ] dynamic = ["version"] @@ -59,6 +59,8 @@ dev = [ [tool.setuptools.dynamic] version = { attr = "jux.__version__" } +[tool.setuptools_scm] + [tool.yapf] column_limit = 120 indent_width = 4 diff --git a/tox.ini b/tox.ini index a1b3e08..45c2ae2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ # For more information about tox, see https://tox.readthedocs.io/en/latest/ [tox] -envlist = coverage_clean, py37, py38, py39, py310, lint, coverage_report +envlist = coverage_clean, py38, py39, py310, py311, lint, coverage_report isolated_build = True requires = tox @@ -14,7 +14,7 @@ deps = pytest-cov rich chex - jax[cuda11_cudnn82] + jax[cuda11_cudnn82]==0.4.7 extras = torch install_command = pip install -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html {opts} {packages} diff --git a/tutorial.ipynb b/tutorial.ipynb index ab0895c..d6e55cb 100644 --- a/tutorial.ipynb +++ b/tutorial.ipynb @@ -1,1683 +1,1597 @@ { - "cells": [ - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "# Jux Tutorial" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "JUX is a jax-accelerated game core for Lux AI Challenge Season 2. This tutorial will guide you through the usage of JUX. Make sure you have fully understand [game rules](https://www.lux-ai.org/specs-2022-beta) of Lux AI Challenge Season 2 before going through this tutorial. This tutorial requires you to have basic knowledge of JAX." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "# rich is needed by this tutorial for nice printing\n", - "%pip install rich" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "# The Art of Dancing with Shackles" - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Programming in JAX is an art of dancing with shackles.\n", - "\n", - "JAX in nature is a library aimed for array manipulation, not for general purpose programming. Programming in JAX is quite different from normal programming paradigm, and sometimes painful. Nearly all weird APIs you encountered in JUX are due to some limitation JAX exerts on us. Here are some of them:\n", - "\n", - "1. We need to map all if-else, for-loop, and other normal statements to JAX's **array operators**. Good news is that this part is done in JUX, and you don't need to worry about it.\n", - "\n", - "2. We need to adopt a **functional programming style**, which means we need to avoid mutating variables, and use immutable data structures. Every time you want to change a field of a class, you need to create a new instance of that class. This explains why you must pass in current game state to every function in JUX, and receive a new game state from them.\n", - "\n", - "3. We have **no advanced data structures** like list, dict, set, etc. All we have is just array, and we need to imitate all kinds of data structures with array.\n", - "\n", - "4. We must adopt a strange **attribute-first memory layout**, which is counter-intuitive for most programmers at first glance, but it is the key to understand the game state object.\n", - "\n", - "5. To make functions jittable, all arrays must be of **static shape and dtype**. In other word, we have no stuff like lists with dynamic length. Every list must be of fixed length. If not, pad it to a fixed length, and use another variable to record the actual length.\n", - "\n", - "But, what can we get from JAX? The answer is the massive parallel computation power and perfect portability. We need not to write any CUDA kernels or even any C++ code to enjoy the power of GPU. The whole project is implemented in pure python, so it can run on Linux/Windows/MacOS, and on CPU/GPU/TPU or any other XLA-compatible devices. This is cool, isn't it?" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Create a New Environment\n", - "\n", - "We first create a new `JuxEnv` object. This object is analogous to a `LuxAI_S2`." - ] - }, - { - "cell_type": "code", - "execution_count": 1, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "JuxBufferConfig(MAX_N_UNITS=200, MAX_GLOBAL_ID=2000, MAX_N_FACTORIES=6, MAP_SIZE=48)" - ] - }, - "execution_count": 1, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "from jux.env import JuxEnv\n", - "from jux.config import JuxBufferConfig, EnvConfig\n", - "\n", - "jux_env = JuxEnv(\n", - " env_cfg=EnvConfig(),\n", - " buf_cfg=JuxBufferConfig(MAX_N_UNITS=200),\n", - ")\n", - "\n", - "jux_env.buf_cfg" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Beside the `EnvConfig` configuration, we also need to specify the `JuxBufferConfig`. The most important parameter is the `MAX_N_UNITS`, which greatly affects the performance and memory usage. The default value is 1000. See the performance section in [README.md](README.md#performance) for more details.\n", - "\n", - "Then, we reset the environment." - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "metadata": {}, - "outputs": [], - "source": [ - "state = jux_env.reset(seed=0)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "The `reset()` function returns a `State` object, which stores the the current state of the game. Since LuxAI_S2 is a perfect information game, the `State` object is also our initial observation. The first time we call `reset()` takes several seconds for jax to compile it, and subsequent calls will be finished on the fly. Please run above cell again to see the difference." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "We can visualize the game state by following code snippet. " - ] - }, - { - "cell_type": "code", - "execution_count": 3, - "metadata": {}, - "outputs": [ - { - "data": { - "image/png": "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", - "text/plain": [ - "<Figure size 640x480 with 1 Axes>" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "import matplotlib.pyplot as plt\n", - "img = jux_env.render(state, \"rgb_array\")\n", - "plt.axis('off')\n", - "plt.tight_layout()\n", - "plt.imshow(img)\n", - "plt.show()" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Step the Environment" - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Let's first load a replay, and create our `JuxEnv` and `State` from it." - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "metadata": {}, - "outputs": [], - "source": [ - "import jux.utils\n", - "\n", - "lux_env, lux_actions = jux.utils.load_replay(f'https://www.kaggleusercontent.com/episodes/{46215591}.json')\n", - "\n", - "jux_env, state = JuxEnv.from_lux(lux_env, buf_cfg=JuxBufferConfig(MAX_N_UNITS=200))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "This section we show how to step the environment. LuxAI_S2 has three phases:\n", - "1. the initial bid step\n", - "2. the factory placement steps\n", - "3. the normal steps\n", - "\n", - "To deal with three different phases, the `LuxAI_S2.step()` function is replaced with three phase-specific step functions:\n", - "1. `JuxEnv.step_bid()`\n", - "2. `JuxEnv.step_factory_placement()`\n", - "3. `JuxEnv.step_late_game()`\n", - "\n", - "Each of them has unique signature and deal a specific game phase." - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Bid Step\n", - "\n", - "The first step is bid step, which is handled by `JuxEnv.step_bid()`. Jax adopts a functional programming style, so `JuxEnv` stores nothing about the game state. Every time we call `step_bid()`, the current game state shall be passed in, and a new game state is passed out. The same rule also applies to `step_factory_placement()` and `step_late_game()`." - ] - }, - { - "cell_type": "code", - "execution_count": 5, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "bid action in Lux:\n", - "{'player_0': {'bid': 0, 'faction': 'AlphaStrike'},\n", - " 'player_1': {'bid': 0, 'faction': 'AlphaStrike'}}\n", - "\n", - "bid action in Jux:\n", - "bid = [0 0], faction = [0 0]\n" - ] - } - ], - "source": [ - "import jux.actions\n", - "from pprint import pprint\n", - "\n", - "lux_act = next(lux_actions)\n", - "\n", - "print(\"bid action in Lux:\")\n", - "pprint(lux_act, compact=False)\n", - "\n", - "bid, faction = jux.actions.bid_action_from_lux(lux_act)\n", - "print()\n", - "print(\"bid action in Jux:\")\n", - "print(f\"{bid = !s}, {faction = !s}\")\n", - "\n", - "state, (observations, rewards, dones, infos) = jux_env.step_bid(state, bid, faction)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "The argument `bid` and `faction` shall have following shapes." - ] - }, - { - "cell_type": "code", - "execution_count": 6, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "bid: ShapedArray(int32[2])\n", - "faction: ShapedArray(int8[2])\n" - ] - } - ], - "source": [ - "print(f\"bid: {bid.aval}\")\n", - "print(f\"faction: {faction.aval}\")" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "There are four factions, numbered from 0 to 3." - ] - }, - { - "cell_type": "code", - "execution_count": 7, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "{0: <FactionTypes.AlphaStrike: 0>,\n", - " 1: <FactionTypes.MotherMars: 1>,\n", - " 2: <FactionTypes.TheBuilders: 2>,\n", - " 3: <FactionTypes.FirstMars: 3>}" - ] - }, - "execution_count": 7, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "from jux.team import FactionTypes\n", - "\n", - "{int(f): f for f in FactionTypes}" - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Beside new game state, there are also other four return values, `observations`, `rewards`, `dones`, and `infos`.\n", - "1. `observations` contains the observations for each player. Since LuxAI_S2 is a perfect information game, the observations are simply the same `state` object, i.e., \n", - " ```python\n", - " observations['player_0'] == observations['player_1'] == state\n", - " ```\n", - "2. `rewards` contains the sum of lichens each player owns.\n", - "3. `dones` is a dictionary of boolean values, which indicates whether the game is over for each player. It is gaurenteed that \n", - " ```python\n", - " dones['player_0'] == dones['player_1']\n", - " ```\n", - "4. `infos` for each player is an empty dictionary, because there is no other infos to provide. \n", - " ```python\n", - " infos['player_0'] == infos['player_1'] == {}\n", - " ```" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Factory Placement Steps\n", - "\n", - "The factory placement step is handled by `JuxEnv.step_factory_placement()`. The next player to place a factory is indicated by `state.next_player`." - ] - }, - { - "cell_type": "code", - "execution_count": 8, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "lux_act = {'player_0': {'metal': 150, 'spawn': [27, 25], 'water': 150}, 'player_1': {}}\n", - "player_0 place a factory at [27 25] with water=150, metal=150.\n", - "lux_act = {'player_0': {}, 'player_1': {'metal': 150, 'spawn': [19, 31], 'water': 150}}\n", - "player_1 place a factory at [19 31] with water=150, metal=150.\n", - "lux_act = {'player_0': {'metal': 150, 'spawn': [7, 10], 'water': 150}, 'player_1': {}}\n", - "player_0 place a factory at [ 7 10] with water=150, metal=150.\n", - "lux_act = {'player_0': {}, 'player_1': {'metal': 150, 'spawn': [7, 3], 'water': 150}}\n", - "player_1 place a factory at [7 3] with water=150, metal=150.\n" - ] - } - ], - "source": [ - "while state.real_env_steps < 0:\n", - " lux_act = next(lux_actions)\n", - " print(f\"{lux_act = }\")\n", - " spawn, water, metal = jux.actions.factory_placement_action_from_lux(lux_act)\n", - "\n", - " print(f\"player_{state.next_player!s} place a factory at {spawn[state.next_player]}\",\n", - " f\"with water={water[state.next_player]}, metal={metal[state.next_player]}.\")\n", - " state, (observations, rewards, dones, infos) = jux_env.step_factory_placement(state, spawn, water, metal)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "The argument `spawn`, `water`, and `metal` have a leading dimension 2, but only \n", - "- `spawn[state.next_player]`\n", - "- `water[state.next_player]`\n", - "- `metal[state.next_player]`\n", - "\n", - "are used." - ] - }, - { - "cell_type": "code", - "execution_count": 9, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "spawn: ShapedArray(int8[2,2])\n", - "water: ShapedArray(int32[2])\n", - "metal: ShapedArray(int32[2])\n" - ] - } - ], - "source": [ - "print(f\"spawn: {spawn.aval}\")\n", - "print(f\"water: {water.aval}\")\n", - "print(f\"metal: {metal.aval}\")" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "This is the current game state." - ] - }, - { - "cell_type": "code", - "execution_count": 10, - "metadata": {}, - "outputs": [ - { - "data": { - "image/png": "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", - "text/plain": [ - "<Figure size 640x480 with 1 Axes>" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "img = jux_env.render(state, \"rgb_array\")\n", - "plt.axis('off')\n", - "plt.tight_layout()\n", - "plt.imshow(img)\n", - "plt.show()" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Normal Steps\n", - "\n", - "The normal steps are handled by `JuxEnv.step_late_game()`." - ] - }, - { - "cell_type": "code", - "execution_count": 11, - "metadata": {}, - "outputs": [ - { - "data": { - "image/png": "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", - "text/plain": [ - "<Figure size 640x480 with 1 Axes>" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "from jux.actions import JuxAction\n", - "# prepare actions\n", - "lux_act = next(lux_actions)\n", - "jux_act = JuxAction.from_lux(state, lux_act)\n", - "\n", - "# step\n", - "state, (observations, rewards, dones, infos) = jux_env.step_late_game(state, jux_act)\n", - "\n", - "# render\n", - "img = jux_env.render(state, \"rgb_array\")\n", - "plt.axis('off')\n", - "plt.tight_layout()\n", - "plt.imshow(img)\n", - "plt.show()" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "`step_late_game()` takes an `JuxAction` object as input, which will be elaborated lately. The first time we call `step_late_game()` triggers the jax jit compilation, which is slow, but subsequent calls will be finished on the fly. You may run above cell again to see the difference." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Understanding the `State`\n", - "\n", - "`State` object is a nested `NamedTuple`, with all leaves being `jax.numpy.ndarray`. It has following fields. " - ] - }, - { - "cell_type": "code", - "execution_count": 12, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "('env_cfg',\n", - " 'seed',\n", - " 'rng_state',\n", - " 'env_steps',\n", - " 'board',\n", - " 'units',\n", - " 'unit_id2idx',\n", - " 'n_units',\n", - " 'factories',\n", - " 'factory_id2idx',\n", - " 'n_factories',\n", - " 'teams',\n", - " 'global_id',\n", - " 'place_first')" - ] - }, - "execution_count": 12, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "state._fields" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Board Information\n", - "\n", - "Information about the board, including rubble, ice, ore, and lichen, are stored in `state.board`." - ] - }, - { - "cell_type": "code", - "execution_count": 13, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Board</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">seed</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factories_per_team</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">GameMap</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">rubble</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">ice</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>bool<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">ore</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>bool<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">symmetry</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">lichen</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">lichen_strains</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">units_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_occupancy_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">12</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mBoard\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mseed\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactories_per_team\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mmap\u001b[0m=\u001b[1;35mGameMap\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mrubble\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mice\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mbool\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33more\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mbool\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33msymmetry\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mlichen\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mlichen_strains\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munits_map\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactory_map\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactory_occupancy_map\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactory_pos\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m12\u001b[0m,\u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "import jux.tree_util\n", - "import rich\n", - "rich.print(jux.tree_util.map_to_aval(state.board))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Factory Information\n", - "\n", - "All information about factories, including their position, cargo, and power, are stored in `state.factories`. `state.n_factories` indicates the number of factories each player has. Because we have just reset the environment, both players have 0 factory. The leaves of `state.factories` have shapes shown as below. " - ] - }, - { - "cell_type": "code", - "execution_count": 14, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "state.n_factories = DeviceArray([2, 2], dtype=int8)\n" - ] - }, - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Factory</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Position</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">]))</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">power</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">cargo</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitCargo</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">stock</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">4</span><span style=\"font-weight: bold\">]))</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mFactory\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mteam_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpos\u001b[0m=\u001b[1;35mPosition\u001b[0m\u001b[1m(\u001b[0m\u001b[33mpos\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m,\u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpower\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcargo\u001b[0m=\u001b[1;35mUnitCargo\u001b[0m\u001b[1m(\u001b[0m\u001b[33mstock\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m,\u001b[1;36m4\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "print(f\"{state.n_factories = }\")\n", - "rich.print(jux.tree_util.map_to_aval(state.factories))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "All leaves of `state.factories` have leading dimensions of `(2, MAX_N_FACTORIES)`. Data of player 0 are stored in `state.factories.xxx[0]` and data of player 1 are stored in `state.factories.xxx[1]`.\n", - "\n", - "Assume `state.n_factories` is `[2, 3]`, then player 0 has 2 factories, and player 1 has 3 factories. For player 0, the 2 factories he/she owns have power `state.factories.power[0, 0]` and `state.units.factories[0, 1]`, respectively. All values in `state.factories.power[0, 2:]` are invalid and undefined, because player 0 only has 2 factories. The same rule applies to other fields in `state.factories`. " - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "#### Memory layout: Object-frist vs Attribute-first\n", - "The memory layout of `state.factories` is different from the classic object-oriented programming style. Take power as an example, the power of all units are stored in a single array. We call such kind of memory layout **attribute-first**, because it arranges the same attributes of all objects into consecutive memory space. \n", - "\n", - "In classic object-oriented programming, if we have a list of objects, we usually stores all attributes of an object in a single memory block, and maintain a list of such memory block. It usually looks like:\n", - "```python\n", - "[\n", - " Factory(unit_id=0, power=0, ... ),\n", - " Factory( ... ),\n", - " Factory( ... ),\n", - " Factory( ... ),\n", - " ...\n", - "]\n", - "```\n", - "This is called **object-first** memory layout, because it arranges the same object into consecutive memory space.\n", - "\n", - "In **attribute-first** layout, we only have one `Factory` object, but its attributes have a leading batch dimension. It looks like:\n", - "```python\n", - "Factory(\n", - " unit_id=[0, 1, 2, 3, ...],\n", - " power=[0, 0, 0, 0, ...],\n", - " ...\n", - ")\n", - "```\n", - "\n", - "The biggest advantage of attribute-first layout is that it is array-friendly. We can use array operations to manipulate the data. For example, we can implement factory power gain by a simple vector addition. \n", - "```python\n", - "new_power = state.factories.power + state.env_cfg.FACTORY_CHARGE\n", - "```" - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Unit Information\n", - "\n", - "Information about units, including their unit type, position, cargo, and power, are stored in `state.units`. `state.n_units` indicates the number of units each player has. The leaves of `state.units` have shapes shown as below. Similar as factories, units are also stored in attribute-first layout. All leaves of `state.units` have leading dimensions of `(2, MAX_N_UNITS)`. More info about `state.units.action_queue` will be elaborated in next section." - ] - }, - { - "cell_type": "code", - "execution_count": 15, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "state.n_units = DeviceArray([2, 2], dtype=int16)\n" - ] - }, - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Unit</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_queue</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ActionQueue</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">data</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">front</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">rear</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Position</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">]))</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">cargo</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitCargo</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">stock</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">4</span><span style=\"font-weight: bold\">]))</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">power</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mUnit\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33munit_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33maction_queue\u001b[0m=\u001b[1;35mActionQueue\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mdata\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mfront\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrear\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mteam_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpos\u001b[0m=\u001b[1;35mPosition\u001b[0m\u001b[1m(\u001b[0m\u001b[33mpos\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcargo\u001b[0m=\u001b[1;35mUnitCargo\u001b[0m\u001b[1m(\u001b[0m\u001b[33mstock\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m4\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpower\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "print(f\"{state.n_units = }\")\n", - "rich.print(jux.tree_util.map_to_aval(state.units))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Understanding Robot Actions\n", - "\n", - "The whole actions system is designed upon three classes `UnitAction`, `ActionQueue` and `JuxActions`.\n", - "1. `UnitAction`: the class representing single robot action.\n", - "2. `ActionQueue`: a bi-directional queue storing a sequence of actions.\n", - "3. `JuxActions`: a NamedTuple containing both actions for factories and robots, mainly used as input to `JuxEnv.step_late_game()`.\n" - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### UnitAction\n", - "\n", - "Actions of robots are represented by `UnitAction` objects. There are five fields in `UnitAction`:\n", - "\n", - "| fields | dtype | description |\n", - "|:--------------- |:----- |:---------------------------------------------------- |\n", - "| `action_type` | int8 | indicates the action type. |\n", - "| `direction` | int8 | used in `MOVE` and `TRANSFER` actions. |\n", - "| `resource_type` | int8 | used in `PICKUP` and `TRANSFER` actions. |\n", - "| `amount` | int16 | used in `PICKUP`, `TRANSFER` and `RECHARGE` actions. |\n", - "| `repeat` | int8 | used in all actions. |\n", - "| `n` | int16 | used in all actions. |" - ] - }, - { - "cell_type": "code", - "execution_count": 16, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">DeviceArray</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int8</span><span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">DeviceArray</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">1</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int8</span><span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">DeviceArray</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int8</span><span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">DeviceArray</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int16</span><span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">DeviceArray</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int16</span><span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">DeviceArray</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">1</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int16</span><span style=\"font-weight: bold\">)</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33maction_type\u001b[0m=\u001b[1;35mDeviceArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m0\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint8\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mdirection\u001b[0m=\u001b[1;35mDeviceArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m1\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint8\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mresource_type\u001b[0m=\u001b[1;35mDeviceArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m0\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint8\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mamount\u001b[0m=\u001b[1;35mDeviceArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m0\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint16\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrepeat\u001b[0m=\u001b[1;35mDeviceArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m0\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint16\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn\u001b[0m=\u001b[1;35mDeviceArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m1\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint16\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "from jux.map.position import Direction\n", - "from jux.actions import UnitAction\n", - "import rich\n", - "\n", - "move_action = UnitAction.move(Direction.UP, repeat=0)\n", - "rich.print(move_action)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "`action_type` must be one of `UnitActionType`. There are 6 types of actions, numbered from 0 to 5. Note: `DO_NOTHING` (-1) is a special one, designed for internal use only. Users should not use it. " - ] - }, - { - "cell_type": "code", - "execution_count": 17, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "{-1: <UnitActionType.DO_NOTHING: -1>,\n", - " 0: <UnitActionType.MOVE: 0>,\n", - " 1: <UnitActionType.TRANSFER: 1>,\n", - " 2: <UnitActionType.PICKUP: 2>,\n", - " 3: <UnitActionType.DIG: 3>,\n", - " 4: <UnitActionType.SELF_DESTRUCT: 4>,\n", - " 5: <UnitActionType.RECHARGE: 5>}" - ] - }, - "execution_count": 17, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "from jux.actions import UnitActionType\n", - "\n", - "{int(a): a for a in UnitActionType}" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "`direction` must be one of `Direction`. There are 5 directions, numbered from 0 to 4." - ] - }, - { - "cell_type": "code", - "execution_count": 18, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "{0: <Direction.CENTER: 0>,\n", - " 1: <Direction.UP: 1>,\n", - " 2: <Direction.RIGHT: 2>,\n", - " 3: <Direction.DOWN: 3>,\n", - " 4: <Direction.LEFT: 4>}" - ] - }, - "execution_count": 18, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "from jux.map.position import Direction\n", - "\n", - "{int(a): a for a in Direction}" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "`resource_type` must be one of `ResourceType`. There are 4 types of resources, numbered from 0 to 3." - ] - }, - { - "cell_type": "code", - "execution_count": 19, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "{0: <ResourceType.ice: 0>,\n", - " 1: <ResourceType.ore: 1>,\n", - " 2: <ResourceType.water: 2>,\n", - " 3: <ResourceType.metal: 3>,\n", - " 4: <ResourceType.power: 4>}" - ] - }, - "execution_count": 19, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "from jux.unit_cargo import ResourceType\n", - "\n", - "{int(a): a for a in ResourceType}" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Action Queue" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "The most complicated part about `units` is its action queue. The action queue for single unit has following structure." - ] - }, - { - "cell_type": "code", - "execution_count": 20, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ActionQueue</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">data</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">front</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">rear</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mActionQueue\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mdata\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mfront\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrear\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "from jux.actions import ActionQueue\n", - "action_queue = ActionQueue.empty(capacity=state.env_cfg.UNIT_ACTION_QUEUE_SIZE)\n", - "rich.print(jux.tree_util.map_to_aval(action_queue))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Units' actions are stored in `state.units.action_queue`, which is a bi-directional queue implemented in jax. `ActionQueue` has four fields: `data`, `count`, `front`, and `rear`. \n", - "1. `data` is a `UnitAction` object, containing `UNIT_ACTION_QUEUE_SIZE` actions in attribute-first layout, so its attributes have a leading dimension of `UNIT_ACTION_QUEUE_SIZE`.\n", - "2. `count` indicates the number of actions in the queue.\n", - "3. `front` is the index of the first action in the queue. \n", - "4. `rear` is the index of the first empty slot in the queue, which is also the position for next push back. `(rear - 1) % capacity` is the index of the last action in the queue." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Above is the structure of action queue for a single unit. Now, let's have a look at `state.units.action_queue`, which contains the action queue for all units. The main difference is that all leaves are added with two leading dimensions of `(2, MAX_N_UNITS)`. Again, this is because we use attribute-first layout." - ] - }, - { - "cell_type": "code", - "execution_count": 21, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ActionQueue</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">data</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">front</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">rear</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mActionQueue\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mdata\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mfront\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrear\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "rich.print(jux.tree_util.map_to_aval(state.units.action_queue))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "`ActionQueue` provides several useful methods, such as `push_back()`, `push_front()`, `pop()` and `peek()`. However, all these methods can only be applied to the queues of a single unit. `state.units.action_queue` has two batch dimension, one for player, one for units, so we need to `vmap` these methods two times. The following code shows how to peek the next actions of all units. The returned `act` contains the next actions of all units, again, in attribute-first layout." - ] - }, - { - "cell_type": "code", - "execution_count": 22, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "from jux.actions import ActionQueue\n", - "import jax\n", - "peek_vmap_vmap = jax.vmap(jax.vmap(ActionQueue.peek))\n", - "act = peek_vmap_vmap(state.units.action_queue)\n", - "rich.print(jux.tree_util.map_to_aval(act))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### JuxAction\n", - "\n", - "`JuxAction` is a NamedTuple containing both actions for factories and robots, mainly used as input to `JuxEnv.step_late_game()`. It has four fields: `factory_actions`, `unit_action_queue`, `unit_action_queue_count` and `unit_action_queue_update`.\n", - "1. `factory_actions`: the actions for each factories.\n", - "2. `unit_action_queue_update`: a boolean array indicating whether a unit's action queue should be updated or not in this turn.\n", - "3. `unit_action_queue`: What actions will be in the new action queue, If update.\n", - "4. `unit_action_queue_count`: How many actions will there be in the new action queue, if update." - ] - }, - { - "cell_type": "code", - "execution_count": 23, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">JuxAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_action</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue_count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue_update</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>bool<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mJuxAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mfactory_action\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_action_queue\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33munit_action_queue_count\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_action_queue_update\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mbool\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "jux_act = JuxAction.from_lux(state, lux_act)\n", - "rich.print(jux.tree_util.map_to_aval(jux_act))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "There are four types of actions for factories: `DO_NOTHING`, `BUILD_LIGHT`, `BUILD_HEAVY` and `WATER`, numbered from -1 to 2." - ] - }, - { - "cell_type": "code", - "execution_count": 24, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "{-1: <FactoryAction.DO_NOTHING: -1>,\n", - " 0: <FactoryAction.BUILD_LIGHT: 0>,\n", - " 1: <FactoryAction.BUILD_HEAVY: 1>,\n", - " 2: <FactoryAction.WATER: 2>}" - ] - }, - "execution_count": 24, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "from jux.actions import FactoryAction\n", - "\n", - "{int(a): a for a in FactoryAction}" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Run a Batch of Environments\n", - "Running a single environment cannot take full advantage of the power of modern GPU. This section will show you how to run a batch of environments at once. We first create a `JuxEnvBatch` object." - ] - }, - { - "cell_type": "code", - "execution_count": 25, - "metadata": {}, - "outputs": [], - "source": [ - "from jux.env import JuxEnvBatch\n", - "\n", - "jux_env_batch = JuxEnvBatch(buf_cfg=JuxBufferConfig(MAX_N_UNITS=200))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Then, reset the environment to get initial states. Instead of passing in a single seed, we pass in a batch of seeds. The batch size is determined by the size of the seed array." - ] - }, - { - "cell_type": "code", - "execution_count": 26, - "metadata": {}, - "outputs": [], - "source": [ - "import jax.numpy as jnp\n", - "\n", - "batch_size = 10\n", - "seeds = jnp.arange(batch_size)\n", - "\n", - "states = jux_env_batch.reset(seeds)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "According to our attribute-first memory layout, states is still a `State` object, but all leaves are added with a leading dimension of `batch_size`." - ] - }, - { - "cell_type": "code", - "execution_count": 27, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Factory</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Position</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">]))</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">power</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">cargo</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitCargo</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">stock</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">4</span><span style=\"font-weight: bold\">]))</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mFactory\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mteam_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpos\u001b[0m=\u001b[1;35mPosition\u001b[0m\u001b[1m(\u001b[0m\u001b[33mpos\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m,\u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpower\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcargo\u001b[0m=\u001b[1;35mUnitCargo\u001b[0m\u001b[1m(\u001b[0m\u001b[33mstock\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m,\u001b[1;36m4\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "rich.print(jux.tree_util.map_to_aval(states.factories))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "The states returned by `JuxEnvBatch.reset()` shares the same environmental config and jux buffer config. In addition, they are also guaranteed to have the same `states.board.factories_per_team`, so they take the same number of turns to place factories." - ] - }, - { - "cell_type": "code", - "execution_count": 28, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "DeviceArray([2, 2, 2, 2, 2, 2, 2, 2, 2, 2], dtype=int8)" - ] - }, - "execution_count": 28, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "states.board.factories_per_team" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Similarly, other arguments of `JuxEnvBatch.step_*()` are also batched. All arrays must have a leading dimension of `batch_size`." - ] - }, - { - "cell_type": "code", - "execution_count": 29, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "bid: ShapedArray(int32[10,2])\n", - "faction: ShapedArray(int8[10,2])\n" - ] - } - ], - "source": [ - "# bid step\n", - "bid = jnp.zeros((batch_size, 2), dtype=jnp.int32)\n", - "faction = jnp.zeros((batch_size, 2), dtype=jnp.int8)\n", - "\n", - "states, (observations, rewards, dones, infos) = jux_env_batch.step_bid(states, bid, faction)\n", - "\n", - "print(f\"bid: {bid.aval}\")\n", - "print(f\"faction: {faction.aval}\")" - ] - }, - { - "cell_type": "code", - "execution_count": 30, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "spawn: ShapedArray(int8[10,2,2])\n", - "water: ShapedArray(int32[10,2])\n", - "metal: ShapedArray(int32[10,2])\n" - ] - } - ], - "source": [ - "key = jax.random.PRNGKey(0)\n", - "water = jnp.ones((batch_size, 2), dtype=jnp.int32) * 150\n", - "metal = jnp.ones((batch_size, 2), dtype=jnp.int32) * 150\n", - "\n", - "# factory placement step\n", - "factories_per_team = states.board.factories_per_team[0]\n", - "for i in range(factories_per_team * 2):\n", - " # random spawn position\n", - " key, subkey = jax.random.split(key)\n", - " spawn = jax.random.randint(subkey, (batch_size, 2, 2), 0, jux_env_batch.env_cfg.map_size, dtype=jnp.int8)\n", - " states, (observations, rewards, dones, infos) = jux_env_batch.step_factory_placement(states, spawn, water, metal)\n", - "\n", - "print(f\"spawn: {spawn.aval}\")\n", - "print(f\"water: {water.aval}\")\n", - "print(f\"metal: {metal.aval}\")" - ] - }, - { - "cell_type": "code", - "execution_count": 31, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">JuxAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_action</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue_count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue_update</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>bool<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mJuxAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mfactory_action\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_action_queue\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33munit_action_queue_count\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_action_queue_update\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mbool\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "# a dummy action\n", - "jux_action = JuxAction.empty(\n", - " jux_env_batch.env_cfg, \n", - " jux_env_batch.buf_cfg\n", - ")\n", - "jux_action = jax.tree_map(lambda x: x[None].repeat(batch_size, axis=0), jux_action)\n", - "rich.print(jux.tree_util.map_to_aval(jux_action))\n", - "\n", - "# late game step\n", - "states, (observations, rewards, dones, infos) = jux_env_batch.step_late_game(states, jux_action)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Convert between PyTorch and JAX" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Since PyTorch is widely used in the community, we provide a simple way to convert between PyTorch and JAX. Following code shows how to convert observations (state) from JAX array to PyTorch tensor, so it can be feed into PyTorch models." - ] - }, - { - "cell_type": "code", - "execution_count": 32, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">State</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">env_cfg</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-style: italic\">None</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">seed</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">rng_state</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">env_steps</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">board</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Board</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">seed</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factories_per_team</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">GameMap</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">rubble</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">ice</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">ore</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">symmetry</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">lichen</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">lichen_strains</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">units_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_occupancy_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">12</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">units</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Unit</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_queue</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ActionQueue</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">data</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">front</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">rear</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Position</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">]))</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">cargo</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitCargo</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">stock</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">4</span><span style=\"font-weight: bold\">]))</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">power</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id2idx</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2000</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n_units</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factories</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Factory</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Position</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">]))</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">power</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">cargo</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitCargo</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">stock</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">4</span><span style=\"font-weight: bold\">]))</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_id2idx</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">12</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n_factories</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">teams</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Team</span><span style=\"font-weight: bold\">(</span>\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">faction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">init_water</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">init_metal</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factories_to_place</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">factory_strains</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">6</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">n_factory</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">bid</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>, <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>\n", - " <span style=\"font-weight: bold\">)</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">global_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span><span style=\"font-weight: bold\">])</span>,\n", - " <span style=\"color: #808000; text-decoration-color: #808000\">place_first</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">torch</span><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">.Size</span><span style=\"font-weight: bold\">([</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span><span style=\"font-weight: bold\">])</span>\n", - "<span style=\"font-weight: bold\">)</span>\n", - "</pre>\n" - ], - "text/plain": [ - "\u001b[1;35mState\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33menv_cfg\u001b[0m=\u001b[3;35mNone\u001b[0m,\n", - " \u001b[33mseed\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrng_state\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33menv_steps\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mboard\u001b[0m=\u001b[1;35mBoard\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mseed\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactories_per_team\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mmap\u001b[0m=\u001b[1;35mGameMap\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mrubble\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m48\u001b[0m, \u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mice\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m48\u001b[0m, \u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33more\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m48\u001b[0m, \u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33msymmetry\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mlichen\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m48\u001b[0m, \u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mlichen_strains\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m48\u001b[0m, \u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munits_map\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m48\u001b[0m, \u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactory_map\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m48\u001b[0m, \u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactory_occupancy_map\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m48\u001b[0m, \u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactory_pos\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m12\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33munits\u001b[0m=\u001b[1;35mUnit\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33munit_type\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33maction_queue\u001b[0m=\u001b[1;35mActionQueue\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mdata\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33maction_type\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m, \u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mdirection\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m, \u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mresource_type\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m, \u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mamount\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m, \u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrepeat\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m, \u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m, \u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mfront\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mrear\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcount\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mteam_id\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_id\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpos\u001b[0m=\u001b[1;35mPosition\u001b[0m\u001b[1m(\u001b[0m\u001b[33mpos\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcargo\u001b[0m=\u001b[1;35mUnitCargo\u001b[0m\u001b[1m(\u001b[0m\u001b[33mstock\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m, \u001b[1;36m4\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpower\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33munit_id2idx\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2000\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn_units\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactories\u001b[0m=\u001b[1;35mFactory\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mteam_id\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33munit_id\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpos\u001b[0m=\u001b[1;35mPosition\u001b[0m\u001b[1m(\u001b[0m\u001b[33mpos\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m6\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mpower\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mcargo\u001b[0m=\u001b[1;35mUnitCargo\u001b[0m\u001b[1m(\u001b[0m\u001b[33mstock\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m6\u001b[0m, \u001b[1;36m4\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mfactory_id2idx\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m12\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn_factories\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mteams\u001b[0m=\u001b[1;35mTeam\u001b[0m\u001b[1m(\u001b[0m\n", - " \u001b[33mteam_id\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfaction\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33minit_water\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33minit_metal\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactories_to_place\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mfactory_strains\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m, \u001b[1;36m6\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mn_factory\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mbid\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m, \u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - " \u001b[1m)\u001b[0m,\n", - " \u001b[33mglobal_id\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", - " \u001b[33mplace_first\u001b[0m=\u001b[1;35mtorch\u001b[0m\u001b[1;35m.Size\u001b[0m\u001b[1m(\u001b[0m\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", - "\u001b[1m)\u001b[0m\n" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], - "source": [ - "# remove env_cfg to reduce output size\n", - "torch_state = states._replace(env_cfg=None).to_torch()\n", - "rich.print(jax.tree_map(lambda x: x.shape, torch_state))" - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "You can also convert between PyTorch tensors and JAX arrays by `jux.torch.from_torch` and `jux.torch.to_torch`. Typical usage is to convert actions generated by PyTorch models to JAX arrays, so they can be feed into `JuxEnv.step_*()`." - ] - }, - { - "cell_type": "code", - "execution_count": 33, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "DeviceArray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], dtype=int32)" - ] - }, - "execution_count": 33, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "import torch\n", - "import jux.torch\n", - "\n", - "jux.torch.from_torch(torch.arange(10))" - ] - }, - { - "cell_type": "code", - "execution_count": 34, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "tensor([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], device='cuda:0', dtype=torch.int32)" - ] - }, - "execution_count": 34, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "jux.torch.to_torch(jnp.arange(10))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "There is also a utility function `JuxAction.from_torch()` for build a valid `JuxAction` object from PyTorch tensors." - ] - } - ], - "metadata": { - "kernelspec": { - "display_name": "base", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.8.13" - }, - "orig_nbformat": 4, - "vscode": { - "interpreter": { - "hash": "d4d1e4263499bec80672ea0156c357c1ee493ec2b1c70f0acce89fc37c4a6abe" - } - } + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Jux Tutorial" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "JUX is a jax-accelerated game core for Lux AI Challenge Season 2. This tutorial will guide you through the usage of JUX. Make sure you have fully understand [game rules](https://www.lux-ai.org/specs-2022-beta) of Lux AI Challenge Season 2 before going through this tutorial. This tutorial requires you to have basic knowledge of JAX." + ] + }, + { + "cell_type": "code", + "execution_count": 1, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Collecting rich\n", + " Obtaining dependency information for rich from https://files.pythonhosted.org/packages/c1/d1/23ba6235ed82883bb416f57179d1db2c05f3fb8e5d83c18660f9ab6f09c9/rich-13.5.3-py3-none-any.whl.metadata\n", + " Downloading rich-13.5.3-py3-none-any.whl.metadata (18 kB)\n", + "Collecting markdown-it-py>=2.2.0 (from rich)\n", + " Obtaining dependency information for markdown-it-py>=2.2.0 from https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl.metadata\n", + " Using cached markdown_it_py-3.0.0-py3-none-any.whl.metadata (6.9 kB)\n", + "Requirement already satisfied: pygments<3.0.0,>=2.13.0 in /home/stao/mambaforge/envs/jux/lib/python3.9/site-packages (from rich) (2.16.1)\n", + "Collecting mdurl~=0.1 (from markdown-it-py>=2.2.0->rich)\n", + " Using cached mdurl-0.1.2-py3-none-any.whl (10.0 kB)\n", + "Downloading rich-13.5.3-py3-none-any.whl (239 kB)\n", + "\u001b[2K \u001b[38;2;114;156;31m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m239.8/239.8 kB\u001b[0m \u001b[31m1.5 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m31m882.2 kB/s\u001b[0m eta \u001b[36m0:00:01\u001b[0m\n", + "\u001b[?25hUsing cached markdown_it_py-3.0.0-py3-none-any.whl (87 kB)\n", + "Installing collected packages: mdurl, markdown-it-py, rich\n", + "Successfully installed markdown-it-py-3.0.0 mdurl-0.1.2 rich-13.5.3\n", + "Note: you may need to restart the kernel to use updated packages.\n" + ] + } + ], + "source": [ + "# rich is needed by this tutorial for nice printing\n", + "%pip install rich" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# The Art of Dancing with Shackles" + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Programming in JAX is an art of dancing with shackles.\n", + "\n", + "JAX in nature is a library aimed for array manipulation, not for general purpose programming. Programming in JAX is quite different from normal programming paradigm, and sometimes painful. Nearly all weird APIs you encountered in JUX are due to some limitation JAX exerts on us. Here are some of them:\n", + "\n", + "1. We need to map all if-else, for-loop, and other normal statements to JAX's **array operators**. Good news is that this part is done in JUX, and you don't need to worry about it.\n", + "\n", + "2. We need to adopt a **functional programming style**, which means we need to avoid mutating variables, and use immutable data structures. Every time you want to change a field of a class, you need to create a new instance of that class. This explains why you must pass in current game state to every function in JUX, and receive a new game state from them.\n", + "\n", + "3. We have **no advanced data structures** like list, dict, set, etc. All we have is just array, and we need to imitate all kinds of data structures with array.\n", + "\n", + "4. We must adopt a strange **attribute-first memory layout**, which is counter-intuitive for most programmers at first glance, but it is the key to understand the game state object.\n", + "\n", + "5. To make functions jittable, all arrays must be of **static shape and dtype**. In other word, we have no stuff like lists with dynamic length. Every list must be of fixed length. If not, pad it to a fixed length, and use another variable to record the actual length.\n", + "\n", + "But, what can we get from JAX? The answer is the massive parallel computation power and perfect portability. We need not to write any CUDA kernels or even any C++ code to enjoy the power of GPU. The whole project is implemented in pure python, so it can run on Linux/Windows/MacOS, and on CPU/GPU/TPU or any other XLA-compatible devices. This is cool, isn't it?" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Create a New Environment\n", + "\n", + "We first create a new `JuxEnv` object. This object is analogous to a `LuxAI_S2`." + ] + }, + { + "cell_type": "code", + "execution_count": 1, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "JuxBufferConfig(MAX_N_UNITS=200, MAX_GLOBAL_ID=2000, MAX_N_FACTORIES=11, MAP_SIZE=64)" + ] + }, + "execution_count": 1, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "from jux.env import JuxEnv\n", + "from jux.config import JuxBufferConfig, EnvConfig\n", + "\n", + "jux_env = JuxEnv(\n", + " env_cfg=EnvConfig(),\n", + " buf_cfg=JuxBufferConfig(MAX_N_UNITS=200),\n", + ")\n", + "\n", + "jux_env.buf_cfg" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Beside the `EnvConfig` configuration, we also need to specify the `JuxBufferConfig`. The most important parameter is the `MAX_N_UNITS`, which greatly affects the performance and memory usage. The default value is 1000. See the performance section in [README.md](README.md#performance) for more details.\n", + "\n", + "Then, we reset the environment." + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "metadata": {}, + "outputs": [], + "source": [ + "state = jux_env.reset(seed=0)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The `reset()` function returns a `State` object, which stores the the current state of the game. Since LuxAI_S2 is a perfect information game, the `State` object is also our initial observation. The first time we call `reset()` takes several seconds for jax to compile it, and subsequent calls will be finished on the fly. Please run above cell again to see the difference." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "We can visualize the game state by following code snippet. " + ] + }, + { + "cell_type": "code", + "execution_count": 3, + "metadata": {}, + "outputs": [ + { + "data": { + "image/png": "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", + "text/plain": [ + "<Figure size 640x480 with 1 Axes>" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "import matplotlib.pyplot as plt\n", + "img = jux_env.render(state, \"rgb_array\")\n", + "plt.axis('off')\n", + "plt.tight_layout()\n", + "plt.imshow(img)\n", + "plt.show()" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Step the Environment" + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Let's first load a replay, and create our `JuxEnv` and `State` from it." + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [], + "source": [ + "import jux.utils\n", + "\n", + "lux_env, lux_actions = jux.utils.load_replay(f'https://www.kaggleusercontent.com/episodes/{46215591}.json')\n", + "\n", + "jux_env, state = JuxEnv.from_lux(lux_env, buf_cfg=JuxBufferConfig(MAX_N_UNITS=200))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "This section we show how to step the environment. LuxAI_S2 has three phases:\n", + "1. the initial bid step\n", + "2. the factory placement steps\n", + "3. the normal steps\n", + "\n", + "To deal with three different phases, the `LuxAI_S2.step()` function is replaced with three phase-specific step functions:\n", + "1. `JuxEnv.step_bid()`\n", + "2. `JuxEnv.step_factory_placement()`\n", + "3. `JuxEnv.step_late_game()`\n", + "\n", + "Each of them has unique signature and deal a specific game phase." + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Bid Step\n", + "\n", + "The first step is bid step, which is handled by `JuxEnv.step_bid()`. Jax adopts a functional programming style, so `JuxEnv` stores nothing about the game state. Every time we call `step_bid()`, the current game state shall be passed in, and a new game state is passed out. The same rule also applies to `step_factory_placement()` and `step_late_game()`." + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "bid action in Lux:\n", + "{'player_0': {'bid': 0, 'faction': 'AlphaStrike'},\n", + " 'player_1': {'bid': 0, 'faction': 'AlphaStrike'}}\n", + "\n", + "bid action in Jux:\n", + "bid = [0 0], faction = [0 0]\n" + ] + } + ], + "source": [ + "import jux.actions\n", + "from pprint import pprint\n", + "\n", + "lux_act = next(lux_actions)\n", + "\n", + "print(\"bid action in Lux:\")\n", + "pprint(lux_act, compact=False)\n", + "\n", + "bid, faction = jux.actions.bid_action_from_lux(lux_act)\n", + "print()\n", + "print(\"bid action in Jux:\")\n", + "print(f\"{bid = !s}, {faction = !s}\")\n", + "\n", + "state, (observations, rewards, dones, infos) = jux_env.step_bid(state, bid, faction)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The argument `bid` and `faction` shall have following shapes." + ] + }, + { + "cell_type": "code", + "execution_count": 7, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "bid: ShapedArray(int32[2])\n", + "faction: ShapedArray(int8[2])\n" + ] + } + ], + "source": [ + "print(f\"bid: {bid.aval}\")\n", + "print(f\"faction: {faction.aval}\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "There are four factions, numbered from 0 to 3." + ] + }, + { + "cell_type": "code", + "execution_count": 8, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "{0: <FactionTypes.AlphaStrike: 0>,\n", + " 1: <FactionTypes.MotherMars: 1>,\n", + " 2: <FactionTypes.TheBuilders: 2>,\n", + " 3: <FactionTypes.FirstMars: 3>}" + ] + }, + "execution_count": 8, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "from jux.team import FactionTypes\n", + "\n", + "{int(f): f for f in FactionTypes}" + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Beside new game state, there are also other four return values, `observations`, `rewards`, `dones`, and `infos`.\n", + "1. `observations` contains the observations for each player. Since LuxAI_S2 is a perfect information game, the observations are simply the same `state` object, i.e., \n", + " ```python\n", + " observations['player_0'] == observations['player_1'] == state\n", + " ```\n", + "2. `rewards` contains the sum of lichens each player owns.\n", + "3. `dones` is a dictionary of boolean values, which indicates whether the game is over for each player. It is gaurenteed that \n", + " ```python\n", + " dones['player_0'] == dones['player_1']\n", + " ```\n", + "4. `infos` for each player is an empty dictionary, because there is no other infos to provide. \n", + " ```python\n", + " infos['player_0'] == infos['player_1'] == {}\n", + " ```" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Factory Placement Steps\n", + "\n", + "The factory placement step is handled by `JuxEnv.step_factory_placement()`. The next player to place a factory is indicated by `state.next_player`." + ] + }, + { + "cell_type": "code", + "execution_count": 9, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "lux_act = {'player_0': {'metal': 150, 'spawn': [27, 25], 'water': 150}, 'player_1': {}}\n", + "player_0 place a factory at [27 25] with water=150, metal=150.\n", + "lux_act = {'player_0': {}, 'player_1': {'metal': 150, 'spawn': [19, 31], 'water': 150}}\n", + "player_1 place a factory at [19 31] with water=150, metal=150.\n", + "lux_act = {'player_0': {'metal': 150, 'spawn': [7, 10], 'water': 150}, 'player_1': {}}\n", + "player_0 place a factory at [ 7 10] with water=150, metal=150.\n", + "lux_act = {'player_0': {}, 'player_1': {'metal': 150, 'spawn': [7, 3], 'water': 150}}\n", + "player_1 place a factory at [7 3] with water=150, metal=150.\n" + ] + } + ], + "source": [ + "while state.real_env_steps < 0:\n", + " lux_act = next(lux_actions)\n", + " print(f\"{lux_act = }\")\n", + " spawn, water, metal = jux.actions.factory_placement_action_from_lux(lux_act)\n", + "\n", + " print(f\"player_{state.next_player!s} place a factory at {spawn[state.next_player]}\",\n", + " f\"with water={water[state.next_player]}, metal={metal[state.next_player]}.\")\n", + " state, (observations, rewards, dones, infos) = jux_env.step_factory_placement(state, spawn, water, metal)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The argument `spawn`, `water`, and `metal` have a leading dimension 2, but only \n", + "- `spawn[state.next_player]`\n", + "- `water[state.next_player]`\n", + "- `metal[state.next_player]`\n", + "\n", + "are used." + ] + }, + { + "cell_type": "code", + "execution_count": 10, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "spawn: ShapedArray(int8[2,2])\n", + "water: ShapedArray(int32[2])\n", + "metal: ShapedArray(int32[2])\n" + ] + } + ], + "source": [ + "print(f\"spawn: {spawn.aval}\")\n", + "print(f\"water: {water.aval}\")\n", + "print(f\"metal: {metal.aval}\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "This is the current game state." + ] + }, + { + "cell_type": "code", + "execution_count": 11, + "metadata": {}, + "outputs": [ + { + "data": { + "image/png": "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", + "text/plain": [ + "<Figure size 640x480 with 1 Axes>" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "img = jux_env.render(state, \"rgb_array\")\n", + "plt.axis('off')\n", + "plt.tight_layout()\n", + "plt.imshow(img)\n", + "plt.show()" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Normal Steps\n", + "\n", + "The normal steps are handled by `JuxEnv.step_late_game()`." + ] + }, + { + "cell_type": "code", + "execution_count": 12, + "metadata": {}, + "outputs": [ + { + "data": { + "image/png": "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", + "text/plain": [ + "<Figure size 640x480 with 1 Axes>" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "from jux.actions import JuxAction\n", + "# prepare actions\n", + "lux_act = next(lux_actions)\n", + "jux_act = JuxAction.from_lux(state, lux_act)\n", + "\n", + "# step\n", + "state, (observations, rewards, dones, infos) = jux_env.step_late_game(state, jux_act)\n", + "\n", + "# render\n", + "img = jux_env.render(state, \"rgb_array\")\n", + "plt.axis('off')\n", + "plt.tight_layout()\n", + "plt.imshow(img)\n", + "plt.show()" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "`step_late_game()` takes an `JuxAction` object as input, which will be elaborated lately. The first time we call `step_late_game()` triggers the jax jit compilation, which is slow, but subsequent calls will be finished on the fly. You may run above cell again to see the difference." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Understanding the `State`\n", + "\n", + "`State` object is a nested `NamedTuple`, with all leaves being `jax.numpy.ndarray`. It has following fields. " + ] + }, + { + "cell_type": "code", + "execution_count": 13, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "('env_cfg',\n", + " 'seed',\n", + " 'rng_state',\n", + " 'env_steps',\n", + " 'board',\n", + " 'units',\n", + " 'unit_id2idx',\n", + " 'n_units',\n", + " 'factories',\n", + " 'factory_id2idx',\n", + " 'n_factories',\n", + " 'teams',\n", + " 'global_id',\n", + " 'place_first')" + ] + }, + "execution_count": 13, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "state._fields" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Board Information\n", + "\n", + "Information about the board, including rubble, ice, ore, and lichen, are stored in `state.board`." + ] + }, + { + "cell_type": "code", + "execution_count": 14, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Board</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">seed</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">factories_per_team</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">GameMap</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">rubble</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">ice</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>bool<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">ore</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>bool<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">symmetry</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>\n", + " <span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">lichen</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">lichen_strains</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">units_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">factory_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">factory_occupancy_map</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">48</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">factory_pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">22</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">])</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mBoard\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mseed\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mfactories_per_team\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mmap\u001b[0m=\u001b[1;35mGameMap\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mrubble\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mice\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mbool\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33more\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mbool\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33msymmetry\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + " \u001b[1m)\u001b[0m,\n", + " \u001b[33mlichen\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mlichen_strains\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33munits_map\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mfactory_map\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mfactory_occupancy_map\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m48\u001b[0m,\u001b[1;36m48\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mfactory_pos\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m22\u001b[0m,\u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "import jux.tree_util\n", + "import rich\n", + "rich.print(jux.tree_util.map_to_aval(state.board))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Factory Information\n", + "\n", + "All information about factories, including their position, cargo, and power, are stored in `state.factories`. `state.n_factories` indicates the number of factories each player has. Because we have just reset the environment, both players have 0 factory. The leaves of `state.factories` have shapes shown as below. " + ] + }, + { + "cell_type": "code", + "execution_count": 15, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "state.n_factories = Array([2, 2], dtype=int8)\n" + ] }, - "nbformat": 4, - "nbformat_minor": 2 + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Factory</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Position</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">]))</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">power</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">cargo</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitCargo</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">stock</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">4</span><span style=\"font-weight: bold\">]))</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mFactory\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mteam_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33munit_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mpos\u001b[0m=\u001b[1;35mPosition\u001b[0m\u001b[1m(\u001b[0m\u001b[33mpos\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m,\u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mpower\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mcargo\u001b[0m=\u001b[1;35mUnitCargo\u001b[0m\u001b[1m(\u001b[0m\u001b[33mstock\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m,\u001b[1;36m4\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "print(f\"{state.n_factories = }\")\n", + "rich.print(jux.tree_util.map_to_aval(state.factories))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "All leaves of `state.factories` have leading dimensions of `(2, MAX_N_FACTORIES)`. Data of player 0 are stored in `state.factories.xxx[0]` and data of player 1 are stored in `state.factories.xxx[1]`.\n", + "\n", + "Assume `state.n_factories` is `[2, 3]`, then player 0 has 2 factories, and player 1 has 3 factories. For player 0, the 2 factories he/she owns have power `state.factories.power[0, 0]` and `state.units.factories[0, 1]`, respectively. All values in `state.factories.power[0, 2:]` are invalid and undefined, because player 0 only has 2 factories. The same rule applies to other fields in `state.factories`. " + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ + "#### Memory layout: Object-frist vs Attribute-first\n", + "The memory layout of `state.factories` is different from the classic object-oriented programming style. Take power as an example, the power of all units are stored in a single array. We call such kind of memory layout **attribute-first**, because it arranges the same attributes of all objects into consecutive memory space. \n", + "\n", + "In classic object-oriented programming, if we have a list of objects, we usually stores all attributes of an object in a single memory block, and maintain a list of such memory block. It usually looks like:\n", + "```python\n", + "[\n", + " Factory(unit_id=0, power=0, ... ),\n", + " Factory( ... ),\n", + " Factory( ... ),\n", + " Factory( ... ),\n", + " ...\n", + "]\n", + "```\n", + "This is called **object-first** memory layout, because it arranges the same object into consecutive memory space.\n", + "\n", + "In **attribute-first** layout, we only have one `Factory` object, but its attributes have a leading batch dimension. It looks like:\n", + "```python\n", + "Factory(\n", + " unit_id=[0, 1, 2, 3, ...],\n", + " power=[0, 0, 0, 0, ...],\n", + " ...\n", + ")\n", + "```\n", + "\n", + "The biggest advantage of attribute-first layout is that it is array-friendly. We can use array operations to manipulate the data. For example, we can implement factory power gain by a simple vector addition. \n", + "```python\n", + "new_power = state.factories.power + state.env_cfg.FACTORY_CHARGE\n", + "```" + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Unit Information\n", + "\n", + "Information about units, including their unit type, position, cargo, and power, are stored in `state.units`. `state.n_units` indicates the number of units each player has. The leaves of `state.units` have shapes shown as below. Similar as factories, units are also stored in attribute-first layout. All leaves of `state.units` have leading dimensions of `(2, MAX_N_UNITS)`. More info about `state.units.action_queue` will be elaborated in next section." + ] + }, + { + "cell_type": "code", + "execution_count": 16, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "state.n_units = Array([2, 2], dtype=int16)\n" + ] + }, + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Unit</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">action_queue</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ActionQueue</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">data</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", + " <span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">front</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">rear</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", + " <span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Position</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">]))</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">cargo</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitCargo</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">stock</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">4</span><span style=\"font-weight: bold\">]))</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">power</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mUnit\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33munit_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33maction_queue\u001b[0m=\u001b[1;35mActionQueue\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mdata\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + " \u001b[1m)\u001b[0m,\n", + " \u001b[33mfront\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrear\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mcount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + " \u001b[1m)\u001b[0m,\n", + " \u001b[33mteam_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33munit_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mpos\u001b[0m=\u001b[1;35mPosition\u001b[0m\u001b[1m(\u001b[0m\u001b[33mpos\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mcargo\u001b[0m=\u001b[1;35mUnitCargo\u001b[0m\u001b[1m(\u001b[0m\u001b[33mstock\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m4\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mpower\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "print(f\"{state.n_units = }\")\n", + "rich.print(jux.tree_util.map_to_aval(state.units))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Understanding Robot Actions\n", + "\n", + "The whole actions system is designed upon three classes `UnitAction`, `ActionQueue` and `JuxActions`.\n", + "1. `UnitAction`: the class representing single robot action.\n", + "2. `ActionQueue`: a bi-directional queue storing a sequence of actions.\n", + "3. `JuxActions`: a NamedTuple containing both actions for factories and robots, mainly used as input to `JuxEnv.step_late_game()`.\n" + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### UnitAction\n", + "\n", + "Actions of robots are represented by `UnitAction` objects. There are five fields in `UnitAction`:\n", + "\n", + "| fields | dtype | description |\n", + "|:--------------- |:----- |:---------------------------------------------------- |\n", + "| `action_type` | int8 | indicates the action type. |\n", + "| `direction` | int8 | used in `MOVE` and `TRANSFER` actions. |\n", + "| `resource_type` | int8 | used in `PICKUP` and `TRANSFER` actions. |\n", + "| `amount` | int16 | used in `PICKUP`, `TRANSFER` and `RECHARGE` actions. |\n", + "| `repeat` | int8 | used in all actions. |\n", + "| `n` | int16 | used in all actions. |" + ] + }, + { + "cell_type": "code", + "execution_count": 17, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Array</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int8</span><span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Array</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">1</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int8</span><span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Array</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int8</span><span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Array</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int16</span><span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Array</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int16</span><span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Array</span><span style=\"font-weight: bold\">(</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">1</span>, <span style=\"color: #808000; text-decoration-color: #808000\">dtype</span>=<span style=\"color: #800080; text-decoration-color: #800080\">int16</span><span style=\"font-weight: bold\">)</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33maction_type\u001b[0m=\u001b[1;35mArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m0\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint8\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mdirection\u001b[0m=\u001b[1;35mArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m1\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint8\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mresource_type\u001b[0m=\u001b[1;35mArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m0\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint8\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mamount\u001b[0m=\u001b[1;35mArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m0\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint16\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrepeat\u001b[0m=\u001b[1;35mArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m0\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint16\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mn\u001b[0m=\u001b[1;35mArray\u001b[0m\u001b[1m(\u001b[0m\u001b[1;36m1\u001b[0m, \u001b[33mdtype\u001b[0m=\u001b[35mint16\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "from jux.map.position import Direction\n", + "from jux.actions import UnitAction\n", + "import rich\n", + "\n", + "move_action = UnitAction.move(Direction.UP, repeat=0)\n", + "rich.print(move_action)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "`action_type` must be one of `UnitActionType`. There are 6 types of actions, numbered from 0 to 5. Note: `DO_NOTHING` (-1) is a special one, designed for internal use only. Users should not use it. " + ] + }, + { + "cell_type": "code", + "execution_count": 18, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "{-1: <UnitActionType.DO_NOTHING: -1>,\n", + " 0: <UnitActionType.MOVE: 0>,\n", + " 1: <UnitActionType.TRANSFER: 1>,\n", + " 2: <UnitActionType.PICKUP: 2>,\n", + " 3: <UnitActionType.DIG: 3>,\n", + " 4: <UnitActionType.SELF_DESTRUCT: 4>,\n", + " 5: <UnitActionType.RECHARGE: 5>}" + ] + }, + "execution_count": 18, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "from jux.actions import UnitActionType\n", + "\n", + "{int(a): a for a in UnitActionType}" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "`direction` must be one of `Direction`. There are 5 directions, numbered from 0 to 4." + ] + }, + { + "cell_type": "code", + "execution_count": 19, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "{0: <Direction.CENTER: 0>,\n", + " 1: <Direction.UP: 1>,\n", + " 2: <Direction.RIGHT: 2>,\n", + " 3: <Direction.DOWN: 3>,\n", + " 4: <Direction.LEFT: 4>}" + ] + }, + "execution_count": 19, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "from jux.map.position import Direction\n", + "\n", + "{int(a): a for a in Direction}" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "`resource_type` must be one of `ResourceType`. There are 4 types of resources, numbered from 0 to 3." + ] + }, + { + "cell_type": "code", + "execution_count": 20, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "{0: <ResourceType.ice: 0>,\n", + " 1: <ResourceType.ore: 1>,\n", + " 2: <ResourceType.water: 2>,\n", + " 3: <ResourceType.metal: 3>,\n", + " 4: <ResourceType.power: 4>}" + ] + }, + "execution_count": 20, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "from jux.unit_cargo import ResourceType\n", + "\n", + "{int(a): a for a in ResourceType}" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Action Queue" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The most complicated part about `units` is its action queue. The action queue for single unit has following structure." + ] + }, + { + "cell_type": "code", + "execution_count": 21, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ActionQueue</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">data</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", + " <span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">front</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">rear</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[])</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mActionQueue\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mdata\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + " \u001b[1m)\u001b[0m,\n", + " \u001b[33mfront\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrear\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mcount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "from jux.actions import ActionQueue\n", + "action_queue = ActionQueue.empty(capacity=state.env_cfg.UNIT_ACTION_QUEUE_SIZE)\n", + "rich.print(jux.tree_util.map_to_aval(action_queue))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Units' actions are stored in `state.units.action_queue`, which is a bi-directional queue implemented in jax. `ActionQueue` has four fields: `data`, `count`, `front`, and `rear`. \n", + "1. `data` is a `UnitAction` object, containing `UNIT_ACTION_QUEUE_SIZE` actions in attribute-first layout, so its attributes have a leading dimension of `UNIT_ACTION_QUEUE_SIZE`.\n", + "2. `count` indicates the number of actions in the queue.\n", + "3. `front` is the index of the first action in the queue. \n", + "4. `rear` is the index of the first empty slot in the queue, which is also the position for next push back. `(rear - 1) % capacity` is the index of the last action in the queue." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Above is the structure of action queue for a single unit. Now, let's have a look at `state.units.action_queue`, which contains the action queue for all units. The main difference is that all leaves are added with two leading dimensions of `(2, MAX_N_UNITS)`. Again, this is because we use attribute-first layout." + ] + }, + { + "cell_type": "code", + "execution_count": 22, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ActionQueue</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">data</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", + " <span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">front</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">rear</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mActionQueue\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mdata\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + " \u001b[1m)\u001b[0m,\n", + " \u001b[33mfront\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrear\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mcount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "rich.print(jux.tree_util.map_to_aval(state.units.action_queue))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "`ActionQueue` provides several useful methods, such as `push_back()`, `push_front()`, `pop()` and `peek()`. However, all these methods can only be applied to the queues of a single unit. `state.units.action_queue` has two batch dimension, one for player, one for units, so we need to `vmap` these methods two times. The following code shows how to peek the next actions of all units. The returned `act` contains the next actions of all units, again, in attribute-first layout." + ] + }, + { + "cell_type": "code", + "execution_count": 23, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "from jux.actions import ActionQueue\n", + "import jax\n", + "peek_vmap_vmap = jax.vmap(jax.vmap(ActionQueue.peek))\n", + "act = peek_vmap_vmap(state.units.action_queue)\n", + "rich.print(jux.tree_util.map_to_aval(act))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### JuxAction\n", + "\n", + "`JuxAction` is a NamedTuple containing both actions for factories and robots, mainly used as input to `JuxEnv.step_late_game()`. It has four fields: `factory_actions`, `unit_action_queue`, `unit_action_queue_count` and `unit_action_queue_update`.\n", + "1. `factory_actions`: the actions for each factories.\n", + "2. `unit_action_queue_update`: a boolean array indicating whether a unit's action queue should be updated or not in this turn.\n", + "3. `unit_action_queue`: What actions will be in the new action queue, If update.\n", + "4. `unit_action_queue_count`: How many actions will there be in the new action queue, if update." + ] + }, + { + "cell_type": "code", + "execution_count": 24, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">JuxAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">factory_action</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", + " <span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue_count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue_update</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>bool<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mJuxAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mfactory_action\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33munit_action_queue\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + " \u001b[1m)\u001b[0m,\n", + " \u001b[33munit_action_queue_count\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33munit_action_queue_update\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mbool\u001b[1m[\u001b[0m\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "jux_act = JuxAction.from_lux(state, lux_act)\n", + "rich.print(jux.tree_util.map_to_aval(jux_act))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "There are four types of actions for factories: `DO_NOTHING`, `BUILD_LIGHT`, `BUILD_HEAVY` and `WATER`, numbered from -1 to 2." + ] + }, + { + "cell_type": "code", + "execution_count": 25, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "{-1: <FactoryAction.DO_NOTHING: -1>,\n", + " 0: <FactoryAction.BUILD_LIGHT: 0>,\n", + " 1: <FactoryAction.BUILD_HEAVY: 1>,\n", + " 2: <FactoryAction.WATER: 2>}" + ] + }, + "execution_count": 25, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "from jux.actions import FactoryAction\n", + "\n", + "{int(a): a for a in FactoryAction}" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Run a Batch of Environments\n", + "Running a single environment cannot take full advantage of the power of modern GPU. This section will show you how to run a batch of environments at once. We first create a `JuxEnvBatch` object." + ] + }, + { + "cell_type": "code", + "execution_count": 55, + "metadata": {}, + "outputs": [], + "source": [ + "from jux.env import JuxEnvBatch\n", + "\n", + "jux_env_batch = JuxEnvBatch(buf_cfg=JuxBufferConfig(MAX_N_UNITS=200))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Then, reset the environment to get initial states. Instead of passing in a single seed, we pass in a batch of seeds. The batch size is determined by the size of the seed array." + ] + }, + { + "cell_type": "code", + "execution_count": 60, + "metadata": {}, + "outputs": [], + "source": [ + "import jax.numpy as jnp\n", + "\n", + "batch_size = 10\n", + "seeds = jnp.arange(batch_size)\n", + "\n", + "states = jux_env_batch.reset(seeds)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Note that the default env rendering function is CPU based and only works for non batched environments. In order to render the environments, we recommend you construct the images you need yourself when needed, especially since generating evaluation videos of 1000s of parallel environments is slow due to I/O of video creationg becoming a bottleneck. Regardless, visualizations are helpful and an example showing the distribution of resources on each batched environment is shown below." + ] + }, + { + "cell_type": "code", + "execution_count": 107, + "metadata": {}, + "outputs": [ + { + "data": { + "image/png": "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3iyjR4+WV199VZo1axZJA8aPH58WrlhbWyvt27d32QosIV9a2Bhiyd6SGe6I0h6UglmkKpbQ5ahCpbXMV4jl/rFMtn6PKgQxjHwPj3e+oJ+z31q9JLB+DYuUMRPf0GEMUfcZz1FkGaoPn7X0oxZ+jDaGK1uyRYiIzGv9aeofSpYfX8mehm9467BhwwLLoKwPy0Qp89H8yPLuwPahrA3PffTRR519C6QPySe7aRCWbEH5gKHViPbuaNKkibODJKVRZAUqps+K2N8z+/bty1mmefPmgTaye/futH/v2rXLdP0klZWVOcto92QJw8dn2LRpU2fjs8d30/79+wOPD7ioq7MLlVWvUFLWKPj6179e300oGvU9zz744IPORgkHvqNwDdunJuWbZy8Jlrnng68sxjLHWealQmTlQzkS9jVm0ssEM+tpaPejZdceO3assy0ZQwvRFzfffLOz8R1nvfbkyZPzvnahsu/Vh89auPyvqZ/ly6pScwv6ypQpU3LWY10/htnOwgJK+bStX7TtUrSM6DNmzAjVJm3LG20dgPbs2bMDy2tgGZRp4rYVUfmsJgPNx2e79Rzk7N+umhd4LhLV2tirJzZs2CAff/yxnH766dK4cWNp3LixrF27ViZPniyNGzeWqqoq2bdvn2zbti3tvJqaGjUFekVFhbRu3Trtf4SQaKDPEhIv6LOExAv6LCHxgj5LSOnhFSl1/vnny+9///u0Y9dee62ccMIJctttt0n79u2lSZMmsmbNGundu7eIiGzcuFE2bdokXbt2DaqSEFJA6LOExAv6LCHxgj5LSLygzxJSenh9lGrVqpWcfPLJacdatGghhx9+uDs+dOhQGTdunLRt21Zat24to0aNkq5du3pnBGrUqNFB4V6YWUCTkYSRvGSGsWG4syZzsUjQtGugJEVrtybxwzZMnTrV2TfeeGNgnRh+rPUX9m82MExPa5MlVDUq+d47v1yW81ooKdJkYXg8M9xRez5an40YMcLZ+UpQowhRLqbPJsFng1kitKwi2jPQjluvbSFTspvEkikwKrQMI1FeS/O1efPmBRVXxyy+a/B5Iigluf3223PWifz4xz929n333RdYplBSPpRJ+L6/opQV1IfPhkGT6SH47Fu0aJH2N1/5XiFkKwtfWu/sIZed62yc6w4//HBnf/ppSiacbd4g0RBGyl4IOVMm9eGz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", + "text/plain": [ + "<Figure size 1200x500 with 5 Axes>" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "import cv2\n", + "import numpy as np\n", + "# create images of each episode from board state data in a vectorized fashion. These will generate colors close to the real visualizer, \n", + "# serves as good starting point for building your own visualizations\n", + "# it's a bit more complex to further generate some other details in the game for visualization e.g. units, text etc., in addition to trying to generate \n", + "# 1000s of videos of episodes at a time, making it no faster than simply just evaluating on CPU (I/O of creating videos becomes a bottleneck)\n", + "# we leave that to you the user to decide what to do with visualization with some useful vectorized code below\n", + "\n", + "rubble = states.board.map.rubble[i]\n", + "imgs = np.zeros((batch_size, 64, 64, 3))\n", + "for c in [0, 1, 2]:\n", + " imgs[:, :, :, c] = ((np.array(states.board.map.rubble) / 100)*(1-0.411) + 0.411)\n", + "# color in ice and ore\n", + "imgs[states.board.map.ice == True] = np.array([72, 219, 251]) / 255.0\n", + "imgs[states.board.map.ore == True] = np.array([44, 62, 80]) / 255.0\n", + "imgs[states.board.factory_occupancy_map\n", + "\n", + "# for sake of space, we will just plot the first 5 environments\n", + "fig,axs = plt.subplots(1, 5, figsize=(12,5))\n", + "axs = axs.flatten()\n", + "for i in range(len(axs)):\n", + " ax = axs[i] \n", + " ax.imshow(imgs[i])\n", + "plt.tight_layout()" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "According to our attribute-first memory layout, states is still a `State` object, but all leaves are added with a leading dimension of `batch_size` as shown below. E.g. `unit_id` transforms from shape `(2, 11)` to `(batch_size, 2, 11)`" + ] + }, + { + "cell_type": "code", + "execution_count": 110, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Factory</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">team_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_id</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">Position</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">pos</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span><span style=\"font-weight: bold\">]))</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">power</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">cargo</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitCargo</span><span style=\"font-weight: bold\">(</span><span style=\"color: #808000; text-decoration-color: #808000\">stock</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int32<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">4</span><span style=\"font-weight: bold\">]))</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mFactory\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mteam_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33munit_id\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mpos\u001b[0m=\u001b[1;35mPosition\u001b[0m\u001b[1m(\u001b[0m\u001b[33mpos\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m,\u001b[1;36m2\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mpower\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mcargo\u001b[0m=\u001b[1;35mUnitCargo\u001b[0m\u001b[1m(\u001b[0m\u001b[33mstock\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint32\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m,\u001b[1;36m4\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "rich.print(jux.tree_util.map_to_aval(states.factories))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "The states returned by `JuxEnvBatch.reset()` shares the same environmental config and jux buffer config. In addition, they are also guaranteed to have the same `states.board.factories_per_team`, so they take the same number of turns to place factories." + ] + }, + { + "cell_type": "code", + "execution_count": 116, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "Array([6, 6, 6, 6, 6, 6, 6, 6, 6, 6], dtype=int8)" + ] + }, + "execution_count": 116, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "states.board.factories_per_team" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Similarly, other arguments of `JuxEnvBatch.step_*()` are also batched. All arrays must have a leading dimension of `batch_size`." + ] + }, + { + "cell_type": "code", + "execution_count": 112, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "bid: ShapedArray(int32[10,2])\n", + "faction: ShapedArray(int8[10,2])\n" + ] + } + ], + "source": [ + "# bid step\n", + "bid = jnp.zeros((batch_size, 2), dtype=jnp.int32)\n", + "faction = jnp.zeros((batch_size, 2), dtype=jnp.int8)\n", + "\n", + "states, (observations, rewards, dones, infos) = jux_env_batch.step_bid(states, bid, faction)\n", + "\n", + "print(f\"bid: {bid.aval}\")\n", + "print(f\"faction: {faction.aval}\")" + ] + }, + { + "cell_type": "code", + "execution_count": 113, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "spawn: ShapedArray(int8[10,2,2])\n", + "water: ShapedArray(int32[10,2])\n", + "metal: ShapedArray(int32[10,2])\n" + ] + } + ], + "source": [ + "key = jax.random.PRNGKey(0)\n", + "water = jnp.ones((batch_size, 2), dtype=jnp.int32) * 150\n", + "metal = jnp.ones((batch_size, 2), dtype=jnp.int32) * 150\n", + "\n", + "# factory placement step\n", + "factories_per_team = states.board.factories_per_team[0]\n", + "for i in range(factories_per_team * 2):\n", + " # random spawn position\n", + " key, subkey = jax.random.split(key)\n", + " spawn = jax.random.randint(subkey, (batch_size, 2, 2), 0, jux_env_batch.env_cfg.map_size, dtype=jnp.int8)\n", + " states, (observations, rewards, dones, infos) = jux_env_batch.step_factory_placement(states, spawn, water, metal)\n", + "\n", + "print(f\"spawn: {spawn.aval}\")\n", + "print(f\"water: {water.aval}\")\n", + "print(f\"metal: {metal.aval}\")" + ] + }, + { + "cell_type": "code", + "execution_count": 114, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">JuxAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">factory_action</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">11</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">UnitAction</span><span style=\"font-weight: bold\">(</span>\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">action_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">direction</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">resource_type</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">amount</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">repeat</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">n</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int16<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">20</span><span style=\"font-weight: bold\">])</span>\n", + " <span style=\"font-weight: bold\">)</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue_count</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>int8<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>,\n", + " <span style=\"color: #808000; text-decoration-color: #808000\">unit_action_queue_update</span>=<span style=\"color: #800080; text-decoration-color: #800080; font-weight: bold\">ShapedArray</span><span style=\"font-weight: bold\">(</span>bool<span style=\"font-weight: bold\">[</span><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">10</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">2</span>,<span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">200</span><span style=\"font-weight: bold\">])</span>\n", + "<span style=\"font-weight: bold\">)</span>\n", + "</pre>\n" + ], + "text/plain": [ + "\u001b[1;35mJuxAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33mfactory_action\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m11\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33munit_action_queue\u001b[0m=\u001b[1;35mUnitAction\u001b[0m\u001b[1m(\u001b[0m\n", + " \u001b[33maction_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mdirection\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mresource_type\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mamount\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mrepeat\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33mn\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint16\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m,\u001b[1;36m20\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + " \u001b[1m)\u001b[0m,\n", + " \u001b[33munit_action_queue_count\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mint8\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m,\n", + " \u001b[33munit_action_queue_update\u001b[0m=\u001b[1;35mShapedArray\u001b[0m\u001b[1m(\u001b[0mbool\u001b[1m[\u001b[0m\u001b[1;36m10\u001b[0m,\u001b[1;36m2\u001b[0m,\u001b[1;36m200\u001b[0m\u001b[1m]\u001b[0m\u001b[1m)\u001b[0m\n", + "\u001b[1m)\u001b[0m\n" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "# a dummy action\n", + "jux_action = JuxAction.empty(\n", + " jux_env_batch.env_cfg, \n", + " jux_env_batch.buf_cfg\n", + ")\n", + "jux_action = jax.tree_map(lambda x: x[None].repeat(batch_size, axis=0), jux_action)\n", + "rich.print(jux.tree_util.map_to_aval(jux_action))\n", + "\n", + "# late game step\n", + "states, (observations, rewards, dones, infos) = jux_env_batch.step_late_game(states, jux_action)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Convert between PyTorch and JAX" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Since PyTorch is widely used in the community, we provide a simple way to convert between PyTorch and JAX. Following code shows how to convert observations (state) from JAX array to PyTorch tensor, so it can be feed into PyTorch models." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "scrolled": true + }, + "outputs": [], + "source": [ + "# remove env_cfg to reduce output size\n", + "torch_state = states._replace(env_cfg=None).to_torch()\n", + "rich.print(jax.tree_map(lambda x: x.shape, torch_state))" + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ + "You can also convert between PyTorch tensors and JAX arrays by `jux.torch.from_torch` and `jux.torch.to_torch`. Typical usage is to convert actions generated by PyTorch models to JAX arrays, so they can be feed into `JuxEnv.step_*()`." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "import torch\n", + "import jux.torch\n", + "\n", + "jux.torch.from_torch(torch.arange(10))" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "jux.torch.to_torch(jnp.arange(10))" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "There is also a utility function `JuxAction.from_torch()` for build a valid `JuxAction` object from PyTorch tensors." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.0" + }, + "vscode": { + "interpreter": { + "hash": "d4d1e4263499bec80672ea0156c357c1ee493ec2b1c70f0acce89fc37c4a6abe" + } + } + }, + "nbformat": 4, + "nbformat_minor": 4 }
Merge branch 'main' into dev
2023-09-27T03:31:29
0.0
[]
[]
nephila/djangocms-apphook-setup
nephila__djangocms-apphook-setup-38
622bd2d76f49e035c832350c07f4cf986c186bd2
diff --git a/changes/37.feature b/changes/37.feature new file mode 100644 index 0000000..ac23805 --- /dev/null +++ b/changes/37.feature @@ -0,0 +1,1 @@ +Switch to Coveralls Github action
Switch to Coveralls Github action ## Description Switch to Coveralls Github action
2023-11-09T14:46:08
0.0
[]
[]
wheerd/multiset
wheerd__multiset-138
5ae009fde2a59673e595a2785523bac55e46bd06
diff --git a/multiset/__init__.py b/multiset/__init__.py index f2d4656..49de200 100644 --- a/multiset/__init__.py +++ b/multiset/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """An implementation of a multiset.""" - -import sys +from typing import (Generic, TypeVar, Hashable, Mapping as MappingType, Union, Optional, Iterable as IterableType, + Type, ItemsView, KeysView, ValuesView, MutableMapping as MutableMappingType, AbstractSet as SetType) from collections import defaultdict from collections.abc import Iterable, Mapping, MutableMapping, Set, Sized, Container from itertools import chain, repeat, starmap @@ -13,8 +13,12 @@ __all__ = ['BaseMultiset', 'Multiset', 'FrozenMultiset'] +_TElement = TypeVar('_TElement', bound=Hashable) +_OtherType = Union[IterableType[_TElement], MappingType[_TElement, int]] +_Self = TypeVar('_Self', bound='BaseMultiset') + -class BaseMultiset(object): +class BaseMultiset(MappingType[_TElement, int], Generic[_TElement]): """A multiset implementation. A multiset is similar to the builtin :class:`set`, but elements can occur multiple times in the multiset. @@ -38,7 +42,7 @@ class BaseMultiset(object): __slots__ = ('_elements', '_total') - def __init__(self, iterable=None): + def __init__(self, iterable: Optional[_OtherType] = None): r"""Create a new, empty Multiset object. And if given, initialize with elements from input iterable. @@ -95,21 +99,21 @@ def __new__(cls, iterable=None): raise TypeError("Cannot instantiate BaseMultiset directly, use either Multiset or FrozenMultiset.") return super(BaseMultiset, cls).__new__(cls) - def __contains__(self, element): + def __contains__(self, element: object) -> bool: return element in self._elements - def __getitem__(self, element): + def __getitem__(self, element: _TElement) -> int: """The multiplicity of an element or zero if it is not in the multiset.""" return self._elements.get(element, 0) - def __str__(self): + def __str__(self) -> str: return '{%s}' % ', '.join(map(str, self.__iter__())) - def __repr__(self): + def __repr__(self) -> str: items = ', '.join('%r: %r' % item for item in self._elements.items()) return '%s({%s})' % (self.__class__.__name__, items) - def __len__(self): + def __len__(self) -> int: """Returns the total number of elements in the multiset. Note that this is equivalent to the sum of the multiplicities: @@ -130,13 +134,13 @@ def __len__(self): """ return self._total - def __bool__(self): + def __bool__(self) -> bool: return self._total > 0 - def __iter__(self): + def __iter__(self) -> IterableType[_TElement]: return chain.from_iterable(starmap(repeat, self._elements.items())) - def isdisjoint(self, other): + def isdisjoint(self, other: _OtherType) -> bool: r"""Return True if the set has no elements in common with other. Sets are disjoint iff their intersection is the empty set. @@ -157,7 +161,7 @@ def isdisjoint(self, other): other = self._as_multiset(other) return all(element not in other for element in self._elements.keys()) - def difference(self, *others): + def difference(self: _Self, *others: _OtherType) -> _Self: r"""Return a new multiset with all elements from the others removed. >>> ms = Multiset('aab') @@ -198,19 +202,19 @@ def difference(self, *others): result._total = _total return result - def __sub__(self, other): + def __sub__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): return NotImplemented return self.difference(other) - def __rsub__(self, other): + def __rsub__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if not isinstance(other, (Set, BaseMultiset)): return NotImplemented return self._as_multiset(other).difference(self) - def union(self, *others): + def union(self: _Self, *others: _OtherType) -> _Self: r"""Return a new multiset with all elements from the multiset and the others with maximal multiplicities. >>> ms = Multiset('aab') @@ -246,7 +250,7 @@ def union(self, *others): result._total = _total return result - def __or__(self, other): + def __or__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): @@ -255,7 +259,7 @@ def __or__(self, other): __ror__ = __or__ - def combine(self, *others): + def combine(self: _Self, *others: _OtherType) -> _Self: r"""Return a new multiset with all elements from the multiset and the others with their multiplicities summed up. >>> ms = Multiset('aab') @@ -295,7 +299,7 @@ def combine(self, *others): result._total = _total return result - def __add__(self, other): + def __add__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): @@ -304,7 +308,7 @@ def __add__(self, other): __radd__ = __add__ - def intersection(self, *others): + def intersection(self: _Self, *others: _OtherType) -> _Self: r"""Return a new multiset with elements common to the multiset and all others. >>> ms = Multiset('aab') @@ -344,7 +348,7 @@ def intersection(self, *others): result._total = _total return result - def __and__(self, other): + def __and__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): @@ -353,7 +357,7 @@ def __and__(self, other): __rand__ = __and__ - def symmetric_difference(self, other): + def symmetric_difference(self: _Self, other: _OtherType) -> _Self: r"""Return a new set with elements in either the set or other but not both. >>> ms = Multiset('aab') @@ -395,7 +399,7 @@ def symmetric_difference(self, other): result._total = _total return result - def __xor__(self, other): + def __xor__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): @@ -404,7 +408,7 @@ def __xor__(self, other): __rxor__ = __xor__ - def times(self, factor): + def times(self: _Self, factor: int) -> _Self: """Return a new set with each element's multiplicity multiplied with the given scalar factor. >>> ms = Multiset('aab') @@ -433,14 +437,14 @@ def times(self, factor): result._total *= factor return result - def __mul__(self, factor): + def __mul__(self: _Self, factor: int) -> _Self: if not isinstance(factor, int): return NotImplemented return self.times(factor) __rmul__ = __mul__ - def _issubset(self, other, strict): + def _issubset(self, other: _OtherType, strict: bool) -> bool: other = self._as_multiset(other) self_len = self._total other_len = len(other) @@ -450,7 +454,7 @@ def _issubset(self, other, strict): return False return all(multiplicity <= other[element] for element, multiplicity in self.items()) - def issubset(self, other): + def issubset(self, other: _OtherType) -> bool: """Return True iff this set is a subset of the other. >>> Multiset('ab').issubset('aabc') @@ -477,21 +481,21 @@ def issubset(self, other): """ return self._issubset(other, False) - def __le__(self, other): + def __le__(self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> bool: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): return NotImplemented return self._issubset(other, False) - def __lt__(self, other): + def __lt__(self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> bool: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): return NotImplemented return self._issubset(other, True) - def _issuperset(self, other, strict): + def _issuperset(self, other: _OtherType, strict: bool) -> bool: other = self._as_multiset(other) other_len = len(other) if len(self) < other_len: @@ -503,7 +507,7 @@ def _issuperset(self, other, strict): return False return True - def issuperset(self, other): + def issuperset(self, other: _OtherType) -> bool: """Return True iff this multiset is a superset of the other. >>> Multiset('aabc').issuperset('ab') @@ -530,21 +534,21 @@ def issuperset(self, other): """ return self._issuperset(other, False) - def __ge__(self, other): + def __ge__(self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> bool: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): return NotImplemented return self._issuperset(other, False) - def __gt__(self, other): + def __gt__(self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> bool: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): return NotImplemented return self._issuperset(other, True) - def __eq__(self, other): + def __eq__(self, other: object) -> bool: if isinstance(other, BaseMultiset): return self._total == other._total and self._elements == other._elements if isinstance(other, (set, frozenset)): @@ -555,7 +559,7 @@ def __eq__(self, other): return False return self._issubset(other, False) - def __ne__(self, other): + def __ne__(self, other: object) -> bool: if isinstance(other, BaseMultiset): return self._total != other._total or self._elements != other._elements if isinstance(other, (set, frozenset)): @@ -566,7 +570,7 @@ def __ne__(self, other): return True return not self._issubset(other, False) - def get(self, element, default): + def get(self, element: _TElement, default: int) -> int: """Return the multiplicity for *element* if it is in the multiset, else *default*. Makes the *default* argument of the original :meth:`dict.get` non-optional. @@ -581,7 +585,7 @@ def get(self, element, default): return self._elements.get(element, default) @classmethod - def from_elements(cls, elements, multiplicity): + def from_elements(cls: Type[_Self], elements: IterableType[_TElement], multiplicity: int) -> _Self: """Create a new multiset with the given *elements* and each multiplicity set to *multiplicity*. Uses :meth:`dict.fromkeys` internally. @@ -595,19 +599,19 @@ def from_elements(cls, elements, multiplicity): """ return cls(dict.fromkeys(elements, multiplicity)) - def copy(self): + def copy(self: _Self) -> _Self: """Return a shallow copy of the multiset.""" return self.__class__(self) __copy__ = copy - def items(self): + def items(self) -> ItemsView[_TElement, int]: return self._elements.items() - def distinct_elements(self): + def distinct_elements(self) -> KeysView[_TElement]: return self._elements.keys() - def multiplicities(self): + def multiplicities(self) -> ValuesView[int]: return self._elements.values() values = multiplicities @@ -648,11 +652,12 @@ def __getstate__(self): def __setstate__(self, state): self._total, self._elements = state -class Multiset(BaseMultiset): + +class Multiset(BaseMultiset[_TElement], MutableMappingType[_TElement, int], Generic[_TElement]): """The mutable multiset variant.""" __slots__ = () - def __setitem__(self, element, multiplicity): + def __setitem__(self, element: _TElement, multiplicity: int): """Set the element's multiplicity. This will remove the element if the multiplicity is less than or equal to zero. @@ -672,7 +677,7 @@ def __setitem__(self, element, multiplicity): _elements[element] = multiplicity self._total += multiplicity - def __delitem__(self, element): + def __delitem__(self, element: _TElement): _elements = self._elements if element in _elements: self._total -= _elements[element] @@ -680,7 +685,7 @@ def __delitem__(self, element): else: raise KeyError("Could not delete {!r} from the multiset, because it is not in it.".format(element)) - def update(self, *others, **kwargs): + def update(self, *others: _OtherType, **kwargs): r"""Like :meth:`dict.update` but add multiplicities instead of replacing them. >>> ms = Multiset('aab') @@ -720,7 +725,7 @@ def update(self, *others, **kwargs): _total += multiplicity self._total = _total - def union_update(self, *others): + def union_update(self, *others: _OtherType): r"""Update the multiset, adding elements from all others using the maximum multiplicity. >>> ms = Multiset('aab') @@ -753,7 +758,7 @@ def union_update(self, *others): _total += multiplicity - old_multiplicity self._total = _total - def __ior__(self, other): + def __ior__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): @@ -761,7 +766,7 @@ def __ior__(self, other): self.union_update(other) return self - def intersection_update(self, *others): + def intersection_update(self, *others: _OtherType): r"""Update the multiset, keeping only elements found in it and all others. >>> ms = Multiset('aab') @@ -790,7 +795,7 @@ def intersection_update(self, *others): if multiplicity < current_count: self[element] = multiplicity - def __iand__(self, other): + def __iand__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): @@ -798,7 +803,7 @@ def __iand__(self, other): self.intersection_update(other) return self - def difference_update(self, *others): + def difference_update(self, *others: _OtherType): r"""Remove all elements contained the others from this multiset. >>> ms = Multiset('aab') @@ -825,7 +830,7 @@ def difference_update(self, *others): for element, multiplicity in other.items(): self.discard(element, multiplicity) - def __isub__(self, other): + def __isub__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): @@ -833,7 +838,7 @@ def __isub__(self, other): self.difference_update(other) return self - def symmetric_difference_update(self, other): + def symmetric_difference_update(self, other: _OtherType): r"""Update the multiset to contain only elements in either this multiset or the other but not both. >>> ms = Multiset('aab') @@ -863,7 +868,7 @@ def symmetric_difference_update(self, other): other_count = other[element] self[element] = (multiplicity - other_count if multiplicity > other_count else other_count - multiplicity) - def __ixor__(self, other): + def __ixor__(self: _Self, other: Union[SetType[_TElement], 'BaseMultiset[_TElement]']) -> _Self: if isinstance(other, (BaseMultiset, set, frozenset)): pass elif not isinstance(other, Set): @@ -871,7 +876,7 @@ def __ixor__(self, other): self.symmetric_difference_update(other) return self - def times_update(self, factor): + def times_update(self, factor: int): """Update each this multiset by multiplying each element's multiplicity with the given scalar factor. >>> ms = Multiset('aab') @@ -902,13 +907,13 @@ def times_update(self, factor): _elements[element] *= factor self._total *= factor - def __imul__(self, factor): + def __imul__(self: _Self, factor: int) -> _Self: if not isinstance(factor, int): raise TypeError("factor must be an integer.") self.times_update(factor) return self - def add(self, element, multiplicity=1): + def add(self, element: _TElement, multiplicity: int = 1): """Adds an element to the multiset. >>> ms = Multiset() @@ -935,7 +940,7 @@ def add(self, element, multiplicity=1): self._elements[element] += multiplicity self._total += multiplicity - def remove(self, element, multiplicity=None): + def remove(self, element: _TElement, multiplicity: Optional[int] = None) -> int: """Removes an element from the multiset. If no multiplicity is specified, the element is completely removed from the multiset: @@ -990,7 +995,7 @@ def remove(self, element, multiplicity=None): self._total -= multiplicity return old_multiplicity - def discard(self, element, multiplicity=None): + def discard(self, element: _TElement, multiplicity: Optional[int] = None) -> int: """Removes the `element` from the multiset. If multiplicity is ``None``, all occurrences of the element are removed: @@ -1051,7 +1056,7 @@ def discard(self, element, multiplicity=None): else: return 0 - def pop(self, element, default): + def pop(self, element: _TElement, default: int) -> int: """If *element* is in the multiset, remove it and return its multiplicity, else return *default*. Makes the *default* argument of the original :meth:`dict.pop` non-optional. @@ -1064,11 +1069,11 @@ def pop(self, element, default): The multiplicity for *element* if it is in the multiset, else *default*. """ rm_size = self._elements.get(element) - if rm_size != None: + if rm_size is not None: self._total -= rm_size return self._elements.pop(element, default) - def setdefault(self, element, default): + def setdefault(self, element: _TElement, default: int) -> int: """If *element* is in the multiset, return its multiplicity. Else add it with a multiplicity of *default* and return *default*. @@ -1083,7 +1088,7 @@ def setdefault(self, element, default): """ mul = self._elements.get(element) - if mul == None: + if mul is None: if default < 1: raise ValueError("Multiplicity must be positive") self._total += default @@ -1095,13 +1100,14 @@ def clear(self): self._total = 0 -class FrozenMultiset(BaseMultiset): +class FrozenMultiset(BaseMultiset[_TElement], Generic[_TElement]): """The frozen multiset variant that is immutable and hashable.""" __slots__ = () def __hash__(self): return hash(frozenset(self._elements.items())) + Mapping.register(BaseMultiset) # type: ignore MutableMapping.register(Multiset) # type: ignore diff --git a/multiset/__init__.pyi b/multiset/__init__.pyi index 4c0429e..3eed389 100644 --- a/multiset/__init__.pyi +++ b/multiset/__init__.pyi @@ -9,8 +9,9 @@ _TElement = TypeVar('_TElement', bound=Hashable) _OtherType = Union[Iterable[_TElement], Mapping[_TElement, int]] _Self = TypeVar('_Self', bound='BaseMultiset') + class BaseMultiset(Mapping[_TElement, int], Generic[_TElement]): - def __init__(self, iterable: Optional[_OtherType]=None) -> None: ... + def __init__(self, iterable: Optional[_OtherType] = None) -> None: ... def __new__(cls, iterable=None): ... def __contains__(self, element: object) -> bool: ... def __getitem__(self, element: _TElement) -> int: ... @@ -78,7 +79,7 @@ class BaseMultiset(Mapping[_TElement, int], Generic[_TElement]): def __gt__(self, other: 'BaseMultiset[_TElement]') -> bool: ... def __eq__(self, other: object): ... def __ne__(self, other: object): ... - def get(self, element: _TElement, default: int) -> int: ... # type: ignore + def get(self, element: _TElement, default: int) -> int: ... # type: ignore @classmethod def from_elements(cls: Type[_Self], elements: Iterable[_TElement], multiplicity: int) -> _Self: ... def copy(self: _Self) -> _Self: ... @@ -87,6 +88,7 @@ class BaseMultiset(Mapping[_TElement, int], Generic[_TElement]): def distinct_elements(self) -> KeysView[_TElement]: ... def multiplicities(self) -> ValuesView[int]: ... + class Multiset(BaseMultiset[_TElement], MutableMapping[_TElement, int], Generic[_TElement]): def __setitem__(self, element: _TElement, multiplicity: int) -> None: ... def __delitem__(self, element: _TElement) -> None: ... @@ -120,12 +122,13 @@ class Multiset(BaseMultiset[_TElement], MutableMapping[_TElement, int], Generic[ def __ixor__(self: _Self, other: 'BaseMultiset[_TElement]') -> _Self: ... def times_update(self, factor: int) -> None: ... def __imul__(self: _Self, factor: int) -> _Self: ... - def add(self, element: _TElement, multiplicity: int=1) -> None: ... - def remove(self, element: _TElement, multiplicity: Optional[int]=None) -> int: ... - def discard(self, element: _TElement, multiplicity: Optional[int]=None) -> int: ... - def pop(self, element: _TElement, default: int) -> int: ... # type: ignore - def setdefault(self, element: _TElement, default: int) -> int: ... # type: ignore + def add(self, element: _TElement, multiplicity: int = 1) -> None: ... + def remove(self, element: _TElement, multiplicity: Optional[int] = None) -> int: ... + def discard(self, element: _TElement, multiplicity: Optional[int] = None) -> int: ... + def pop(self, element: _TElement, default: int) -> int: ... # type: ignore + def setdefault(self, element: _TElement, default: int) -> int: ... # type: ignore def clear(self) -> None: ... + class FrozenMultiset(BaseMultiset[_TElement], Generic[_TElement]): def __hash__(self): ... diff --git a/pyproject.toml b/pyproject.toml index 743a773..996764d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools >= 42", + "setuptools>=42", "setuptools_scm[toml]>=3.4", "wheel" ]
TypeError: type 'FrozenMultiset' is not subscriptable I'd like to be able to write type hints with generic typing in the form `FrozenMultiset[T]` but the interpreter complaints, Could you extend `Generic[T]` from the `typing` package and then write typeing for the methods?
I can open a PR if you prefer Thank you for the issue, I would be happy to accept a PR for this. At the moment I don't have the capacity to work on it myself :)
2024-07-18T08:49:06
0.0
[]
[]
biocore/improved-octo-waddle
biocore__improved-octo-waddle-39
42bb15e71d7839dd75629d61232f2268577046fc
diff --git a/bp/_bp.pyx b/bp/_bp.pyx index 19aa0b7..10ebec6 100644 --- a/bp/_bp.pyx +++ b/bp/_bp.pyx @@ -224,9 +224,7 @@ cdef class BP: self._edges = np.full(self.B.size, 0, dtype=INT32) self._edge_lookup = None - # construct a rank index. These operations are performed frequently, - # and easy to cache at a relatively minor memory expense - #TODO: leverage rmm tree, and calculate rank on the fly + # precursor for select index cache _r_index_0 = np.cumsum((1 - B), dtype=SIZE) _r_index_1 = np.cumsum(B, dtype=SIZE) @@ -784,7 +782,7 @@ cdef class BP: """ cdef: SIZE_t i, n = len(tips) - SIZE_t p, t + SIZE_t p, t, count = 0 BIT_ARRAY* mask BP new_bp @@ -797,6 +795,7 @@ cdef class BP: if self.isleaf(i): if self.name(i) in tips: # gil is required for set operation with nogil: + count += 1 bit_array_set_bit(mask, i) bit_array_set_bit(mask, i + 1) @@ -807,6 +806,10 @@ cdef class BP: p = self.parent(p) + if count == 0: + bit_array_free(mask) + raise ValueError("No requested tips found") + new_bp = self._mask_from_self(mask, self._lengths) bit_array_free(mask) return new_bp @@ -825,6 +828,7 @@ cdef class BP: n = bit_array_length(mask) mask_sum = bit_array_num_bits_set(mask) + k = 0 lengths_ptr = &lengths[0] diff --git a/bp/_io.pyx b/bp/_io.pyx index a90d1cc..d6c2746 100644 --- a/bp/_io.pyx +++ b/bp/_io.pyx @@ -142,6 +142,12 @@ cpdef parse_newick(unicode data): np.ndarray[np.double_t, ndim=1] lengths np.ndarray[np.int32_t, ndim=1] edges + if data.count(',') == 0: + raise ValueError("Only trees with more than 1 node supported") + + if not data.endswith(';'): + raise ValueError("Newick does not appear terminated with a semicolon") + datalen = len(data) topology = _newick_to_bp(data)
raise if empty tree on shear and collapse
2022-01-27T02:54:40
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-579
86681887f13a2838637d21f3d3293c2f5880c367
diff --git a/aiidalab_widgets_base/viewers.py b/aiidalab_widgets_base/viewers.py index faf13b27e..df7d46687 100644 --- a/aiidalab_widgets_base/viewers.py +++ b/aiidalab_widgets_base/viewers.py @@ -1521,20 +1521,25 @@ def __init__(self, folder, downloadable=True, **kwargs): super().__init__(children, **kwargs) def change_file_view(self, _=None): - with self._folder.base.repository.open(self.files.value) as fobj: - self.text.value = fobj.read() + try: + with self._folder.base.repository.open(self.files.value) as fobj: + self.text.value = fobj.read() + except UnicodeDecodeError: + self.text.value = "[Binary file, preview not available]" def download(self, _=None): - """Prepare for downloading.""" + """Download selected file.""" from IPython.display import Javascript - payload = base64.b64encode( - self._folder.get_object_content(self.files.value).encode() - ).decode() + # TODO: Preparing large files for download might take a while. + # Can we do a streaming solution? + raw_bytes = self._folder.get_object_content(self.files.value, "rb") + base64_payload = base64.b64encode(raw_bytes).decode() + javas = Javascript( f""" var link = document.createElement('a'); - link.href = "data:;base64,{payload}" + link.href = "data:;base64,{base64_payload}" link.download = "{self.files.value}" document.body.appendChild(link); link.click();
FolderDataViewer chokes on binary files I was trying to browse the content if the Retrieved folder of an ORCA calculation in the NodeTreeWidget, but when I tried to open and download a binary wavefunction file, I got a Unicode decoding error. ![image](https://user-images.githubusercontent.com/9539441/188644467-c528b146-1a64-49e0-aac6-2e7089ce174e.png) Here's part of the stack trace ```python ~/apps/aiidalab-widgets-base/aiidalab_widgets_base/viewers.py in change_file_view(self, change) 1057 def change_file_view(self, change=None): # pylint: disable=unused-argument 1058 with self._folder.open(self.files.value) as fobj: -> 1059 self.text.value = fobj.read() 1060 1061 def download(self, change=None): # pylint: disable=unused-argument /opt/conda/lib/python3.7/codecs.py in decode(self, input, final) 320 # decode input (taking the buffer into account) 321 data = self.buffer + input --> 322 (result, consumed) = self._buffer_decode(data, self.errors, final) 323 # keep undecoded input until the next call 324 self.buffer = data[consumed:] UnicodeDecodeError: 'utf-8' codec can't decode byte 0xf8 in position 8: invalid start byte ``` And here's the stack trace if I try to download the file ```python --------------------------------------------------------------------------- UnicodeDecodeError Traceback (most recent call last) ~/apps/aiidalab-widgets-base/aiidalab_widgets_base/viewers.py in download(self, change) 1064 1065 payload = base64.b64encode( -> 1066 self._folder.get_object_content(self.files.value).encode() 1067 ).decode() 1068 javas = Javascript( ~/.local/lib/python3.7/site-packages/aiida/orm/nodes/node.py in get_object_content(self, path, mode, key) 545 warnings.warn("from v2.0 only the modes 'r' and 'rb' will be accepted", AiidaDeprecationWarning) # pylint: disable=no-member 546 --> 547 return self._repository.get_object_content(path, mode) 548 549 def put_object_from_tree( ~/.local/lib/python3.7/site-packages/aiida/orm/utils/_repository.py in get_object_content(self, key, mode) 136 """ 137 with self.open(key, mode=mode) as handle: --> 138 return handle.read() 139 140 def put_object_from_tree(self, path, key=None, contents_only=True, force=False): /opt/conda/lib/python3.7/codecs.py in decode(self, input, final) 320 # decode input (taking the buffer into account) 321 data = self.buffer + input --> 322 (result, consumed) = self._buffer_decode(data, self.errors, final) 323 # keep undecoded input until the next call 324 self.buffer = data[consumed:] UnicodeDecodeError: 'utf-8' codec can't decode byte 0xf8 in position 8: invalid start byte ``` We need to handle these errors and do the appropriate thing for binary filles.
Thanks for reporting!!
2024-03-21T00:49:55
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-541
70259cc412d8f0eccdd7870209351a3ea6046f5c
diff --git a/aiidalab_widgets_base/viewers.py b/aiidalab_widgets_base/viewers.py index 75bee6b5b..df715081c 100644 --- a/aiidalab_widgets_base/viewers.py +++ b/aiidalab_widgets_base/viewers.py @@ -47,8 +47,12 @@ def viewer(obj, **kwargs): ) return obj - if obj.node_type in AIIDA_VIEWER_MAPPING: - _viewer = AIIDA_VIEWER_MAPPING[obj.node_type] + _viewer = AIIDA_VIEWER_MAPPING.get(obj.node_type) + if isinstance(obj, orm.ProcessNode): + # Allow to register specific viewers based on obj.process_type + _viewer = AIIDA_VIEWER_MAPPING.get(obj.process_type, _viewer) + + if _viewer: return _viewer(obj, **kwargs) else: # No viewer registered for this type, return object itself
Can not register different viewers for different WorkChain. In the `AiidaNodeViewWidget`, it use the `node_type` as the [key](https://github.com/aiidalab/aiidalab-widgets-base/blob/aba0bdb3dc7a7e1af268145a0fd643194e681523/aiidalab_widgets_base/viewers.py#L51-L54) to select the `viewer` for an AiiDA node. This works fine for the `data` node, but will fail in the case of a `process` node. For example, the `node_type` is the same for all `WorkChainNode`s, thus, one can not register different viewers for different WorkChain. Better to use the `process_type` for the `process` node
2023-11-20T14:07:46
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-523
ba23f42f7a3a35307e7857e0ab42a621728d115c
diff --git a/aiidalab_widgets_base/computational_resources.py b/aiidalab_widgets_base/computational_resources.py index fbd17a3d5..25418576f 100644 --- a/aiidalab_widgets_base/computational_resources.py +++ b/aiidalab_widgets_base/computational_resources.py @@ -12,7 +12,7 @@ import traitlets from aiida import common, orm, plugins from aiida.orm.utils.builders.computer import ComputerBuilder -from aiida.transports.plugins.ssh import parse_sshconfig +from aiida.transports.plugins import ssh as aiida_ssh_plugin from humanfriendly import InvalidSize, parse_size from IPython.display import clear_output, display @@ -425,7 +425,7 @@ def _is_in_config(self): fpath = Path.home() / ".ssh" / "config" if not fpath.exists(): return False - sshcfg = parse_sshconfig(self.hostname.value) + sshcfg = aiida_ssh_plugin.parse_sshconfig(self.hostname.value) # NOTE: parse_sshconfig returns a dict with a hostname # even if it is not in the config file. # We require at least the user to be specified. @@ -850,7 +850,7 @@ def _configure_computer(self, computer: orm.Computer, transport: str): def _configure_computer_ssh(self, computer: orm.Computer, user: orm.User): """Configure the computer with SSH transport""" - sshcfg = parse_sshconfig(self.hostname.value) + sshcfg = aiida_ssh_plugin.parse_sshconfig(self.hostname.value) authparams = { "port": int(sshcfg.get("port", 22)), "look_for_keys": True,
Various issues in SshComputerSetup When looking at the code of `SshComputerSetup` I noticed a couple of (apparent) issues. - When a config for a given computer already exists, the (potentially) new values are not written. What's worse, the user is not notified about this. In essence this means that user cannot change an existing config - When unit testing this widget, we're (repeatadly) writing to an actual `.ssh/config` file! We need to monkeypatch this. - When a private Ssh key already exists, the new value is written to a different file, but this is not correctly propagated to the calling function
Also, the issue found in https://github.com/aiidalab/aiidalab-widgets-base/pull/511#issuecomment-1723194831 I noticed the thread created in the `_on_setup_ssh_button_pressed` changing the object attributes of the class, there is race condition that needs to be avoided. The problem is that the real SSH connection part, is difficult to write unid test. Probably it is worth to try https://github.com/carletes/mock-ssh-server and http://sdf.org/ @yakutovicha in ssh_copy_id the function call ssh command in subprocess, maybe it is more easy to cache the output and exception with using ssh library for example paramiko? BTW, is there any progress on the ssh light of aiida-core, what is the ssh library used there?
2023-10-04T15:55:32
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-507
aec8f879f58cf8b5f0bff585c8ad4a9e1d546d19
diff --git a/aiidalab_widgets_base/structures.py b/aiidalab_widgets_base/structures.py index 055215b63..ec9f286c3 100644 --- a/aiidalab_widgets_base/structures.py +++ b/aiidalab_widgets_base/structures.py @@ -772,7 +772,10 @@ def _rdkit_opt(self, smiles, steps): return None mol = Chem.AddHs(mol) - AllChem.EmbedMolecule(mol, maxAttempts=20, randomSeed=42) + conf_id = AllChem.EmbedMolecule(mol, maxAttempts=20, randomSeed=42) + if conf_id < 0: + self.output.value = "RDKit ERROR: Could not generate conformer" + return None if AllChem.UFFHasAllMoleculeParams(mol): AllChem.UFFOptimizeMolecule(mol, maxIters=steps) else: @@ -785,8 +788,18 @@ def _rdkit_opt(self, smiles, steps): def _mol_from_smiles(self, smiles, steps=1000): """Convert SMILES to ase structure try rdkit then pybel""" + + # Canonicalize the SMILES code + # https://en.wikipedia.org/wiki/Simplified_molecular-input_line-entry_system#Terminology + canonical_smiles = self.canonicalize_smiles(smiles) + if not canonical_smiles: + return None + + if canonical_smiles != smiles: + self.output.value = f"Canonical SMILES: {canonical_smiles}" + try: - return self._rdkit_opt(smiles, steps) + return self._rdkit_opt(canonical_smiles, steps) except ValueError as e: self.output.value = str(e) if self.disable_openbabel: @@ -802,11 +815,27 @@ def _on_button_pressed(self, change=None): return spinner = f"Screening possible conformers {self.SPINNER}" # font-size:20em; self.output.value = spinner + self.structure = self._mol_from_smiles(self.smiles.value) # Don't overwrite possible error/warning messages if self.output.value == spinner: self.output.value = "" + def canonicalize_smiles(self, smiles): + from rdkit import Chem + + mol = Chem.MolFromSmiles(smiles, sanitize=True) + if mol is None: + # Something is seriously wrong with the SMILES code, + # just return None and don't attempt anything else. + self.output.value = "RDkit ERROR: Invalid SMILES string" + return None + canonical_smiles = Chem.MolToSmiles(mol, isomericSmiles=True, canonical=True) + if not canonical_smiles: + self.output.value = "RDkit ERROR: Could not canonicalize SMILES" + return None + return canonical_smiles + @tl.default("structure") def _default_structure(self): return None
BUG in Smiles Widget The following SMILES code `C=CC1=C(C2=CC=C(C3=CC=CC=C3)C=C2)C=C(C=C)C(C4=CC=C(C(C=C5)=CC=C5C(C=C6C=C)=C(C=C)C=C6C7=CC=C(C(C=C8)=CC=C8C(C=C9C=C)=C(C=C)C=C9C%10=CC=CC=C%10)C=C7)C=C4)=C1` is correctly handled by Mathematica: ![smiles_mathematica](https://github.com/aiidalab/aiidalab-widgets-base/assets/22955065/9d585406-0c7b-4a47-bc13-89c65ee5f50f) while crashes the smiles widget: <img width="694" alt="image" src="https://github.com/aiidalab/aiidalab-widgets-base/assets/22955065/69e45759-65ea-4126-9980-698a530b9d85"> https://github.com/aiidalab/aiidalab-widgets-base/blob/413c26c76ec438b9c70afe3437420923f738e50b/aiidalab_widgets_base/structures.py#L679 SmilesWidget: Canonicalize input SMILES string Since #264 we are storing the input SMILES string in the StructureData extras. However, to make this actually useful, we should canonicalize the smiles string before we store it. There are apparently different canonicalization algorithms so we should just pick one that readily available. It should be possible to do with RDKit, per https://ctr.fandom.com/wiki/Convert_a_SMILES_string_to_canonical_SMILES I will take this on.
I'll take a look, the error comes from the code that I introduced I think, thanks for the report! > The following SMILES code > > > C=CC1=C(C2=CC=C(C3=CC=CC=C3)C=C2)C=C(C=C)C(C4=CC=C(C(C=C5)=CC=C5C(C=C6C=C)=C(C=C)C=C6C7=CC=C(C(C=C8)=CC=C8C(C=C9C=C)=C(C=C)C=C9C%10=CC=CC=C%10)C=C7)C=C4)=C1 > > is correctly handled by Mathematica: > > [image: smiles_mathematica] > <https://user-images.githubusercontent.com/22955065/263716526-9d585406-0c7b-4a47-bc13-89c65ee5f50f.png> > > while crashes the smiles widget: > [image: image] > <https://user-images.githubusercontent.com/22955065/263716814-69e45759-65ea-4126-9980-698a530b9d85.png> > > > https://github.com/aiidalab/aiidalab-widgets-base/blob/413c26c76ec438b9c70afe3437420923f738e50b/aiidalab_widgets_base/structures.py#L679 > > — > Reply to this email directly, view it on GitHub > <https://github.com/aiidalab/aiidalab-widgets-base/issues/505>, or > unsubscribe > <https://github.com/notifications/unsubscribe-auth/ACIY64I626W2BWPPX2BM5ELXXSMTXANCNFSM6AAAAAA4BNZA5A> > . > You are receiving this because you are subscribed to this thread.Message > ID: ***@***.***> > I noticed a strange thing. The input SMILES is not canonical (at least according to RDKit). The canonical version is `C=Cc1cc(-c2ccc(-c3ccc(-c4cc(C=C)c(-c5ccc(-c6ccc(-c7cc(C=C)c(-c8ccc(-c9ccccc9)cc8)cc7C=C)cc6)cc5)cc4C=C)cc3)cc2)c(C=C)cc1-c1ccccc1` When I input this smiles the generation succeeds. @cpignedoli could you please confirm that the following generated geometry is the molecule that you wanted? CC @yakutovicha ``` 126 C 10.789406146640598 11.093550987863887 10.775495335663638 C 10.300054323514150 10.660649966173487 9.612813917217883 C 11.044087458291084 9.754560238551454 8.694690148677905 C 12.450498975464544 9.771741109891606 8.658420277266600 C 13.171961786514769 8.899468916084674 7.828249211905409 C 14.653209329627982 8.943297720286033 7.879013462112862 C 15.388012861026390 7.798352029613464 8.223198046072158 C 16.783321971800845 7.845316400135173 8.282815349608248 C 17.470109441631713 9.041547639748901 8.008276391728797 C 18.953054753049308 9.091478726443864 8.071545358625475 C 19.725614259466418 8.029388783934873 7.568656068037813 C 21.120804560742720 8.075486213314020 7.629939944722656 C 21.770381820351080 9.179358278706633 8.203500102453024 C 23.250990599345592 9.231714826326275 8.264561432610403 C 23.903860660217664 10.317181478862233 7.659199481550609 C 25.307537098652755 10.382191256698256 7.589556714716446 C 25.973997006949350 11.575649813337492 7.005036031568991 C 25.459546275072285 12.283138130155274 5.999117896367571 C 26.071218969165187 9.328380939153275 8.145310409359372 C 27.551799643398276 9.304486191597727 8.067700837387832 C 28.200629370384807 9.358470201659426 6.824471161285891 C 29.595724240103443 9.322774291273271 6.752861709556376 C 30.368753975797965 9.225240082611922 7.923715482343153 C 31.851530863265936 9.189182848324915 7.848354553242594 C 32.498520133926782 8.444337812420816 6.846073418941604 C 33.893746958784689 8.412585059797328 6.774229885272454 C 34.668704626344180 9.131963426111268 7.696570000994615 C 36.148932965587925 9.092374267559924 7.621011285073506 C 36.784085051404418 7.841668003616832 7.668941392751486 C 38.181197066134025 7.732486698869110 7.686275138226859 C 38.759962686937143 6.368182790026544 7.677028261260971 C 39.778556186855347 6.021601610330768 6.891412668450279 C 38.967336916073641 8.911450468932689 7.720681660879677 C 40.439185456658208 8.879878098114695 7.896972531738566 C 41.010745158645960 8.212304238765498 8.991174281393935 C 42.397735379199887 8.188774928466096 9.159363589654875 C 43.239961819451224 8.839144066258630 8.239793939282444 C 44.714482325102651 8.812122182387412 8.416185778535240 C 45.285363329073931 8.952479315158913 9.695595094175022 C 46.673897610617388 8.926798320059179 9.858320666109636 C 47.506721361088310 8.760265310242879 8.749679440972686 C 46.952795498459238 8.619502021844056 7.475410832137726 C 45.565003229455471 8.645378209519945 7.306561612916231 C 42.662604235466041 9.517457504186828 7.151403427074022 C 41.275330967962212 9.541258091041994 6.984727986718346 C 38.333033396546355 10.161339273964789 7.646921101522342 C 36.938095770508767 10.268449383599863 7.564334633326729 C 36.364089825029517 11.628205771972041 7.430231241960009 C 35.400658467129780 11.922181039433509 6.558317030007844 C 34.027006019076033 9.866285048310409 8.705841117394819 C 32.631964088867754 9.897849333927708 8.779221220681968 C 29.714218482087361 9.160162695738345 9.166890732643022 C 28.318877538178867 9.195129477929447 9.237196179982393 C 25.418828699165509 8.255414266076892 8.770905851670630 C 24.021933361290465 8.202600853733518 8.859842757736988 C 23.427308688423405 7.057198372432805 9.588383186189890 C 22.455747608268631 7.200136211860595 10.488653947758950 C 21.003481997548349 10.246471114924656 8.695394946696492 C 19.608119385680904 10.201962924735863 8.633444238317603 C 16.729102135380188 10.189875669478356 7.675858344629621 C 15.333714719868826 10.141279710999150 7.615168369062982 C 12.477288869607099 7.990502072377453 6.995757061967427 C 13.213093255134526 7.109277147759734 6.051239790606723 C 12.773692378284579 5.906743639264395 5.679942999456125 C 11.071498194782144 7.994151376890070 7.009287419909342 C 10.353257752587758 8.867018227513944 7.837947106293956 C 8.877616222976119 8.814245396839564 7.790055342208218 C 8.151513284552880 9.840639960592810 7.165119474823999 C 6.755946034589012 9.776715715515992 7.104596794731544 C 6.080152942119149 8.685327336845436 7.658349037144509 C 6.799207251019130 7.654588807589116 8.270817026792406 C 8.194918656634179 7.715155678130834 8.333765972042571 H 10.187998832973708 11.737059662754781 11.404534282634245 H 11.764114959993565 10.795858302282882 11.136628800802134 H 9.290221802424384 10.956220827004273 9.362938407287576 H 13.000100177036481 10.469491980069327 9.277506467819432 H 14.879138008042695 6.870398399547538 8.453901947253922 H 17.324268738116558 6.950524501663429 8.564089722193611 H 19.251321174087089 7.171088303919048 7.109608770656157 H 21.695709247808900 7.252406395764151 7.223561170105164 H 23.304975543604328 11.118265163213557 7.244162688321445 H 26.945909550215539 11.868938711571502 7.382574710949359 H 24.521379841799316 12.015453820719166 5.532128624300915 H 26.002497335304323 13.133610001846623 5.607742899599813 H 27.625272617102461 9.426007378088457 5.909231364311240 H 30.070292283564193 9.386596515198457 5.781760355672381 H 31.925701011830238 7.872366526523075 6.127009930370598 H 34.370443100680191 7.833963395851809 5.992430958394171 H 36.181494549767855 6.940095581299777 7.696121104710627 H 38.271067545082929 5.593538580128561 8.255510903344966 H 40.135258752854334 5.000000000000002 6.889922264745703 H 40.247641216017684 6.734426057496647 6.225971309018672 H 40.381536456404611 7.709752009133784 9.715493596043469 H 42.812131037055963 7.647964473711428 10.000825072702174 H 44.659671225455170 9.099825884643387 10.566862830855973 H 47.104509635795864 9.039595224762294 10.844932218742178 H 48.581247668803620 8.740307461686040 8.878015009551341 H 47.599148205025443 8.486711379708337 6.617421846807042 H 45.156964538791854 8.517275073647095 6.311853839577731 H 43.283121160946237 10.044248838236575 6.437423010253032 H 40.852955639548725 10.068183478934014 6.137848332843241 H 38.934372606575458 11.064098885199279 7.656964436633652 H 36.815087887794554 12.438969257811296 7.989693494834360 H 35.046977416355709 12.940877525534470 6.468448378096624 H 34.975317897688242 11.167663516772809 5.909657658138290 H 34.607666893106163 10.414817138953397 9.437305830089247 H 32.163450585903206 10.489904539672279 9.555276847349536 H 30.280878870619237 9.064516032705486 10.084548914127485 H 27.835934549779580 9.143004197692148 10.205389013273969 H 26.008956681787602 7.453675198184930 9.201905509353221 H 23.869574619859996 6.076386161359432 9.461436510612879 H 22.086995002887136 6.336329937408444 11.026024089468677 H 22.038460563645636 8.171095925519843 10.721160239522604 H 21.486298836242295 11.107007270155737 9.142177215073238 H 19.040955735092723 11.028343747466316 9.042979283533709 H 17.229397877763770 11.121887701017874 7.444826371104768 H 14.783486923309535 11.035885711249289 7.350047226468363 H 14.173344855055177 7.434976141781370 5.670591862993399 H 11.851201038834116 5.491722005994449 6.063243322193171 H 13.363189850778491 5.305541540598276 5.000000000000000 H 10.520527090662846 7.341680007154315 6.342743039789817 H 8.666621598019660 10.687233839956454 6.727826414922109 H 6.198584338655685 10.571746109172304 6.626403954367804 H 5.000000000000000 8.636782669090945 7.610051385716330 H 6.275149763661059 6.808116303366591 8.695392002257584 H 8.743162017466393 6.910398516730581 8.808196661739872 ``` Thanks a lot @danielhollas it is correct and with the canonical form you provided it works. So chemdraw is not producing canonical SMILES. How did you do the conversion? should we put it in the widget? Yes, I will put up a PR with the canonicalization using rdkit. I am already using it in my app for some time and it works well. great @danielhollas Thanks a lot :) Thanks a lot!
2023-08-31T17:24:22
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-502
aec8f879f58cf8b5f0bff585c8ad4a9e1d546d19
diff --git a/aiidalab_widgets_base/computational_resources.py b/aiidalab_widgets_base/computational_resources.py index e1c67745e..f4acbc3ba 100644 --- a/aiidalab_widgets_base/computational_resources.py +++ b/aiidalab_widgets_base/computational_resources.py @@ -11,7 +11,6 @@ import shortuuid import traitlets from aiida import common, orm, plugins -from aiida.common.exceptions import NotExistent from aiida.orm.utils.builders.computer import ComputerBuilder from aiida.transports.plugins.ssh import parse_sshconfig from humanfriendly import InvalidSize, parse_size @@ -684,8 +683,9 @@ def __init__(self, **kwargs): # Directory where to run the simulations. self.work_dir = ipw.Text( - value="/scratch/{username}/aiida_run", - description="Workdir:", + value="", + placeholder="/home/{username}/aiida_run", + description="AiiDA working directory:", layout=LAYOUT, style=STYLE, ) @@ -825,8 +825,19 @@ def observe_memory_per_machine(change): super().__init__(children, **kwargs) - def _configure_computer(self, computer: orm.Computer): - """Configure the computer""" + def _configure_computer(self, computer: orm.Computer, transport: str): + # Use default AiiDA user + user = orm.User.collection.get_default() + if transport == "core.ssh": + self._configure_computer_ssh(computer, user) + elif transport == "core.local": + self._configure_computer_local(computer, user) + else: + msg = f"invalid transport type '{transport}'" + raise common.ValidationError(msg) + + def _configure_computer_ssh(self, computer: orm.Computer, user: orm.User): + """Configure the computer with SSH transport""" sshcfg = parse_sshconfig(self.hostname.value) authparams = { "port": int(sshcfg.get("port", 22)), @@ -852,7 +863,6 @@ def _configure_computer(self, computer: orm.Computer): authparams["username"] = sshcfg["user"] except KeyError as exc: message = "SSH username is not provided" - self.message = message raise RuntimeError(message) from exc if "proxycommand" in sshcfg: @@ -860,10 +870,16 @@ def _configure_computer(self, computer: orm.Computer): elif "proxyjump" in sshcfg: authparams["proxy_jump"] = sshcfg["proxyjump"] - # user default AiiDA user - user = orm.User.collection.get_default() computer.configure(user=user, **authparams) + return True + def _configure_computer_local(self, computer: orm.Computer, user: orm.User): + """Configure the computer with local transport""" + authparams = { + "use_login_shell": self.use_login_shell.value, + "safe_interval": self.safe_interval.value, + } + computer.configure(user=user, **authparams) return True def _run_callbacks_if_computer_exists(self, label): @@ -877,10 +893,25 @@ def _run_callbacks_if_computer_exists(self, label): else: return True + def _validate_computer_settings(self): + if self.label.value == "": # check computer label + self.message = "Please specify the computer name (for AiiDA)" + return False + + if self.work_dir.value == "": + self.message = "Please specify working directory" + return False + + if self.hostname.value == "": + self.message = "Please specify hostname" + return False + + return True + def on_setup_computer(self, _=None): """Create a new computer.""" - if self.label.value == "": # check hostname - self.message = "Please specify the computer name (for AiiDA)" + + if not self._validate_computer_settings(): return False # If the computer already exists, we just run the registered functions and return @@ -910,16 +941,15 @@ def on_setup_computer(self, _=None): ) try: computer = computer_builder.new() - self._configure_computer(computer) + self._configure_computer(computer, self.transport.value) + computer.store() except ( ComputerBuilder.ComputerValidationError, common.exceptions.ValidationError, RuntimeError, ) as err: - self.message = f"Failed to setup computer {type(err).__name__}: {err}" + self.message = f"Computer setup failed! {type(err).__name__}: {err}" return False - else: - computer.store() # Callbacks will not run if the computer is not stored if self._run_callbacks_if_computer_exists(self.label.value): @@ -1160,7 +1190,7 @@ def _observe_code_setup(self, _=None): # if the computer is set pass the UUID to ComputerDropdownWdiget. try: computer = orm.load_computer(value) - except NotExistent: + except common.NotExistent: getattr(self, key).value = None else: getattr(self, key).value = computer.uuid
Cannot setup localhost computer Just tried to setup a localhost computer, with transport `core.local` and scheduler `core.direct`, but I got: ![image](https://user-images.githubusercontent.com/9539441/207138083-d59567d1-63d5-41f6-8750-16505f4627cf.png)
Instead of fixing the issue itself, I think maybe it makes more sense to disable the localhost set? Every AiiDAlab container already has localhost running, it makes no sense to set it again or another duplicate localhost. In my case I have my own image with SLURM, so I am setting a second localhost configured with slurm. I am doing this automatically in poat_install script, so I don't need to do it through the widget. Just saying there are potential use cases. In general the computer setup UI seems quite complicated, simplification wouldn't hurt it I guess. This is not a critical functionality, moving out of the 2.0 milestone. Just a note for whoever picks this up, I would really go for simplification here and simply remove the possibiliy of setting up localhost computer. This widget is already complicated enough, and in the unlikely case that somebody needs it, they are probably knowledgeable enough to use the terminal for this.
2023-08-16T16:40:32
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-489
c87b72498de4134d1030a7c554cf88a1e4660599
diff --git a/aiidalab_widgets_base/structures.py b/aiidalab_widgets_base/structures.py index cd4d7da5a..055215b63 100644 --- a/aiidalab_widgets_base/structures.py +++ b/aiidalab_widgets_base/structures.py @@ -724,7 +724,8 @@ def _make_ase(self, species, positions, smiles): from sklearn.decomposition import PCA # Get the principal axes and realign the molecule along z-axis. - positions = PCA(n_components=3).fit_transform(positions) + if len(species) > 2: + positions = PCA(n_components=3).fit_transform(positions) atoms = ase.Atoms(species, positions=positions, pbc=False) atoms.cell = np.ptp(atoms.positions, axis=0) + 10 atoms.center()
SmilesWidget: Cannot generate 2-atom molecule Smiles for N2 molecule `N#N` generates this error: ``` n_components=3 must be between 0 and min(n_samples, n_features)=2 with svd_solver='full' ``` Likely comes from the code that tries to reorient the molecule to standard orientation.
2023-06-25T19:53:11
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-488
913e99040b48be1ffbc91f8da0789fb0ae8467b1
diff --git a/aiidalab_widgets_base/viewers.py b/aiidalab_widgets_base/viewers.py index 5c41f429d..d998ed08d 100644 --- a/aiidalab_widgets_base/viewers.py +++ b/aiidalab_widgets_base/viewers.py @@ -317,8 +317,8 @@ def change_camera(change): @tl.observe("cell") def _observe_cell(self, _=None): - # only update cell info when it is a 3D structure. - if self.cell and all(self.structure.pbc): + # Updtate the Cell and Periodicity. + if self.cell: self.cell_a.value = "<i><b>a</b></i>: {:.4f} {:.4f} {:.4f}".format( *self.cell.array[0] ) @@ -348,8 +348,21 @@ def _observe_cell(self, _=None): spglib_structure, symprec=1e-5, angle_tolerance=1.0 ) + periodicity_map = { + (True, True, True): "xyz", + (True, False, False): "x", + (False, True, False): "y", + (False, False, True): "z", + (True, True, False): "xy", + (True, False, True): "xz", + (False, True, True): "yz", + (False, False, False): "-", + } self.cell_spacegroup.value = f"Spacegroup: {symmetry_dataset['international']} (No.{symmetry_dataset['number']})" self.cell_hall.value = f"Hall: {symmetry_dataset['hall']} (No.{symmetry_dataset['hall_number']})" + self.periodicity.value = ( + f"Periodicity: {periodicity_map[tuple(self.structure.pbc)]}" + ) else: self.cell_a.value = "<i><b>a</b></i>:" self.cell_b.value = "<i><b>b</b></i>:" @@ -363,6 +376,10 @@ def _observe_cell(self, _=None): self.cell_beta.value = "&beta;:" self.cell_gamma.value = "&gamma;:" + self.cell_spacegroup.value = "" + self.cell_hall.value = "" + self.periodicity.value = "" + def _cell_tab(self): self.cell_a = ipw.HTML() self.cell_b = ipw.HTML() @@ -378,6 +395,7 @@ def _cell_tab(self): self.cell_spacegroup = ipw.HTML() self.cell_hall = ipw.HTML() + self.periodicity = ipw.HTML() self._observe_cell() @@ -420,6 +438,7 @@ def _cell_tab(self): ipw.HTML("Symmetry information:"), self.cell_spacegroup, self.cell_hall, + self.periodicity, ], layout={"margin": "0 0 0 50px"}, ),
Logic in viewers doesnt allow periodicity different than True , True , True The logic in https://github.com/aiidalab/aiidalab-widgets-base/blob/0d9fee60086da122490eadb28b45a856263454d5/aiidalab_widgets_base/viewers.py#L321 doesnt allow pcb different from True , True , True
2023-06-24T08:28:24
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-446
76e31cb0402fb7dfab0e6a14fb71d966b6a30245
diff --git a/aiidalab_widgets_base/bug_report.py b/aiidalab_widgets_base/bug_report.py index 55e4a35c3..a37eb681c 100644 --- a/aiidalab_widgets_base/bug_report.py +++ b/aiidalab_widgets_base/bug_report.py @@ -4,22 +4,36 @@ * Carl Simon Adorf <[email protected]> """ +from __future__ import annotations + import base64 import json import platform import re import sys import zlib +from subprocess import run from textwrap import wrap from urllib.parse import urlencode, urlsplit, urlunsplit import ipywidgets as ipw -from aiidalab.utils import find_installed_packages from ansi2html import Ansi2HTMLConverter +def find_installed_packages(python_bin: str | None = None) -> dict[str, str]: + """Return all currently installed packages.""" + if python_bin is None: + python_bin = sys.executable + output = run( + [python_bin, "-m", "pip", "list", "--format=json"], + encoding="utf-8", + capture_output=True, + ).stdout + + return {package["name"]: package["version"] for package in json.loads(output)} + + def get_environment_fingerprint(encoding="utf-8"): - packages = find_installed_packages() data = { "version": 1, "platform": { @@ -27,17 +41,18 @@ def get_environment_fingerprint(encoding="utf-8"): "python_version": platform.python_version(), "version": platform.version(), }, - "packages": {package.name: package.version for package in packages}, + "packages": find_installed_packages(), } json_data = json.dumps(data, separators=(",", ":")) return base64.urlsafe_b64encode(zlib.compress(json_data.encode(encoding), level=9)) -def parse_environment_fingerprint(data, encoding="utf-8"): - packages = json.loads( - zlib.decompress(base64.urlsafe_b64decode(data)).decode(encoding) +def parse_environment_fingerprint(fingerprint, encoding="utf-8"): + """decode the environment fingerprint and return the data as a dictionary.""" + data = json.loads( + zlib.decompress(base64.urlsafe_b64decode(fingerprint)).decode(encoding) ) - return packages + return data ERROR_MESSAGE = """<div class="alert alert-danger"> @@ -127,6 +142,21 @@ def install_create_github_issue_exception_handler(output, url, labels=None): After installing this handler, kernel exception will show a generic error message to the user, with the option to file an automatic bug report at the given URL. + + This is an example of how to use this function: + + Example: + -------- + ```python + output = ipw.Output() + install_create_github_issue_exception_handler( + output, + url='https://github.com/aiidalab/aiidalab-qe/issues/new', + labels=('bug', 'automated-report')) + + with output: + display(welcome_message, app_with_work_chain_selector, footer) + ``` """ global _ORIGINAL_EXCEPTION_HANDLER
Recent aiidalab changes broke the github error handler Recent changes to `aiidalab` package modified the `find_installed_packages` functions. Turns out this function is used in the github error handler in AWB. https://github.com/aiidalab/aiidalab-widgets-base/blob/7a0e266a1576d6a10423931a6821d3f510f4b000/aiidalab_widgets_base/bug_report.py#L22 The error handler now (ironically) excepts with the following; ```python Error while generating bug report: 'str' object has no attribute 'name' ```
Hmm, this is quite unfortunate. I just realized that would would need to backport this fix to the 1.4.x support branch to fix this in the old Docker stack. @unkcpz I am wondering if it would be easier to instead change back the `find_installed_packages` so that it does not break AWB? > this fix to the 1.4.x support branch to fix this in the old Docker stack. That's true, I'll see if I can make it backward-compatible. After some attempts, I think it makes more sense to fix it and backport to 1.4.x. I did try adding a if..else to `find_installed_packages` function to return different type based on aiida-core version, but then I realize that we remove the aiida-core as the dependency in aiidalab recently. @danielhollas I want to add a test for the fix, can you give https://github.com/aiidalab/aiidalab-widgets-base/pull/435 a look so I can implement unit test directly.
2023-03-14T14:51:59
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-441
ca48cc41e5a6600c73cb7a5c761d5efd00a07b78
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c1be7546..59a2de0da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,8 +122,11 @@ jobs: run: pip install -e .[dev] - name: Run pytest - run: pytest -v tests + run: pytest -v tests --cov env: TAG: ${{ matrix.tag }} - # code coverage + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + with: + flags: python-${{ matrix.python-version }} diff --git a/README.md b/README.md index ec3a3f13f..6ed9cad31 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Documentation Status](https://readthedocs.org/projects/aiidalab-widgets-base/badge/?version=latest)](https://aiidalab-widgets-base.readthedocs.io/en/latest/?badge=latest) +[![codecov](https://codecov.io/gh/aiidalab/aiidalab-widgets-base/branch/master/graph/badge.svg)](https://codecov.io/gh/aiidalab/aiidalab-widgets-base) # AiiDAlab Widgets diff --git a/aiidalab_widgets_base/structures.py b/aiidalab_widgets_base/structures.py index 402f37f61..2ee03054e 100644 --- a/aiidalab_widgets_base/structures.py +++ b/aiidalab_widgets_base/structures.py @@ -231,7 +231,7 @@ def user_modifications(source_structure): # pylint: disable=unused-argument structure_node = self.structure_node.store() self.output.value = f"Stored in AiiDA [{structure_node}]" - def undo(self, _): + def undo(self, _=None): """Undo modifications.""" self.structure_set_by_undo = True if self.history: diff --git a/setup.cfg b/setup.cfg index a53a8f758..82bb904b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,6 +44,7 @@ dev = pgtest==1.3.1 pre-commit==2.10.1 pytest~=6.2 + pytest-cov~=4.0 pytest-docker~=1.0 pytest-selenium~=4.0 selenium~=4.7.0
Measure the test coverage For this library, we should also measure the coverage, similar to aiidalab-launch and eventually aim for test coverage of at least 75-80%. I would consider this issue completed if we reach a coverage of 15%.
2023-03-07T14:36:52
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-409
001f1027a2b6d99c6fac63a413549523235607d2
diff --git a/aiidalab_widgets_base/computational_resources.py b/aiidalab_widgets_base/computational_resources.py index 5da968420..e28cf8a2d 100644 --- a/aiidalab_widgets_base/computational_resources.py +++ b/aiidalab_widgets_base/computational_resources.py @@ -46,7 +46,7 @@ class ComputationalResourcesWidget(ipw.VBox): codes = traitlets.Dict(allow_none=True) allow_hidden_codes = traitlets.Bool(False) allow_disabled_computers = traitlets.Bool(False) - input_plugin = traitlets.Unicode(allow_none=True) + default_calc_job_plugin = traitlets.Unicode(allow_none=True) def __init__(self, description="Select code:", path_to_root="../", **kwargs): """Dropdown for Codes for one input plugin. @@ -82,7 +82,7 @@ def __init__(self, description="Select code:", path_to_root="../", **kwargs): # Setting up codes and computers. self.comp_resources_database = ComputationalResourcesDatabaseWidget( - input_plugin=self.input_plugin + default_calc_job_plugin=self.default_calc_job_plugin ) self.ssh_computer_setup = SshComputerSetup() @@ -166,7 +166,7 @@ def _get_codes(self): for c in orm.QueryBuilder() .append( orm.Code, - filters={"attributes.input_plugin": self.input_plugin}, + filters={"attributes.input_plugin": self.default_calc_job_plugin}, ) .all() if c[0].computer.is_user_configured(user) @@ -188,9 +188,7 @@ def refresh(self, _=None): with self.hold_trait_notifications(): self.code_select_dropdown.options = self._get_codes() if not self.code_select_dropdown.options: - self.output.value = ( - f"No codes found for input plugin '{self.input_plugin}'." - ) + self.output.value = f"No codes found for default calcjob plugin '{self.default_calc_job_plugin}'." self.code_select_dropdown.disabled = True else: self.code_select_dropdown.disabled = False @@ -977,13 +975,14 @@ def __init__(self, path_to_root="../", **kwargs): style=STYLE, ) - # Computer on which the code is installed. Two dlinks are needed to make sure we get a Computer instance. + # Computer on which the code is installed. The value of this widget is + # the UUID of the selected computer. self.computer = ComputerDropdownWidget( path_to_root=path_to_root, ) # Code plugin. - self.input_plugin = ipw.Dropdown( + self.default_calc_job_plugin = ipw.Dropdown( options=sorted( (ep.name, ep.name) for ep in plugins.entry_point.get_entry_points("aiida.calculations") @@ -1001,7 +1000,7 @@ def __init__(self, path_to_root="../", **kwargs): style=STYLE, ) - self.remote_abs_path = ipw.Text( + self.filepath_executable = ipw.Text( placeholder="/path/to/executable", description="Absolute path to executable:", layout=LAYOUT, @@ -1033,9 +1032,9 @@ def __init__(self, path_to_root="../", **kwargs): children = [ self.label, self.computer, - self.input_plugin, + self.default_calc_job_plugin, self.description, - self.remote_abs_path, + self.filepath_executable, self.use_double_quotes, self.prepend_text, self.append_text, @@ -1044,10 +1043,10 @@ def __init__(self, path_to_root="../", **kwargs): ] super().__init__(children, **kwargs) - @traitlets.validate("input_plugin") - def _validate_input_plugin(self, proposal): + @traitlets.validate("default_calc_job_plugin") + def _validate_default_calc_job_plugin(self, proposal): plugin = proposal["value"] - return plugin if plugin in self.input_plugin.options else None + return plugin if plugin in self.default_calc_job_plugin.options else None def on_setup_code(self, _=None): """Setup an AiiDA code.""" @@ -1060,7 +1059,6 @@ def on_setup_code(self, _=None): items_to_configure = [ "label", - "computer", "description", "default_calc_job_plugin", "filepath_executable", @@ -1071,11 +1069,12 @@ def on_setup_code(self, _=None): kwargs = {key: getattr(self, key).value for key in items_to_configure} + # set computer from its widget value the UUID of the computer. + computer = orm.load_computer(self.computer.value) + # Checking if the code with this name already exists qb = orm.QueryBuilder() - qb.append( - orm.Computer, filters={"uuid": kwargs["computer"].uuid}, tag="computer" - ) + qb.append(orm.Computer, filters={"uuid": computer.uuid}, tag="computer") qb.append( orm.InstalledCode, with_computer="computer", @@ -1083,12 +1082,12 @@ def on_setup_code(self, _=None): ) if qb.count() > 0: self.message = ( - f"Code {kwargs['label']}@{kwargs['computer'].label} already exists." + f"Code {kwargs['label']}@{computer.label} already exists." ) return False try: - code = orm.InstalledCode(**kwargs) + code = orm.InstalledCode(computer=computer, **kwargs) except (common.exceptions.InputValidationError, KeyError) as exception: self.message = f"Invalid inputs: {exception}" return False @@ -1114,7 +1113,7 @@ def _reset(self): self.label.value = "" self.computer.value = "" self.description.value = "" - self.remote_abs_path.value = "" + self.filepath_executable.value = "" self.use_double_quotes.value = False self.prepend_text.value = "" self.append_text.value = "" @@ -1130,7 +1129,7 @@ def _observe_code_setup(self, _=None): self._reset() for key, value in self.code_setup.items(): if hasattr(self, key): - if key == "input_plugin": + if key == "default_calc_job_plugin": try: getattr(self, key).label = value except traitlets.TraitError: diff --git a/aiidalab_widgets_base/databases.py b/aiidalab_widgets_base/databases.py index 688cfd26b..06ac67432 100644 --- a/aiidalab_widgets_base/databases.py +++ b/aiidalab_widgets_base/databases.py @@ -205,7 +205,7 @@ def _update_structure(self, change: dict) -> None: class ComputationalResourcesDatabaseWidget(ipw.VBox): """Extract the setup of a known computer from the AiiDA code registry.""" - input_plugin = traitlets.Unicode(allow_none=True) + default_calc_job_plugin = traitlets.Unicode(allow_none=True) ssh_config = traitlets.Dict() computer_setup = traitlets.Dict() code_setup = traitlets.Dict() @@ -261,7 +261,10 @@ def clean_up_database(self, database, plugin): database[domain][computer].keys() - {"computer-configure", "computer-setup"} ): - if plugin != database[domain][computer][code]["input_plugin"]: + if ( + plugin + != database[domain][computer][code]["default_calc_job_plugin"] + ): del database[domain][computer][code] # If no codes remained that correspond to the chosen plugin, remove the computer. if ( @@ -284,11 +287,11 @@ def clean_up_database(self, database, plugin): def update(self, _=None): database = requests.get( - "https://aiidateam.github.io/aiida-code-registry/database_v2.json" + "https://aiidateam.github.io/aiida-code-registry/database_v2_1.json" ).json() self.database = ( - self.clean_up_database(database, self.input_plugin) - if self.input_plugin + self.clean_up_database(database, self.default_calc_job_plugin) + if self.default_calc_job_plugin else database ) @@ -375,6 +378,6 @@ def _code_changed(self, _=None): self.code_setup = code_setup - @default("input_plugin") - def _default_input_plugin(self): + @default("default_calc_job_plugin") + def _default_calc_job_plugin(self): return None diff --git a/notebooks/computational_resources.ipynb b/notebooks/computational_resources.ipynb index 32f2003ff..5ceeeda9e 100644 --- a/notebooks/computational_resources.ipynb +++ b/notebooks/computational_resources.ipynb @@ -30,7 +30,7 @@ "metadata": {}, "outputs": [], "source": [ - "resources = awb.ComputationalResourcesWidget(input_plugin='quantumespresso.pw')" + "resources = awb.ComputationalResourcesWidget()" ] }, {
'AiidaCodeSetup' object has no attribute 'default_calc_job_plugin' When code setup button clicked, I got the exception. ``` --------------------------------------------------------------------------- AttributeError Traceback (most recent call last) ~/.local/lib/python3.9/site-packages/aiidalab_widgets_base/computational_resources.py in on_setup_code(self, _) 1066 ] 1067 -> 1068 kwargs = {key: getattr(self, key).value for key in items_to_configure} 1069 1070 # Checking if the code with this name already exists ~/.local/lib/python3.9/site-packages/aiidalab_widgets_base/computational_resources.py in <dictcomp>(.0) 1066 ] 1067 -> 1068 kwargs = {key: getattr(self, key).value for key in items_to_configure} 1069 1070 # Checking if the code with this name already exists AttributeError: 'AiidaCodeSetup' object has no attribute 'default_calc_job_plugin' ```
I think this might have been missed in https://github.com/aiidalab/aiidalab-widgets-base/pull/394 Yes, it is my fault to hush to support the `InstallCode` setup without fully testing it. The change should happen from `aiida-code-registry` to have the computers/codes database config files support first.
2022-12-07T17:05:23
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-373
eeb00a352ed77beadcc38fed66ddfaa5e6d24131
diff --git a/aiidalab_widgets_base/computational_resources.py b/aiidalab_widgets_base/computational_resources.py index b7bd12e73..819c89daa 100644 --- a/aiidalab_widgets_base/computational_resources.py +++ b/aiidalab_widgets_base/computational_resources.py @@ -159,7 +159,7 @@ def refresh(self, _=None): with self.hold_trait_notifications(): self.code_select_dropdown.options = self._get_codes() if not self.code_select_dropdown.options: - self.output.value = f"No codes found for default calcjob plugin '{self.default_calc_job_plugin}'." + self.output.value = f"No codes found for default calcjob plugin {self.default_calc_job_plugin!r}." self.code_select_dropdown.disabled = True else: self.code_select_dropdown.disabled = False diff --git a/aiidalab_widgets_base/elns.py b/aiidalab_widgets_base/elns.py index 99f2d63aa..64e27f234 100644 --- a/aiidalab_widgets_base/elns.py +++ b/aiidalab_widgets_base/elns.py @@ -23,7 +23,7 @@ def connect_to_eln(eln_instance=None, **kwargs): except (FileNotFoundError, json.JSONDecodeError, KeyError): return ( None, - f"Can't open '{ELN_CONFIG}' (ELN configuration file). Instance: {eln_instance}", + f"Can't open {ELN_CONFIG!r} (ELN configuration file). Instance: {eln_instance}", ) # If no ELN instance was specified, trying the default one. @@ -35,7 +35,7 @@ def connect_to_eln(eln_instance=None, **kwargs): eln_config = config[eln_instance] eln_type = eln_config.pop("eln_type", None) else: # The selected instance is not present in the config. - return None, f"Didn't find configuration for the '{eln_instance}' instance." + return None, f"Didn't find configuration for the {eln_instance!r} instance." # If the ELN type cannot be identified - aborting. if not eln_type: @@ -73,7 +73,7 @@ def __init__(self, path_to_root="../", **kwargs): if eln is None: url = f"{path_to_root}aiidalab-widgets-base/notebooks/eln_configure.ipynb" - error_message.value = f"""Warning! The access to ELN is not configured. Please follow <a href="{url}" target="_blank">the link</a> to configure it.</br> More details: {msg}""" + error_message.value = f"""Warning! The access to ELN is not configured. Please follow <a href={url!r} target="_blank">the link</a> to configure it.</br> More details: {msg!r}""" return tl.dlink((eln, "node"), (self, "node")) diff --git a/aiidalab_widgets_base/nodes.py b/aiidalab_widgets_base/nodes.py index 770d7caf1..371f4953f 100644 --- a/aiidalab_widgets_base/nodes.py +++ b/aiidalab_widgets_base/nodes.py @@ -308,7 +308,7 @@ def to_html_string(self): return f""" <table style="border-collapse:separate;border-spacing:15px;"> <tr> - <td style="width:200px"> <a href="{self.link}" target="_blank"> <img src="{self.logo}"> </a></td> + <td style="width:200px"> <a href={self.link!r} target="_blank"> <img src={self.logo!r}> </a></td> <td style="width:800px"> <p style="font-size:16px;">{self.description} </p></td> </tr> </table> diff --git a/aiidalab_widgets_base/structures.py b/aiidalab_widgets_base/structures.py index 48688d2bc..df19c1fd5 100644 --- a/aiidalab_widgets_base/structures.py +++ b/aiidalab_widgets_base/structures.py @@ -1,5 +1,4 @@ """Module to provide functionality to import structures.""" - import datetime import functools import io @@ -14,7 +13,7 @@ from aiida import engine, orm, plugins # Local imports -from .data import LigandSelectorWidget +from .data import FunctionalGroupSelectorWidget from .utils import StatusHTML, exceptions, get_ase_from_file, get_formula from .viewers import StructureDataViewer @@ -39,9 +38,7 @@ class StructureManagerWidget(ipw.VBox): input_structure = tl.Union( [tl.Instance(ase.Atoms), tl.Instance(orm.Data)], allow_none=True ) - structure = tl.Union( - [tl.Instance(ase.Atoms), tl.Instance(orm.Data)], allow_none=True - ) + structure = tl.Instance(ase.Atoms, allow_none=True) structure_node = tl.Instance(orm.Data, allow_none=True, read_only=True) node_class = tl.Unicode() @@ -84,8 +81,8 @@ def __init__( if viewer: self.viewer = viewer else: - self.viewer = StructureDataViewer(**kwargs) - tl.dlink((self, "structure_node"), (self.viewer, "structure")) + self.viewer = StructureDataViewer() + tl.dlink((self, "structure"), (self.viewer, "structure")) # Store button. self.btn_store = ipw.Button(description="Store in AiiDA", disabled=True) @@ -184,6 +181,10 @@ def _structure_editors(self, editors): for i, editor in enumerate(editors): editors_tab.set_title(i, editor.title) tl.link((editor, "structure"), (self, "structure")) + if editor.has_trait("input_selection"): + tl.dlink( + (editor, "input_selection"), (self.viewer, "input_selection") + ) if editor.has_trait("selection"): tl.link((editor, "selection"), (self.viewer, "selection")) if editor.has_trait("camera_orientation"): @@ -336,6 +337,7 @@ def _structure_changed(self, change=None): This function enables/disables `btn_store` widget if structure is provided/set to None. Also, the function sets `structure_node` trait to the selected node type. """ + if not self.structure_set_by_undo: self.history.append(change["new"]) @@ -1051,7 +1053,7 @@ def disable_element(_=None): self.element.disabled = True # Ligand selection. - self.ligand = LigandSelectorWidget() + self.ligand = FunctionalGroupSelectorWidget() self.ligand.observe(disable_element, names="value") # Add atom. @@ -1262,6 +1264,8 @@ def translate_dr(self, _=None, atoms=None, selection=None): self.action_vector * self.displacement.value ) + self.input_selection = None # Clear selection. + self.structure, self.input_selection = atoms, selection @_register_structure @@ -1271,7 +1275,7 @@ def translate_dxdydz(self, _=None, atoms=None, selection=None): # The action. atoms.positions[self.selection] += np.array(self.str2vec(self.dxyz.value)) - + self.input_selection = None # Clear selection. self.structure, self.input_selection = atoms, selection @_register_structure @@ -1281,7 +1285,7 @@ def translate_to_xyz(self, _=None, atoms=None, selection=None): # The action. geo_center = np.average(self.structure[self.selection].get_positions(), axis=0) atoms.positions[self.selection] += self.str2vec(self.dxyz.value) - geo_center - + self.input_selection = None # Clear selection. self.structure, self.input_selection = atoms, selection @_register_structure @@ -1295,6 +1299,7 @@ def rotate(self, _=None, atoms=None, selection=None): center = self.str2vec(self.point.value) rotated_subset.rotate(self.phi.value, v=vec, center=center, rotate_cell=False) atoms.positions[self.selection] = rotated_subset.positions + self.input_selection = None # Clear selection. self.structure, self.input_selection = atoms, selection @@ -1329,6 +1334,8 @@ def mirror(self, _=None, norm=None, point=None, atoms=None, selection=None): # Mirror atoms. atoms.positions[selection] -= 2 * projections + self.input_selection = None # Clear selection. + self.structure, self.input_selection = atoms, selection def mirror_3p(self, _=None): @@ -1375,6 +1382,7 @@ def mod_element(self, _=None, atoms=None, selection=None): initial_ligand = self.ligand.rotate( align_to=self.action_vector, remove_anchor=True ) + for idx in self.selection: position = self.structure.positions[idx].copy() lgnd = initial_ligand.copy() @@ -1390,6 +1398,7 @@ def mod_element(self, _=None, atoms=None, selection=None): @_register_selection def copy_sel(self, _=None, atoms=None, selection=None): """Copy selected atoms and shift by 1.0 A along X-axis.""" + last_atom = atoms.get_global_number_of_atoms() # The action @@ -1397,15 +1406,15 @@ def copy_sel(self, _=None, atoms=None, selection=None): add_atoms.translate([1.0, 0, 0]) atoms += add_atoms - new_selection = list(range(last_atom, last_atom + len(selection))) - self.structure, self.input_selection = atoms, new_selection + self.structure, self.input_selection = atoms, list( + range(last_atom, last_atom + len(selection)) + ) @_register_structure @_register_selection def add(self, _=None, atoms=None, selection=None): """Add atoms.""" last_atom = atoms.get_global_number_of_atoms() - if self.ligand.value == 0: initial_ligand = ase.Atoms([ase.Atom(self.element.value, [0, 0, 0])]) rad = SYMBOL_RADIUS[self.element.value] @@ -1431,6 +1440,8 @@ def add(self, _=None, atoms=None, selection=None): new_selection = list(range(last_atom, last_atom + len(selection) * len(lgnd))) + # The order of the traitlets below is important - + # we must be sure trait atoms is set before trait selection self.structure, self.input_selection = atoms, new_selection @_register_structure @@ -1439,6 +1450,7 @@ def remove(self, _=None, atoms=None, selection=None): """Remove selected atoms.""" del [atoms[selection]] + # The order of the traitlets below is important - + # we must be sure trait atoms is set before trait selection self.structure = atoms self.input_selection = None - self.input_selection = [] diff --git a/aiidalab_widgets_base/utils/__init__.py b/aiidalab_widgets_base/utils/__init__.py index 4b8b0b370..b8aa8565a 100644 --- a/aiidalab_widgets_base/utils/__init__.py +++ b/aiidalab_widgets_base/utils/__init__.py @@ -34,7 +34,7 @@ def predefine_settings(obj, **kwargs): if hasattr(obj, key): setattr(obj, key, value) else: - raise AttributeError(f"'{obj}' object has no attribute '{key}'") + raise AttributeError(f"{obj!r} object has no attribute {key!r}") def get_ase_from_file(fname, file_format=None): # pylint: disable=redefined-builtin diff --git a/aiidalab_widgets_base/utils/exceptions.py b/aiidalab_widgets_base/utils/exceptions.py index 452419c76..148928670 100644 --- a/aiidalab_widgets_base/utils/exceptions.py +++ b/aiidalab_widgets_base/utils/exceptions.py @@ -3,5 +3,5 @@ class ListOrTuppleError(TypeError): def __init__(self, value): super().__init__( - f"The provided value '{value}' is not a list or a tupple, but a {type(value)}." + f"The provided value {value!r} is not a list or a tupple, but a {type(value)}." ) diff --git a/aiidalab_widgets_base/viewers.py b/aiidalab_widgets_base/viewers.py index 77de9f98e..88dd987bc 100644 --- a/aiidalab_widgets_base/viewers.py +++ b/aiidalab_widgets_base/viewers.py @@ -1,15 +1,18 @@ +from __future__ import annotations + """Jupyter viewers for AiiDA data objects.""" # pylint: disable=no-self-use import base64 +import copy import re import warnings -from copy import deepcopy import ase import ipywidgets as ipw import nglview import numpy as np +import shortuuid import spglib import traitlets as tl import vapory @@ -123,18 +126,148 @@ def __init__(self, parameter, downloadable=True, **kwargs): super().__init__([self.widget], **kwargs) +class NglViewerRepresentation(ipw.HBox): + """This class represents the parameters for displaying a structure in NGLViewer. + + It is utilized in the structure viewer, where multiple representations can be defined, + each specifying how to visually represent a particular subset of atoms. + """ + + viewer_class = None # The structure viewer class that contains this representation. + + def __init__(self, uuid, indices=None, deletable=True, atom_show_threshold=1): + """Initialize the representation. + + uuid: str + Unique identifier for the representation. + indices: list + List of indices to be displayed. + deletable: bool + If True, add a button to delete the representation. + atom_show_threshold: int + only show the atom if the corresponding value in the representation array is larger or equal than this threshold. + """ + + self.atom_show_threshold = atom_show_threshold + self.uuid = uuid + + self.show = ipw.Checkbox( + value=True, + layout={"width": "40px"}, + style={"description_width": "0px"}, + disabled=False, + ) + + self.selection = ipw.Text( + value=list_to_string_range(indices, shift=1) if indices is not None else "", + layout={"width": "80px"}, + style={"description_width": "0px"}, + ) + self.type = ipw.Dropdown( + options=["ball+stick", "spacefill"], + value="ball+stick", + disabled=False, + layout={"width": "100px"}, + style={"description_width": "0px"}, + ) + self.size = ipw.FloatText( + value=3, + layout={"width": "40px"}, + style={"description_width": "0px"}, + ) + self.color = ipw.Dropdown( + options=["element", "red", "green", "blue", "yellow", "orange", "purple"], + value="element", + disabled=False, + layout={"width": "80px"}, + style={"description_width": "initial"}, + ) + + # Delete button. + self.delete_button = ipw.Button( + description="", + icon="trash", + button_style="danger", + layout={ + "width": "50px", + "visibility": "visible" if deletable else "hidden", + }, + ) + self.delete_button.on_click(self.delete_myself) + + super().__init__( + children=[ + self.show, + self.selection, + self.type, + self.size, + self.color, + self.delete_button, + ] + ) + + def delete_myself(self, _): + self.viewer_class.delete_representation(self) + + def sync_myself_to_array_from_atoms_object(self, structure: ase.Atoms | None): + """Update representation from the structure object.""" + if structure: + if self.uuid in structure.arrays: + self.selection.value = list_to_string_range( + np.where(self.atoms_in_representaion(structure))[0], shift=1 + ) + + def add_myself_to_atoms_object(self, structure: ase.Atoms | None): + """Add representation array to the structure object. If the array already exists, update it.""" + if structure: + array_representation = np.full(len(structure), -1, dtype=int) + selection = np.array( + string_range_to_list(self.selection.value, shift=-1)[0], dtype=int + ) + # Only attempt to display the existing atoms. + array_representation[selection[selection < len(structure)]] = 1 + structure.set_array(self.uuid, array_representation) + + def atoms_in_representaion(self, structure: ase.Atoms | None = None): + """Return an array of booleans indicating which atoms are present in the representation.""" + if structure: + if self.uuid in structure.arrays: + return structure.arrays[self.uuid] >= self.atom_show_threshold + return None + + def nglview_parameters(self, indices): + """Return the parameters dictionary of a representation.""" + nglview_parameters_dict = { + "type": self.type.value, + "params": { + "sele": "@" + ",".join(map(str, indices)) + if len(indices) > 0 + else "none", + "opacity": 1, + "color": self.color.value, + }, + } + if self.type.value == "ball+stick": + nglview_parameters_dict["params"]["aspectRatio"] = self.size.value + else: + nglview_parameters_dict["params"]["radiusScale"] = 0.1 * self.size.value + + return nglview_parameters_dict + + class _StructureDataBaseViewer(ipw.VBox): """Base viewer class for AiiDA structure or trajectory objects. - :param configure_view: If True, add configuration tabs (deprecated) - :type configure_view: bool - :param configuration_tabs: List of configuration tabs (default: ["Selection", "Appearance", "Cell", "Download"]) - :type configure_view: list - :param default_camera: default camera (orthographic|perspective), can be changed in the Appearance tab - :type default_camera: string - + Traits: + _all_representations: list, containing all the representations of the structure. + input_selection: list used mostly by external tools to populate the selection field. + selection: list of currently selected atoms. + displayed_selection: list of currently displayed atoms in the displayed structure, which also includes super-cell. + supercell: list of supercell dimensions. + cell: ase.cell.Cell object. """ + _all_representations = tl.List() input_selection = tl.List(tl.Int(), allow_none=True) selection = tl.List(tl.Int()) displayed_selection = tl.List(tl.Int()) @@ -143,6 +276,8 @@ class _StructureDataBaseViewer(ipw.VBox): DEFAULT_SELECTION_OPACITY = 0.2 DEFAULT_SELECTION_RADIUS = 6 DEFAULT_SELECTION_COLOR = "green" + REPRESENTATION_PREFIX = "_aiidalab_viewer_representation_" + DEFAULT_REPRESENTATION = "_aiidalab_viewer_representation_default" def __init__( self, @@ -151,6 +286,12 @@ def __init__( default_camera="orthographic", **kwargs, ): + """Initialize the viewer. + + :param configure_view: If True, add configuration tabs (deprecated). + :param configuration_tabs: List of configuration tabs (default: ["Selection", "Appearance", "Cell", "Download"]). + :param default_camera: default camera (orthographic|perspective), can be changed in the Appearance tab. + """ # Defining viewer box. # Nglviwer @@ -222,13 +363,9 @@ def _selection_tab(self): # 4. Button to clear selection. clear_selection = ipw.Button(description="Clear selection") - # clear_selection.on_click(lambda _: self.set_trait('selection', list())) # lambda cannot contain assignments clear_selection.on_click( - lambda _: ( - self.set_trait("displayed_selection", []), - self.set_trait("selection", []), - ) - ) + lambda _: self.set_trait("displayed_selection", []) + ) # lambda cannot contain assignments # 5. Button to apply selection apply_displayed_selection = ipw.Button(description="Apply selection") @@ -274,11 +411,20 @@ def change_supercell(_=None): for elem in _supercell: elem.observe(change_supercell, names="value") supercell_selector = ipw.HBox( - [ipw.HTML(description="Super cell:")] + _supercell + [ + ipw.HTML( + description="Super cell:", style={"description_width": "initial"} + ) + ] + + _supercell ) # 2. Choose background color. - background_color = ipw.ColorPicker(description="Background") + background_color = ipw.ColorPicker( + description="Background", + style={"description_width": "initial"}, + layout={"width": "200px"}, + ) tl.link((background_color, "value"), (self._viewer, "background")) background_color.value = "white" @@ -300,10 +446,147 @@ def change_camera(change): center_button = ipw.Button(description="Center molecule") center_button.on_click(lambda c: self._viewer.center()) + # 5. representations buttons + self.representations_header = ipw.HBox( + [ + ipw.HTML( + """<p style="text-align:center">Show</p>""", + layout={"width": "40px"}, + ), + ipw.HTML( + """<p style="text-align:center">Atoms</p>""", + layout={"width": "80px"}, + ), + ipw.HTML( + """<p style="text-align:center">Type</p>""", + layout={"width": "100px"}, + ), + ipw.HTML( + """<p style="text-align:center">Size</p>""", + layout={"width": "40px"}, + ), + ipw.HTML( + """<p style="text-align:center">Color</p>""", + layout={"width": "80px"}, + ), + ipw.HTML( + """<p style="text-align:center">Delete</p>""", + layout={"width": "50px"}, + ), + ] + ) + self.atoms_not_represented = ipw.HTML() + add_new_representation_button = ipw.Button( + description="Add representation", button_style="info" + ) + add_new_representation_button.on_click(self._add_representation) + + apply_representations = ipw.Button(description="Apply representations") + apply_representations.on_click(self._apply_representations) + self.representation_output = ipw.VBox() + + # The default representation is always present and cannot be deleted. + self._all_representations = [ + NglViewerRepresentation( + uuid=self.DEFAULT_REPRESENTATION, + deletable=False, + atom_show_threshold=0, + ) + ] + + representation_accordion = ipw.Accordion( + children=[ + ipw.VBox( + [ + self.representations_header, + self.representation_output, + self.atoms_not_represented, + ipw.HBox( + [apply_representations, add_new_representation_button] + ), + ] + ) + ], + ) + representation_accordion.set_title(0, "Representations") + representation_accordion.selected_index = None + return ipw.VBox( - [supercell_selector, background_color, camera_type, center_button] + [ + supercell_selector, + background_color, + camera_type, + center_button, + representation_accordion, + ] + ) + + def _add_representation(self, _=None, uuid=None, indices=None): + """Add a representation to the list of representations.""" + self._all_representations = self._all_representations + [ + NglViewerRepresentation( + uuid=uuid or f"{self.REPRESENTATION_PREFIX}{shortuuid.uuid()}", + indices=indices, + ) + ] + self._apply_representations() + + def delete_representation(self, representation: NglViewerRepresentation): + try: + index = self._all_representations.index(representation) + except ValueError: + self.representation_add_message.message = f"""<span style="color:red">Error:</span> Rep. {representation} not found.""" + return + + self._all_representations = ( + self._all_representations[:index] + self._all_representations[index + 1 :] ) + if representation.uuid in self.structure.arrays: + del self.structure.arrays[representation.uuid] + del representation + self._apply_representations() + + @tl.observe("_all_representations") + def _observe_all_representations(self, change): + """Update the list of representations.""" + self.representation_output.children = change["new"] + if change["new"]: + self._all_representations[-1].viewer_class = self + + def _apply_representations(self, change=None): + """Apply the representations to the displayed structure.""" + rep_uuids = [] + + # Representation can only be applied if a structure is present. + if self.structure is None: + return + + # Add existing representations to the structure. + for representation in self._all_representations: + representation.add_myself_to_atoms_object(self.structure) + rep_uuids.append(representation.uuid) + + # Remove missing representations from the structure. + for array in self.structure.arrays: + if array.startswith(self.REPRESENTATION_PREFIX) and array not in rep_uuids: + del self.structure.arrays[array] + self._observe_structure({"new": self.structure}) + self._check_missing_atoms_in_representations() + + def _check_missing_atoms_in_representations(self): + missing_atoms = np.zeros(self.natoms) + for rep in self._all_representations: + missing_atoms += rep.atoms_in_representaion(self.structure) + missing_atoms = np.where(missing_atoms == 0)[0] + if len(missing_atoms) > 0: + self.atoms_not_represented.value = ( + "Atoms excluded from representations: " + + list_to_string_range(list(missing_atoms), shift=1) + ) + else: + self.atoms_not_represented.value = "" + @tl.observe("cell") def _observe_cell(self, _=None): # Updtate the Cell and Periodicity. @@ -491,7 +774,7 @@ def _render_structure(self, change=None): zfactor = np.linalg.norm(omat[0, 0:3]) omat[0:3, 0:3] = omat[0:3, 0:3] / zfactor - bb = deepcopy(self.displayed_structure) + bb = copy.deepcopy(self.displayed_structure) bb.pbc = (False, False, False) for i in bb: @@ -620,40 +903,69 @@ def _render_structure(self, change=None): def _on_atom_click(self, _=None): """Update selection when clicked on atom.""" - if "atom1" not in self._viewer.picked.keys(): - return # did not click on atom - index = self._viewer.picked["atom1"]["index"] - displayed_selection = self.displayed_selection.copy() - - if displayed_selection: - if index not in displayed_selection: - displayed_selection.append(index) + if hasattr(self._viewer, "component_0"): + # Did not click on atom: + if "atom1" not in self._viewer.picked.keys(): + return + + index = self._viewer.picked["atom1"]["index"] + + displayed_selection = self.displayed_selection.copy() + if displayed_selection: + if index not in displayed_selection: + displayed_selection.append(index) + else: + displayed_selection.remove(index) else: - displayed_selection.remove(index) - else: - displayed_selection = [index] - self.displayed_selection = displayed_selection + displayed_selection = [index] + self.displayed_selection = displayed_selection def highlight_atoms( self, - vis_list, - color=DEFAULT_SELECTION_COLOR, - size=DEFAULT_SELECTION_RADIUS, - opacity=DEFAULT_SELECTION_OPACITY, + list_of_atoms, ): """Highlighting atoms according to the provided list.""" if not hasattr(self._viewer, "component_0"): return - self._viewer._remove_representations_by_name( - repr_name="selected_atoms" - ) # pylint:disable=protected-access - self._viewer.add_ball_and_stick( # pylint:disable=no-member - name="selected_atoms", - selection=[] if vis_list is None else vis_list, - color=color, - aspectRatio=size, - opacity=opacity, - ) + + # Create the dictionaries for highlight_representations. + for i, representation in enumerate(self._all_representations): + # First remove the previous highlight_representation. + self._viewer._remove_representations_by_name( + repr_name=f"highlight_representation_{i}", component=0 + ) + + # Then add the new one if needed. + indices = np.intersect1d( + list_of_atoms, + np.where( + representation.atoms_in_representaion(self.displayed_structure) + )[0], + ) + if len(indices) > 0: + params = representation.nglview_parameters(indices) + params["params"]["name"] = f"highlight_representation_{i}" + params["params"]["opacity"] = 0.8 + params["params"]["color"] = "darkgreen" + params["params"]["component_index"] = 0 + if "radiusScale" in params["params"]: + params["params"]["radiusScale"] *= 1.2 + else: + params["params"]["aspectRatio"] *= 1.2 + + # Use directly the remote call for more flexibility. + self._viewer._remote_call( + "addRepresentation", + target="compList", + args=[params["type"]], + kwargs=params["params"], + ) + + def remove_viewer_components(self, c=None): + if hasattr(self._viewer, "component_0"): + self._viewer.component_0.clear_representations() + cid = self._viewer.component_0.id + self._viewer.remove_component(cid) @tl.default("supercell") def _default_supercell(self): @@ -665,12 +977,12 @@ def _observe_input_selection(self, value): return # Exclude everything that is beyond the total number of atoms. - selection_list = [x for x in value["new"] if x < self.natom] + selection_list = [x for x in value["new"] if x < self.natoms] # In the case of a super cell, we need to multiply the selection as well multiplier = sum(self.supercell) - 2 selection_list = [ - x + self.natom * i for x in selection_list for i in range(multiplier) + x + self.natoms * i for x in selection_list for i in range(multiplier) ] self.displayed_selection = selection_list @@ -678,7 +990,7 @@ def _observe_input_selection(self, value): @tl.observe("displayed_selection") def _observe_displayed_selection(self, _=None): seen = set() - seq = [x % self.natom for x in self.displayed_selection] + seq = [x % self.natoms for x in self.displayed_selection] self.selection = [x for x in seq if not (x in seen or seen.add(x))] self.highlight_atoms(self.displayed_selection) @@ -749,6 +1061,11 @@ def _prepare_payload(self, file_format=None): def thumbnail(self): return self._prepare_payload(file_format="png") + @property + def natoms(self): + """Number of atoms in the structure.""" + return 0 if self.structure is None else len(self.structure) + @register_viewer_widget("data.core.cif.CifData.") @register_viewer_widget("data.core.structure.StructureData.") @@ -766,7 +1083,12 @@ class StructureDataViewer(_StructureDataBaseViewer): """ structure = tl.Union( - [tl.Instance(ase.Atoms), tl.Instance(orm.Node)], allow_none=True + [ + tl.Instance(ase.Atoms), + tl.Instance(orm.StructureData), + tl.Instance(orm.CifData), + ], + allow_none=True, ) displayed_structure = tl.Instance(ase.Atoms, allow_none=True, read_only=True) pk = tl.Int(allow_none=True) @@ -774,60 +1096,98 @@ class StructureDataViewer(_StructureDataBaseViewer): def __init__(self, structure=None, **kwargs): super().__init__(**kwargs) self.structure = structure - self.natom = len(self.structure) if self.structure is not None else 0 @tl.observe("supercell") - def repeat(self, _=None): + def _observe_supercell(self, _=None): if self.structure is not None: + self.set_trait( + "displayed_structure", None + ) # To make sure the structure is always updated. self.set_trait("displayed_structure", self.structure.repeat(self.supercell)) @tl.validate("structure") - def _valid_structure(self, change): # pylint: disable=no-self-use + def _valid_structure(self, change): """Update structure.""" structure = change["value"] - - if structure is None: - return None # if no structure provided, the rest of the code can be skipped - if isinstance(structure, ase.Atoms): self.pk = None - return structure - if isinstance(structure, orm.Node): + elif isinstance(structure, (orm.StructureData, orm.CifData)): self.pk = structure.pk - return structure.get_ase() - raise TypeError( - f"Unsupported type {type(structure)}, structure must be one of the following types: " - "ASE Atoms object, AiiDA CifData or StructureData." - ) + structure = structure.get_ase() + + # Add default representation array if it is not present. + # This will make sure that the new structure is displayed at the beginning. + if self.DEFAULT_REPRESENTATION not in structure.arrays: + structure.set_array( + self.DEFAULT_REPRESENTATION, + np.zeros(len(structure), dtype=int), + ) + return structure # This also includes the case when the structure is None. @tl.observe("structure") - def _observe_structure(self, change): + def _observe_structure(self, change=None): """Update displayed_structure trait after the structure trait has been modified.""" - self.natom = len(self.structure) if self.structure is not None else 0 - # Remove the current structure(s) from the viewer. - if change["new"] is not None: - self.set_trait("displayed_structure", change["new"].repeat(self.supercell)) - self.set_trait("cell", change["new"].cell) - else: + structure = change["new"] + + self._viewer.clear_representations(component=0) + + if not structure: self.set_trait("displayed_structure", None) self.set_trait("cell", None) + return + + # Make sure that the representation arrays from structure are present in the viewer. + structure_uuids = [ + uuid + for uuid in structure.arrays + if uuid.startswith(self.REPRESENTATION_PREFIX) + ] + rep_uuids = [rep.uuid for rep in self._all_representations] + + for uuid in structure_uuids: + try: + index = rep_uuids.index(uuid) + self._all_representations[index].sync_myself_to_array_from_atoms_object( + structure + ) + except ValueError: + self._add_representation( + uuid=uuid, + indices=np.where(structure.arrays[self.uuid] >= 1)[0], + ) + # Empty atoms selection for the representations that are not present in the structure. + # Typically this happens when a new structure is imported. + for i, uuid in enumerate(rep_uuids): + if uuid not in structure_uuids: + self._all_representations[i].selection.value = "" + + self._observe_supercell() # To trigger an update of the displayed structure + self.set_trait("cell", structure.cell) @tl.observe("displayed_structure") - def _update_structure_viewer(self, change): + def _observe_displayed_structure(self, change): """Update the view if displayed_structure trait was modified.""" with self.hold_trait_notifications(): - for ( - comp_id - ) in self._viewer._ngl_component_ids: # pylint: disable=protected-access - self._viewer.remove_component(comp_id) - self.displayed_selection = [] - if change["new"] is not None: - self._viewer.add_component(nglview.ASEStructure(change["new"])) - self._viewer.clear() - self._viewer.add_ball_and_stick( - aspectRatio=4 - ) # pylint: disable=no-member - self._viewer.add_unitcell() # pylint: disable=no-member + self.remove_viewer_components() + if change["new"]: + self._viewer.add_component( + nglview.ASEStructure(self.displayed_structure), + default_representation=False, + name="Structure", + ) + nglview_params = [ + rep.nglview_parameters( + np.where(rep.atoms_in_representaion(self.displayed_structure))[ + 0 + ] + ) + for rep in self._all_representations + if rep.show.value + ] + self._viewer.set_representations(nglview_params, component=0) + self._viewer.add_unitcell() + self._viewer.center() + self.displayed_selection = [] def d_from(self, operand): point = np.array([float(i) for i in operand[1:-1].split(",")]) @@ -1011,7 +1371,7 @@ def add_info(indx, atom): return f"<p>Id: {indx + 1}; Symbol: {atom.symbol}; Coordinates: ({print_pos(atom.position)})</p>" # Unit and displayed cell atoms' selection. - info_selected_atoms = ( + info = ( f"<p>Selected atoms: {list_to_string_range(self.displayed_selection, shift=1)}</p>" + f"<p>Selected unit cell atoms: {list_to_string_range(self.selection, shift=1)}</p>" ) @@ -1025,14 +1385,13 @@ def add_info(indx, atom): # Report coordinates. if len(self.displayed_selection) == 1: - return info_selected_atoms + add_info( + info += add_info( self.displayed_selection[0], self.displayed_structure[self.displayed_selection[0]], ) # Report coordinates, distance and center. - if len(self.displayed_selection) == 2: - info = "" + elif len(self.displayed_selection) == 2: info += add_info( self.displayed_selection[0], self.displayed_structure[self.displayed_selection[0]], @@ -1045,14 +1404,13 @@ def add_info(indx, atom): distv = self.displayed_structure.get_distance( *self.displayed_selection, vector=True ) - info += f"<p>Distance: {dist:.3f} ({print_pos(distv)})</p><p>Geometric center: ({geom_center})</p>" - return info_selected_atoms + info - - info_natoms_geo_center = f"<p>{len(self.displayed_selection)} atoms selected</p><p>Geometric center: ({geom_center})</p>" + info += f"<p>Distance: {dist:.2f} ({print_pos(distv)})</p>" # Report angle geometric center and normal. - if len(self.displayed_selection) == 3: - angle = self.displayed_structure.get_angle(*self.displayed_selection) + elif len(self.displayed_selection) == 3: + angle = self.displayed_structure.get_angle(*self.displayed_selection).round( + 2 + ) normal = np.cross( *self.displayed_structure.get_distances( self.displayed_selection[1], @@ -1062,13 +1420,10 @@ def add_info(indx, atom): ) ) normal = normal / np.linalg.norm(normal) - return ( - info_selected_atoms - + f"<p>{info_natoms_geo_center}</p><p>Angle: {angle: .3f}</p><p>Normal: ({print_pos(normal)})</p>" - ) + info += f"<p>Angle: {angle}, Normal: ({print_pos(normal)})</p>" # Report dihedral angle and geometric center. - if len(self.displayed_selection) == 4: + elif len(self.displayed_selection) == 4: try: dihedral = self.displayed_structure.get_dihedral( *self.displayed_selection @@ -1076,12 +1431,13 @@ def add_info(indx, atom): dihedral_str = f"{dihedral:.3f}" except ZeroDivisionError: dihedral_str = "nan" - return ( - info_selected_atoms - + f"<p>{info_natoms_geo_center}</p><p>Dihedral angle: {dihedral_str}</p>" - ) + info += f"<p>Dihedral angle: {dihedral_str}</p>" - return info_selected_atoms + info_natoms_geo_center + return ( + info + + f"<p>Geometric center: ({geom_center})</p>" + + f"<p>{len(self.displayed_selection)} atoms selected</p>" + ) @tl.observe("displayed_selection") def _observe_displayed_selection_2(self, _=None): diff --git a/aiidalab_widgets_base/wizard.py b/aiidalab_widgets_base/wizard.py index 00691d0b4..9160b32ba 100644 --- a/aiidalab_widgets_base/wizard.py +++ b/aiidalab_widgets_base/wizard.py @@ -107,7 +107,7 @@ def __init__(self, steps, **kwargs): for widget in widgets: if not widget.has_trait("state"): raise TypeError( - f"The provided '{widget}' as wizard app step has no `state` trait. " + f"The provided {widget!r} as wizard app step has no `state` trait. " "It is expected that step classes are derived from the WizardAppWidgetStep class." ) widget.observe(self._update_step_state, names=["state"]) diff --git a/docs/source/conf.py b/docs/source/conf.py index 66cf0928d..46706aaad 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -94,6 +94,11 @@ # of the sidebar. html_logo = "_static/aiidalab_logo.png" + +html_theme_options = { + "navigation_with_keys": True, +} + # -- Modifications for Readthedocs ----------------------------------------
support different model styles for the structure, e.g. Sphere, Ball-and-Stick I am working on it migrating what we did for the empa_viewer, I will need the help of @yakutovicha to finalize it
Thanks for implementing this. Please assign me as a reviewer when done. I am interested in it. @cpignedoli would you mind tagging me for review as well? I am interested specifically in the render performance of your solution. In the current code, the style is reapplied upon each render, which makes it very janky when quickly switching between structures (in my case I am working on the TrajectoryViewer, where this is critical). Thanks! more than happy to have you all @superstar54 @danielhollas on board :) but I can anticipate that what was in empa_viewer was not really performant https://github.com/nanotech-empa/aiidalab-empa-surfaces/blob/318670658e7e7d090e9c84dac53626bca8b9a638/widgets/empa_viewer.py#L161
2022-10-19T14:32:26
0.0
[]
[]
aiidalab/aiidalab-widgets-base
aiidalab__aiidalab-widgets-base-372
fc0e7e16e6c69cca997cc0594b5c69563c7c773b
diff --git a/aiidalab_widgets_base/structures.py b/aiidalab_widgets_base/structures.py index df19c1fd5..c3f4ecea8 100644 --- a/aiidalab_widgets_base/structures.py +++ b/aiidalab_widgets_base/structures.py @@ -897,7 +897,53 @@ def __init__(self, title="Cell transform"): layout={"width": "initial"}, ) conventional_cell.on_click(self._to_conventional_cell) - + cell_parameters = ( + self.structure.get_cell_lengths_and_angles() + if self.structure + else [1, 0, 0, 0, 0, 0] + ) + self.cell_parameters = ipw.HBox( + [ + ipw.VBox( + [ + ipw.HTML( + description=["a(Å)", "b(Å)", "c(Å)", "α", "β", "γ"][i], + layout={"width": "30px"}, + ), + ipw.FloatText( + value=cell_parameters[i], layout={"width": "100px"} + ), + ] + ) + for i in range(6) + ] + ) + # cell transformation matrix (4x4) + self.cell_transformation = ipw.VBox( + [ + ipw.HBox( + [ + ipw.IntText(value=1 if i == j else 0, layout={"width": "60px"}) + for j in range(3) + ] + + [ipw.FloatText(value=0, layout={"width": "60px"})] + ) + for i in range(3) + ] + ) + apply_cell_parameters_button = ipw.Button(description="Apply cell parameters") + apply_cell_parameters_button.on_click(self._apply_cell_parameters) + self.scale_atoms_position = ipw.Checkbox( + description="Scale atoms position", + value=False, + indent=False, + ) + apply_cell_transformation = ipw.Button(description="Apply transformation") + apply_cell_transformation.on_click(self._apply_cell_transformation) + reset_transformatioin_button = ipw.Button( + description="Reset matrix", + ) + reset_transformatioin_button.on_click(self._reset_cell_transformation_matrix) super().__init__( children=[ ipw.HBox( @@ -907,6 +953,35 @@ def __init__(self, title="Cell transform"): ], ), self._status_message, + ipw.VBox( + [ + ipw.HTML( + "<b>Cell parameters:</b>", + layout={"margin": "20px 0px 10px 0px"}, + ), + self.cell_parameters, + ipw.HBox( + [ + apply_cell_parameters_button, + self.scale_atoms_position, + ] + ), + ], + layout={"margin": "0px 0px 0px 20px"}, + ), + ipw.VBox( + [ + ipw.HTML( + "<b>Cell Transformation:</b>", + layout={"margin": "20px 0px 10px 0px"}, + ), + self.cell_transformation, + ipw.HBox( + [apply_cell_transformation, reset_transformatioin_button] + ), + ], + layout={"margin": "0px 0px 0px 20px"}, + ), ], ) @@ -945,6 +1020,71 @@ def _to_standard_cell( pbc=[True, True, True], ) + @tl.observe("structure") + def _observe_structure(self, change): + """Update cell after the structure has been modified.""" + if change["new"] is not None: + cell_parameters = change["new"].cell.cellpar() + for i in range(6): + self.cell_parameters.children[i].children[1].value = round( + cell_parameters[i], 4 + ) + else: + for i in range(6): + self.cell_parameters.children[i].children[1].value = 0 + + @_register_structure + def _apply_cell_parameters(self, _=None, atoms=None): + """Apply the cell parameters to the structure.""" + # only update structure when atoms is not None. + cell_parameters = [ + self.cell_parameters.children[i].children[1].value for i in range(6) + ] + if atoms is not None: + atoms.set_cell( + ase.cell.Cell.fromcellpar(cell_parameters), + scale_atoms=self.scale_atoms_position.value, + ) + self.structure = atoms + + @_register_structure + def _apply_cell_transformation(self, _=None, atoms=None): + """Apply the transformation matrix to the structure.""" + from ase.build import make_supercell + + # only update structure when atoms is not None. + if atoms is not None: + mat = np.zeros((3, 3)) + translate = np.zeros(3) + for i in range(3): + translate[i] = self.cell_transformation.children[i].children[3].value + for j in range(3): + mat[i][j] = self.cell_transformation.children[i].children[j].value + # transformation matrix may not work due to singularity, or + # the number of generated atoms is not correct + try: + atoms = make_supercell(atoms, mat) + except Exception as e: + self._status_message.message = """ + <div class="alert alert-info"> + <strong>The transformation matrix is wrong! {}</strong> + </div> + """.format( + e + ) + return + # translate + atoms.translate(-atoms.cell.array.dot(translate)) + self.structure = atoms + + @_register_structure + def _reset_cell_transformation_matrix(self, _=None, atoms=None): + """Reset the transformation matrix to identity matrix.""" + for i in range(3): + for j in range(4): + self.cell_transformation.children[i].children[j].value = 0 + self.cell_transformation.children[i].children[i].value = 1 + class BasicStructureEditor(ipw.VBox): """
support building supercell. Bring up by @superstar54 from https://github.com/aiidalab/aiidalab-widgets-base/pull/327#issuecomment-1275101340 > Cell Transformation is a more general concept. If we use this term, it is better to include the general transformation matrix. > Please have a look at make_supercell method here. > https://wiki.fysik.dtu.dk/ase/ase/build/tools.html#ase.build.make_supercell
@superstar54, can you take care of this? If yes, please assign yourself. of course, this can be done only after #327 is merged. I have a quick check of the VESTA, I think we can implement a widget that very similar to this matrix transform editor. <img width="775" alt="image" src="https://user-images.githubusercontent.com/8831685/195422223-becd826a-2e60-4efa-892d-350e19f39b86.png"> > can you take care of this? If yes, please assign yourself. Sure, I will implement it. > > can you take care of this? If yes, please assign yourself. > > Sure, I will implement it. great, btw, #327 was merged. you can add the code there.
2022-10-19T05:37:36
0.0
[]
[]
elijahr/python-autopxd2
elijahr__python-autopxd2-55
014ebfbd2d375e93a647b1d04e2d379592634af7
diff --git a/autopxd/__init__.py b/autopxd/__init__.py index ec982e2..0dc4937 100644 --- a/autopxd/__init__.py +++ b/autopxd/__init__.py @@ -1,4 +1,3 @@ -import json import os import platform import re @@ -52,23 +51,37 @@ def _find_cl(): "ARM64": "arm64", }.get(platform.machine(), "x86") program_files = os.getenv("ProgramFiles(x86)") or os.getenv("ProgramFiles") + + if build_platform in ("x86", "x64"): + # Note the `x86.x64` here not related to cross compilation, but just + # poor naming of something which should have been called `x86_or_x64`. + require = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64" + else: + assert build_platform == "arm64" + require = "Microsoft.VisualStudio.Component.VC.Tools.ARM64" + cmd = [ os.path.join(program_files, r"Microsoft Visual Studio\Installer\vswhere.exe"), "-prerelease", "-latest", "-products", "*", - "-format", - "json", + "-requires", + require, + "-property", + "installationPath", "-utf8", - "-find", - rf"**\bin\Host{host_platform}\{build_platform}\cl.exe", ] try: - return json.loads(subprocess.check_output(cmd, encoding="utf-8"))[-1] - except (OSError, subprocess.CalledProcessError, IndexError) as ex: + install_dir = subprocess.check_output(cmd, encoding="utf-8").strip() + except subprocess.CalledProcessError as ex: raise RuntimeError("No suitable compiler available") from ex + with open(rf"{install_dir}\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt", encoding="ascii") as fd: + default_version = fd.read().strip() + + return rf"{install_dir}\VC\Tools\MSVC\{default_version}\bin\Host{host_platform}\{build_platform}\cl.exe" + def _preprocess_msvc(code, extra_cpp_args, debug): fd, source_file = tempfile.mkstemp(suffix=".c")
VSWhere search for cl.exe on Windows takes 500s on CI For instance this job on CI takes 537.18s for a pip install + pytest: https://github.com/elijahr/python-autopxd2/actions/runs/10784358066/job/29920722125 After more test, most of this time is taken by `"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -prerelease latest -format json -utf8 -find "**\bin\HostX64\x64\cl.exe"` My guess is the `**` pattern that may search in far too many places :/
see https://github.com/microsoft/vswhere/issues/318 You may be right about the `**`. Probably some code could be written to look in some expected places first, to optimize lookup for the "happy path", and then fall back to the slower `**` lookup. I don't have a Windows machine to experiment with.
2024-11-30T08:19:14
0.0
[]
[]
arangodb/nx-arangodb
arangodb__nx-arangodb-45
ea395a7c904e9448dfeb3ba3c0b1ae56cd8b8b2a
diff --git a/nx_arangodb/classes/dict/adj.py b/nx_arangodb/classes/dict/adj.py index 90931d26..dab0825b 100644 --- a/nx_arangodb/classes/dict/adj.py +++ b/nx_arangodb/classes/dict/adj.py @@ -775,19 +775,20 @@ def __init__( self.__getitem_helper_db: Callable[[str, str], EdgeAttrDict | EdgeKeyDict] self.__setitem_helper: Callable[[EdgeAttrDict | EdgeKeyDict, str, str], None] + self.__delitem_helper: Callable[[str | list[str]], None] if self.is_multigraph: self.__contains_helper = self.__contains__multigraph self.__getitem_helper_db = self.__getitem__multigraph_db self.__getitem_helper_cache = self.__getitem__multigraph_cache - self.__setitem_helper = self.__setitem__multigraph # type: ignore[assignment] # noqa - self.__delitem_helper = self.__delitem__multigraph + self.__setitem_helper = self.__setitem__multigraph # type: ignore[assignment] # noqa + self.__delitem_helper = self.__delitem__multigraph # type: ignore[assignment] # noqa self.__fetch_all_helper = self.__fetch_all_multigraph else: self.__contains_helper = self.__contains__graph self.__getitem_helper_db = self.__getitem__graph_db self.__getitem_helper_cache = self.__getitem__graph_cache - self.__setitem_helper = self.__setitem__graph # type: ignore[assignment] # noqa - self.__delitem_helper = self.__delitem__graph + self.__setitem_helper = self.__setitem__graph # type: ignore[assignment] + self.__delitem_helper = self.__delitem__graph # type: ignore[assignment] self.__fetch_all_helper = self.__fetch_all_graph @property @@ -1104,6 +1105,7 @@ def __delitem__(self, key: str) -> None: dst_node_id, self.graph.name, direction=self.traversal_direction.name, + can_return_multiple=self.is_multigraph, ) if not result: @@ -1112,12 +1114,14 @@ def __delitem__(self, key: str) -> None: self.__delitem_helper(result) - @key_is_string def __delitem__graph(self, edge_id: str) -> None: """Helper function for __delitem__ in Graphs.""" - self.graph.delete_edge(edge_id) + try: + self.graph.delete_edge(edge_id) + except DocumentDeleteError as e: + m = f"Failed to delete edge '{edge_id}' from Graph: {e}." + raise KeyError(m) - @key_is_string def __delitem__multigraph(self, edge_ids: list[str]) -> None: """Helper function for __delitem__ in MultiGraphs.""" # TODO: Consider separating **edge_ids** by edge collection, @@ -1641,7 +1645,6 @@ def propagate_edge_directed( dst_node_id: str, edge_key_or_attr_dict: EdgeKeyDict | EdgeAttrDict, ) -> None: - self.__set_adj_inner_dict(self.mirror, dst_node_id) self.mirror.data[dst_node_id].data[src_node_id] = edge_key_or_attr_dict def propagate_edge_directed_symmetric( @@ -1651,7 +1654,6 @@ def propagate_edge_directed_symmetric( ) -> None: propagate_edge_directed(src_node_id, dst_node_id, edge_key_or_attr_dict) propagate_edge_undirected(src_node_id, dst_node_id, edge_key_or_attr_dict) - self.__set_adj_inner_dict(self.mirror, src_node_id) self.mirror.data[src_node_id].data[dst_node_id] = edge_key_or_attr_dict propagate_edge_func = ( @@ -1664,37 +1666,46 @@ def propagate_edge_directed_symmetric( ) ) + set_adj_inner_dict_mirror = ( + self.mirror.__set_adj_inner_dict if self.is_directed else lambda *args: None + ) + if node_dict is not None: for node_id in node_dict.keys(): - self.__set_adj_inner_dict(self, node_id) + self.__set_adj_inner_dict(node_id) + set_adj_inner_dict_mirror(node_id) for src_node_id, inner_dict in adj_dict.items(): for dst_node_id, edge_or_edges in inner_dict.items(): - self.__set_adj_inner_dict(self, src_node_id) - self.__set_adj_inner_dict(self, dst_node_id) + self.__set_adj_inner_dict(src_node_id) + self.__set_adj_inner_dict(dst_node_id) + + set_adj_inner_dict_mirror(src_node_id) + set_adj_inner_dict_mirror(dst_node_id) + edge_attr_or_key_dict = set_edge_func( # type: ignore[operator] src_node_id, dst_node_id, edge_or_edges ) propagate_edge_func(src_node_id, dst_node_id, edge_attr_or_key_dict) - def __set_adj_inner_dict( - self, adj_outer_dict: AdjListOuterDict, node_id: str - ) -> AdjListInnerDict: - if node_id in adj_outer_dict.data: - return adj_outer_dict.data[node_id] + def __set_adj_inner_dict(self, node_id: str) -> AdjListInnerDict: + if node_id in self.data: + return self.data[node_id] adj_inner_dict = self.adjlist_inner_dict_factory() adj_inner_dict.src_node_id = node_id adj_inner_dict.FETCHED_ALL_DATA = True adj_inner_dict.FETCHED_ALL_IDS = True - adj_outer_dict.data[node_id] = adj_inner_dict + self.data[node_id] = adj_inner_dict return adj_inner_dict def _fetch_all(self) -> None: self.clear() + if self.is_directed: + self.mirror.clear() ( node_dict, diff --git a/nx_arangodb/classes/digraph.py b/nx_arangodb/classes/digraph.py index 4d313bed..e2bea65c 100644 --- a/nx_arangodb/classes/digraph.py +++ b/nx_arangodb/classes/digraph.py @@ -64,6 +64,7 @@ def __init__( self.clear_edges = self.clear_edges_override self.add_node = self.add_node_override self.remove_node = self.remove_node_override + self.reverse = self.reverse_override if ( not self.is_multigraph() @@ -86,6 +87,12 @@ def __init__( # def out_edges(self): # pass + def reverse_override(self, copy: bool = True) -> Any: + if copy is False: + raise NotImplementedError("In-place reverse is not supported yet.") + + return super().reverse(copy=True) + def clear_edges_override(self): logger.info("Note that clearing edges ony erases the edges in the local cache") for predecessor_dict in self._pred.data.values(): diff --git a/nx_arangodb/classes/multidigraph.py b/nx_arangodb/classes/multidigraph.py index db10c11e..d9a57f9e 100644 --- a/nx_arangodb/classes/multidigraph.py +++ b/nx_arangodb/classes/multidigraph.py @@ -1,3 +1,4 @@ +from copy import deepcopy from typing import Any, Callable, ClassVar import networkx as nx @@ -59,6 +60,10 @@ def __init__( **kwargs, ) + if self.graph_exists_in_db: + self.reverse = self.reverse_override + self.to_undirected = self.to_undirected_override + ####################### # Init helper methods # ####################### @@ -66,3 +71,54 @@ def __init__( ########################## # nx.MultiGraph Overides # ########################## + + def reverse_override(self, copy: bool = True) -> Any: + if copy is False: + raise NotImplementedError("In-place reverse is not supported yet.") + + return super().reverse(copy=True) + + def to_undirected_override(self, reciprocal=False, as_view=False): + if reciprocal is False: + return super().to_undirected(reciprocal=False, as_view=as_view) + + graph_class = self.to_undirected_class() + if as_view is True: + return nx.graphviews.generic_graph_view(self, graph_class) + + # deepcopy when not a view + G = graph_class() + G.graph.update(deepcopy(self.graph)) + G.add_nodes_from((n, deepcopy(d)) for n, d in self._node.items()) + + ###################### + # NOTE: Monkey patch # + ###################### + + # Old + # G.add_edges_from( + # (u, v, key, deepcopy(data)) + # for u, nbrs in self._adj.items() + # for v, keydict in nbrs.items() + # for key, data in keydict.items() + # if v in self._pred[u] and key in self._pred[u][v] + # ) + + # New: + G.add_edges_from( + (u, v, key, deepcopy(data)) + for u, nbrs in self._adj.items() + for v, keydict in nbrs.items() + for key, data in keydict.items() + if v in self._pred[u] # and key in self._pred[u][v] + ) + + # Reason: MultiGraphs in `nxadb` don't use integer-based keys for edges. + # They use ArangoDB Edge IDs. Therefore, the statement `key in self._pred[u][v]` + # will always be False in the context of MultiDiGraphs. For more details on why + # this adjustment is needed, see the `test_to_undirected_reciprocal` + # in `test_multidigraph.py`. + + ########################### + + return G
GA-163 | `test_multigraph` & `test_multidigraph`
2024-08-28T21:12:33
0.0
[]
[]
arangodb/nx-arangodb
arangodb__nx-arangodb-2
4d6ad3120dd3bbf23622a64a17fe1116a18d70c9
diff --git a/_nx_arangodb/__init__.py b/_nx_arangodb/__init__.py index 91366e48..0bf0e9b9 100644 --- a/_nx_arangodb/__init__.py +++ b/_nx_arangodb/__init__.py @@ -31,6 +31,11 @@ "functions": { # BEGIN: functions "betweenness_centrality", + "louvain_communities", + "louvain_partitions", + "modularity", + "pagerank", + "to_scipy_sparse_array", # END: functions }, "additional_docs": { @@ -40,7 +45,21 @@ }, "additional_parameters": { # BEGIN: additional_parameters - + "louvain_communities": { + "dtype : dtype or None, optional": "The data type (np.float32, np.float64, or None) to use for the edge weights in the algorithm. If None, then dtype is determined by the edge values.", + }, + "louvain_partitions": { + "dtype : dtype or None, optional": "The data type (np.float32, np.float64, or None) to use for the edge weights in the algorithm. If None, then dtype is determined by the edge values.", + }, + "modularity": { + "dtype : dtype or None, optional": "The data type (np.float32, np.float64, or None) to use for the edge weights in the algorithm. If None, then dtype is determined by the edge values.", + }, + "pagerank": { + "dtype : dtype or None, optional": "The data type (np.float32, np.float64, or None) to use for the edge weights in the algorithm. If None, then dtype is determined by the edge values.", + }, + "to_scipy_sparse_array": { + "dtype : dtype or None, optional": "The data type (np.float32, np.float64, or None) to use for the edge weights in the algorithm. If None, then dtype is determined by the edge values.", + }, # END: additional_parameters }, } @@ -91,8 +110,7 @@ def __call__(self, *args, **kwargs): sys.modules["cupy"] = Stub() sys.modules["numpy"] = Stub() - # sys.modules["pylibcugraph"] = Stub() # TODO Anthony: re-introduce when ready - sys.modules["python-arango"] = Stub() # TODO Anthony: Double check + sys.modules["python-arango"] = Stub() from _nx_arangodb.core import main diff --git a/nx_arangodb/__init__.py b/nx_arangodb/__init__.py index 4400a9f8..fcb0b7ac 100644 --- a/nx_arangodb/__init__.py +++ b/nx_arangodb/__init__.py @@ -10,10 +10,6 @@ from . import convert from .convert import * -# TODO Anthony: Do we need this? -# from . import convert_matrix -# from .convert_matrix import * - from . import algorithms from .algorithms import * diff --git a/nx_arangodb/algorithms/__init__.py b/nx_arangodb/algorithms/__init__.py index 570d5dd6..60bb5633 100644 --- a/nx_arangodb/algorithms/__init__.py +++ b/nx_arangodb/algorithms/__init__.py @@ -1,2 +1,4 @@ -from . import centrality +from . import centrality, community, link_analysis from .centrality import * +from .community import * +from .link_analysis import * diff --git a/nx_arangodb/algorithms/centrality/betweenness.py b/nx_arangodb/algorithms/centrality/betweenness.py index c8bd0f1b..2ec752b4 100644 --- a/nx_arangodb/algorithms/centrality/betweenness.py +++ b/nx_arangodb/algorithms/centrality/betweenness.py @@ -1,23 +1,23 @@ from networkx.algorithms.centrality import betweenness as nx_betweenness -from nx_arangodb.convert import _to_graph as _to_nx_arangodb_graph +from nx_arangodb.convert import _to_nxadb_graph, _to_nxcg_graph from nx_arangodb.utils import networkx_algorithm try: - import pylibcugraph as plc - from nx_cugraph.convert import _to_graph as _to_nx_cugraph_graph - from nx_cugraph.utils import _seed_to_int + import nx_cugraph as nxcg GPU_ENABLED = True + print("ANTHONY: GPU is enabled") except ModuleNotFoundError: GPU_ENABLED = False + print("ANTHONY: GPU is disabled") __all__ = ["betweenness_centrality"] -# 1. If GPU is enabled, call nx-cugraph bc() after converting to a nx_cugraph graph (in-memory graph) -# 2. If GPU is not enabled, call networkx bc() after converting to a networkx graph (in-memory graph) -# 3. If GPU is not enabled, call networkx bc() **without** converting to a networkx graph (remote graph) +# 1. If GPU is enabled, call nx-cugraph bc() after converting to an ncxg graph (in-memory graph) +# 2. If GPU is not enabled, call networkx bc() after converting to an nxadb graph (in-memory graph) +# 3. If GPU is not enabled, call networkx bc() **without** converting to a nxadb graph (remote graph) @networkx_algorithm( @@ -33,32 +33,19 @@ def betweenness_centrality( # 1. if GPU_ENABLED and run_on_gpu: - print("ANTHONY: GPU is enabled. Using nx-cugraph bc()") - - if weight is not None: - raise NotImplementedError( - "Weighted implementation of betweenness centrality not currently supported" - ) - - seed = _seed_to_int(seed) - G = _to_nx_cugraph_graph(G, weight) - node_ids, values = plc.betweenness_centrality( - resource_handle=plc.ResourceHandle(), - graph=G._get_plc_graph(), - k=k, - random_state=seed, - normalized=normalized, - include_endpoints=endpoints, - do_expensive_check=False, - ) + print("ANTHONY: to_nxcg") + G = _to_nxcg_graph(G, weight) - return G._nodearrays_to_dict(node_ids, values) + print("ANTHONY: Using nxcg bc()") + return nxcg.betweenness_centrality(G, k=k, normalized=normalized, weight=weight) # 2. else: - print("ANTHONY: GPU is disabled. Using nx bc()") - G = _to_nx_arangodb_graph(G) + print("ANTHONY: to_nxadb") + G = _to_nxadb_graph(G) + + print("ANTHONY: Using nx bc()") betweenness = dict.fromkeys(G, 0.0) # b[v]=0 for v in G if k is None: @@ -93,5 +80,3 @@ def betweenness_centrality( ) return betweenness - - # 3. TODO diff --git a/nx_arangodb/algorithms/community/__init__.py b/nx_arangodb/algorithms/community/__init__.py new file mode 100644 index 00000000..5b43a3e4 --- /dev/null +++ b/nx_arangodb/algorithms/community/__init__.py @@ -0,0 +1,1 @@ +from .louvain import * diff --git a/nx_arangodb/algorithms/community/louvain.py b/nx_arangodb/algorithms/community/louvain.py new file mode 100644 index 00000000..3aa77857 --- /dev/null +++ b/nx_arangodb/algorithms/community/louvain.py @@ -0,0 +1,144 @@ +from collections import deque + +import networkx as nx + +from nx_arangodb.convert import _to_nxadb_graph, _to_nxcg_graph +from nx_arangodb.utils import _dtype_param, networkx_algorithm + +try: + import nx_cugraph as nxcg + + GPU_ENABLED = True + print("ANTHONY: GPU is enabled") +except ModuleNotFoundError: + GPU_ENABLED = False + print("ANTHONY: GPU is disabled") + + +@networkx_algorithm( + extra_params={ + **_dtype_param, + }, + is_incomplete=True, # seed not supported; self-loops not supported + is_different=True, # RNG different + version_added="23.10", + _plc="louvain", + name="louvain_communities", +) +def louvain_communities( + G, + weight="weight", + resolution=1, + threshold=0.0000001, + max_level=None, + seed=None, + run_on_gpu=True, +): + if GPU_ENABLED and run_on_gpu: + print("ANTHONY: to_nxcg") + G = _to_nxcg_graph(G, weight) + + print("ANTHONY: Using nxcg louvain()") + return nxcg.algorithms.community.louvain._louvain_communities( + G, + weight=weight, + resolution=resolution, + threshold=threshold, + max_level=max_level, + seed=seed, + ) + + else: + print("ANTHONY: to_nxadb") + G = _to_nxadb_graph(G) + + print("ANTHONY: Using nx pagerank()") + import random + + d = louvain_partitions(G, weight, resolution, threshold, random.Random()) + q = deque(d, maxlen=1) + return q.pop() + + +@networkx_algorithm( + extra_params={ + **_dtype_param, + }, + is_incomplete=True, # seed not supported; self-loops not supported + is_different=True, # RNG different + version_added="23.10", + _plc="louvain", + name="louvain_partitions", +) +def louvain_partitions( + G, weight="weight", resolution=1, threshold=0.0000001, seed=None +): + partition = [{u} for u in G.nodes()] + if nx.is_empty(G): + yield partition + return + mod = modularity(G, partition, resolution=resolution, weight=weight) + is_directed = G.is_directed() + if G.is_multigraph(): + graph = nx.community._convert_multigraph(G, weight, is_directed) + else: + graph = G.__class__() + graph.add_nodes_from(G) + graph.add_weighted_edges_from(G.edges(data=weight, default=1)) + + m = graph.size(weight="weight") + partition, inner_partition, improvement = nx.community.louvain._one_level( + graph, m, partition, resolution, is_directed, seed + ) + improvement = True + while improvement: + # gh-5901 protect the sets in the yielded list from further manipulation here + yield [s.copy() for s in partition] + new_mod = modularity( + graph, inner_partition, resolution=resolution, weight="weight" + ) + if new_mod - mod <= threshold: + return + mod = new_mod + graph = nx.community.louvain._gen_graph(graph, inner_partition) + partition, inner_partition, improvement = nx.community.louvain._one_level( + graph, m, partition, resolution, is_directed, seed + ) + + +@networkx_algorithm( + extra_params={ + **_dtype_param, + }, + is_incomplete=True, # seed not supported; self-loops not supported + is_different=True, # RNG different + version_added="23.10", +) +def modularity(G, communities, weight="weight", resolution=1): + if not isinstance(communities, list): + communities = list(communities) + # if not is_partition(G, communities): + # raise NotAPartition(G, communities) + + directed = G.is_directed() + if directed: + out_degree = dict(G.out_degree(weight=weight)) + in_degree = dict(G.in_degree(weight=weight)) + m = sum(out_degree.values()) + norm = 1 / m**2 + else: + out_degree = in_degree = dict(G.degree(weight=weight)) + deg_sum = sum(out_degree.values()) + m = deg_sum / 2 + norm = 1 / deg_sum**2 + + def community_contribution(community): + comm = set(community) + L_c = sum(wt for u, v, wt in G.edges(comm, data=weight, default=1) if v in comm) + + out_degree_sum = sum(out_degree[u] for u in comm) + in_degree_sum = sum(in_degree[u] for u in comm) if directed else out_degree_sum + + return L_c / m - resolution * out_degree_sum * in_degree_sum * norm + + return sum(map(community_contribution, communities)) diff --git a/nx_arangodb/algorithms/link_analysis/__init__.py b/nx_arangodb/algorithms/link_analysis/__init__.py new file mode 100644 index 00000000..7e957e4f --- /dev/null +++ b/nx_arangodb/algorithms/link_analysis/__init__.py @@ -0,0 +1,1 @@ +from .pagerank_alg import * diff --git a/nx_arangodb/algorithms/link_analysis/pagerank_alg.py b/nx_arangodb/algorithms/link_analysis/pagerank_alg.py new file mode 100644 index 00000000..d8f0212c --- /dev/null +++ b/nx_arangodb/algorithms/link_analysis/pagerank_alg.py @@ -0,0 +1,128 @@ +import networkx as nx + +from nx_arangodb.convert import _to_nxadb_graph, _to_nxcg_graph +from nx_arangodb.utils import _dtype_param, networkx_algorithm + +try: + import nx_cugraph as nxcg + + GPU_ENABLED = True + print("ANTHONY: GPU is enabled") +except ModuleNotFoundError: + GPU_ENABLED = False + print("ANTHONY: GPU is disabled") + + +@networkx_algorithm( + extra_params=_dtype_param, + is_incomplete=True, # dangling not supported + version_added="23.12", + _plc={"pagerank", "personalized_pagerank"}, +) +def pagerank( + G, + alpha=0.85, + personalization=None, + max_iter=100, + tol=1.0e-6, + nstart=None, + weight="weight", + dangling=None, + *, + dtype=None, + run_on_gpu=True, +): + print("ANTHONY: Calling pagerank from nx_arangodb") + + # 1. + if GPU_ENABLED and run_on_gpu: + print("ANTHONY: to_nxcg") + G = _to_nxcg_graph(G, weight) + + print("ANTHONY: Using nxcg pagerank()") + return nxcg.pagerank( + G, + alpha=alpha, + personalization=personalization, + max_iter=max_iter, + tol=tol, + nstart=nstart, + weight=weight, + dangling=dangling, + dtype=dtype, + ) + + # 2. + else: + print("ANTHONY: to_nxadb") + G = _to_nxadb_graph(G) + + print("ANTHONY: Using nx pagerank()") + return nx.algorithms.link_analysis.pagerank_alg._pagerank_scipy( + G, + alpha=alpha, + personalization=personalization, + max_iter=max_iter, + tol=tol, + nstart=nstart, + weight=weight, + dangling=dangling, + ) + + +@networkx_algorithm( + extra_params=_dtype_param, + version_added="23.12", +) +def to_scipy_sparse_array(G, nodelist=None, dtype=None, weight="weight", format="csr"): + import scipy as sp + + if len(G) == 0: + raise nx.NetworkXError("Graph has no nodes or edges") + + if nodelist is None: + nodelist = list(G) + nlen = len(G) + else: + nlen = len(nodelist) + if nlen == 0: + raise nx.NetworkXError("nodelist has no nodes") + nodeset = set(G.nbunch_iter(nodelist)) + if nlen != len(nodeset): + for n in nodelist: + if n not in G: + raise nx.NetworkXError(f"Node {n} in nodelist is not in G") + raise nx.NetworkXError("nodelist contains duplicates.") + if nlen < len(G): + G = G.subgraph(nodelist) + + index = dict(zip(nodelist, range(nlen))) + coefficients = zip( + *((index[u], index[v], wt) for u, v, wt in G.edges(data=weight, default=1)) + ) + try: + row, col, data = coefficients + except ValueError: + # there is no edge in the subgraph + row, col, data = [], [], [] + + if G.is_directed(): + A = sp.sparse.coo_array((data, (row, col)), shape=(nlen, nlen), dtype=dtype) + else: + # symmetrize matrix + d = data + data + r = row + col + c = col + row + # selfloop entries get double counted when symmetrizing + # so we subtract the data on the diagonal + selfloops = list(nx.selfloop_edges(G, data=weight, default=1)) + if selfloops: + diag_index, diag_data = zip(*((index[u], -wt) for u, v, wt in selfloops)) + d += diag_data + r += diag_index + c += diag_index + A = sp.sparse.coo_array((d, (r, c)), shape=(nlen, nlen), dtype=dtype) + try: + return A.asformat(format) + except ValueError as err: + raise nx.NetworkXError(f"Unknown sparse matrix format: {format}") from err diff --git a/nx_arangodb/classes/digraph.py b/nx_arangodb/classes/digraph.py index a3add415..838f2dc9 100644 --- a/nx_arangodb/classes/digraph.py +++ b/nx_arangodb/classes/digraph.py @@ -1,4 +1,8 @@ +import os + import networkx as nx +from arango import ArangoClient +from arango.database import StandardDatabase import nx_arangodb as nxadb from nx_arangodb.classes.graph import Graph @@ -12,3 +16,168 @@ class DiGraph(nx.DiGraph, Graph): @classmethod def to_networkx_class(cls) -> type[nx.DiGraph]: return nx.DiGraph + + def __init__( + self, + *args, + **kwargs, + ): + super().__init__(*args, **kwargs) + + self.__db = None + self.__graph_name = None + self.__graph_exists = False + + self.graph_loader_parallelism = None + self.graph_loader_batch_size = None + + self.use_node_and_adj_dict_cache = False + self.use_coo_cache = False + + self.src_indices = None + self.dst_indices = None + self.vertex_ids_to_index = None + + self.set_db() + if self.__db is not None: + self.set_graph_name() + + @property + def db(self) -> StandardDatabase: + if self.__db is None: + raise ValueError("Database not set") + + return self.__db + + @property + def graph_name(self) -> str: + if self.__graph_name is None: + raise ValueError("Graph name not set") + + return self.__graph_name + + @property + def graph_exists(self) -> bool: + return self.__graph_exists + + @property + def db(self) -> StandardDatabase: + if self.__db is None: + raise ValueError("Database not set") + + return self.__db + + @property + def graph_name(self) -> str: + if self.__graph_name is None: + raise ValueError("Graph name not set") + + return self.__graph_name + + @property + def graph_exists(self) -> bool: + return self.__graph_exists + + def clear_coo_cache(self): + self.src_indices = None + self.dst_indices = None + self.vertex_ids_to_index = None + + def set_db(self, db: StandardDatabase | None = None): + if db is not None: + if not isinstance(db, StandardDatabase): + raise TypeError( + "**db** must be an instance of arango.database.StandardDatabase" + ) + + self.__db = db + return + + self.__host = os.getenv("DATABASE_HOST") + self.__username = os.getenv("DATABASE_USERNAME") + self.__password = os.getenv("DATABASE_PASSWORD") + self.__db_name = os.getenv("DATABASE_NAME") + + # TODO: Raise a custom exception if any of the environment + # variables are missing. For now, we'll just set db to None. + if not all([self.__host, self.__username, self.__password, self.__db_name]): + self.__db = None + return + + self.__db = ArangoClient(hosts=self.__host, request_timeout=None).db( + self.__db_name, self.__username, self.__password, verify=True + ) + + def set_graph_name(self, graph_name: str | None = None): + if self.__db is None: + raise ValueError("Cannot set graph name without setting the database first") + + self.__graph_name = os.getenv("DATABASE_GRAPH_NAME") + if graph_name is not None: + if not isinstance(graph_name, str): + raise TypeError("**graph_name** must be a string") + + self.__graph_name = graph_name + + if self.__graph_name is None: + self.__graph_exists = False + print("DATABASE_GRAPH_NAME environment variable not set") + + elif not self.db.has_graph(self.__graph_name): + self.__graph_exists = False + print(f"Graph '{self.__graph_name}' does not exist in the database") + + else: + self.__graph_exists = True + print(f"Found graph '{self.__graph_name}' in the database") + + def pull(self, load_node_and_adj_dict=True, load_coo=True): + if not self.graph_exists: + raise ValueError("Graph does not exist in the database") + + adb_graph = self.db.graph(self.graph_name) + + v_cols = adb_graph.vertex_collections() + edge_definitions = adb_graph.edge_definitions() + e_cols = {c["edge_collection"] for c in edge_definitions} + + metagraph = { + "vertexCollections": {col: {} for col in v_cols}, + "edgeCollections": {col: {} for col in e_cols}, + } + + from phenolrs.graph_loader import GraphLoader + + kwargs = {} + if self.graph_loader_parallelism is not None: + kwargs["parallelism"] = self.graph_loader_parallelism + if self.graph_loader_batch_size is not None: + kwargs["batch_size"] = self.graph_loader_batch_size + + result = GraphLoader.load( + self.db.name, + metagraph, + [self.__host], + username=self.__username, + password=self.__password, + load_node_dict=load_node_and_adj_dict, + load_adj_dict=load_node_and_adj_dict, + load_adj_dict_as_undirected=False, + load_coo=load_coo, + **kwargs, + ) + + if load_node_and_adj_dict: + # hacky, i don't like this + # need to revisit... + # consider using nx.convert.from_dict_of_dicts instead + self._node = result[0] + self._adj = result[1] + + if load_coo: + self.src_indices = result[2] + self.dst_indices = result[3] + self.vertex_ids_to_index = result[4] + + def push(self): + raise NotImplementedError("What would this look like?") diff --git a/nx_arangodb/classes/graph.py b/nx_arangodb/classes/graph.py index db495e36..71ea891d 100644 --- a/nx_arangodb/classes/graph.py +++ b/nx_arangodb/classes/graph.py @@ -1,6 +1,9 @@ +import os from typing import ClassVar import networkx as nx +from arango import ArangoClient +from arango.database import StandardDatabase import nx_arangodb as nxadb @@ -16,3 +19,150 @@ class Graph(nx.Graph): @classmethod def to_networkx_class(cls) -> type[nx.Graph]: return nx.Graph + + def __init__( + self, + *args, + **kwargs, + ): + super().__init__(*args, **kwargs) + + self.__db = None + self.__graph_name = None + self.__graph_exists = False + + self.graph_loader_parallelism = None + self.graph_loader_batch_size = None + + self.use_node_and_adj_dict_cache = False + self.use_coo_cache = False + + self.src_indices = None + self.dst_indices = None + self.vertex_ids_to_index = None + + self.set_db() + if self.__db is not None: + self.set_graph_name() + + @property + def db(self) -> StandardDatabase: + if self.__db is None: + raise ValueError("Database not set") + + return self.__db + + @property + def graph_name(self) -> str: + if self.__graph_name is None: + raise ValueError("Graph name not set") + + return self.__graph_name + + @property + def graph_exists(self) -> bool: + return self.__graph_exists + + def clear_coo_cache(self): + self.src_indices = None + self.dst_indices = None + self.vertex_ids_to_index = None + + def set_db(self, db: StandardDatabase | None = None): + if db is not None: + if not isinstance(db, StandardDatabase): + raise TypeError( + "**db** must be an instance of arango.database.StandardDatabase" + ) + + self.__db = db + return + + self.__host = os.getenv("DATABASE_HOST") + self.__username = os.getenv("DATABASE_USERNAME") + self.__password = os.getenv("DATABASE_PASSWORD") + self.__db_name = os.getenv("DATABASE_NAME") + + # TODO: Raise a custom exception if any of the environment + # variables are missing. For now, we'll just set db to None. + if not all([self.__host, self.__username, self.__password, self.__db_name]): + self.__db = None + return + + self.__db = ArangoClient(hosts=self.__host, request_timeout=None).db( + self.__db_name, self.__username, self.__password, verify=True + ) + + def set_graph_name(self, graph_name: str | None = None): + if self.__db is None: + raise ValueError("Cannot set graph name without setting the database first") + + self.__graph_name = os.getenv("DATABASE_GRAPH_NAME") + if graph_name is not None: + if not isinstance(graph_name, str): + raise TypeError("**graph_name** must be a string") + + self.__graph_name = graph_name + + if self.__graph_name is None: + self.__graph_exists = False + print("DATABASE_GRAPH_NAME environment variable not set") + + elif not self.db.has_graph(self.__graph_name): + self.__graph_exists = False + print(f"Graph '{self.__graph_name}' does not exist in the database") + + else: + self.__graph_exists = True + print(f"Found graph '{self.__graph_name}' in the database") + + def pull(self, load_node_and_adj_dict=True, load_coo=True): + if not self.graph_exists: + raise ValueError("Graph does not exist in the database") + + adb_graph = self.db.graph(self.graph_name) + + v_cols = adb_graph.vertex_collections() + edge_definitions = adb_graph.edge_definitions() + e_cols = {c["edge_collection"] for c in edge_definitions} + + metagraph = { + "vertexCollections": {col: {} for col in v_cols}, + "edgeCollections": {col: {} for col in e_cols}, + } + + from phenolrs.graph_loader import GraphLoader + + kwargs = {} + if self.graph_loader_parallelism is not None: + kwargs["parallelism"] = self.graph_loader_parallelism + if self.graph_loader_batch_size is not None: + kwargs["batch_size"] = self.graph_loader_batch_size + + result = GraphLoader.load( + self.db.name, + metagraph, + [self.__host], + username=self.__username, + password=self.__password, + load_node_dict=load_node_and_adj_dict, + load_adj_dict=load_node_and_adj_dict, + load_adj_dict_as_undirected=True, + load_coo=load_coo, + **kwargs, + ) + + if load_node_and_adj_dict: + # hacky, i don't like this + # need to revisit... + # consider using nx.convert.from_dict_of_dicts instead + self._node = result[0] + self._adj = result[1] + + if load_coo: + self.src_indices = result[2] + self.dst_indices = result[3] + self.vertex_ids_to_index = result[4] + + def push(self): + raise NotImplementedError("What would this look like?") diff --git a/nx_arangodb/classes/multidigraph.py b/nx_arangodb/classes/multidigraph.py index 3b83aea5..e2f86584 100644 --- a/nx_arangodb/classes/multidigraph.py +++ b/nx_arangodb/classes/multidigraph.py @@ -13,3 +13,21 @@ class MultiDiGraph(nx.MultiDiGraph, MultiGraph, DiGraph): @classmethod def to_networkx_class(cls) -> type[nx.MultiDiGraph]: return nx.MultiDiGraph + + def __init__( + self, + *args, + **kwargs, + ): + super().__init__(*args, **kwargs) + + self.__db = None + self.__graph_name = None + self.__graph_exists = False + + self.coo_load_parallelism = None + self.coo_load_batch_size = None + + self.set_db() + if self.__db is not None: + self.set_graph_name() diff --git a/nx_arangodb/classes/multigraph.py b/nx_arangodb/classes/multigraph.py index 6afe0c63..0a252284 100644 --- a/nx_arangodb/classes/multigraph.py +++ b/nx_arangodb/classes/multigraph.py @@ -12,3 +12,21 @@ class MultiGraph(nx.MultiGraph, Graph): @classmethod def to_networkx_class(cls) -> type[nx.MultiGraph]: return nx.MultiGraph + + def __init__( + self, + *args, + **kwargs, + ): + super().__init__(*args, **kwargs) + + self.__db = None + self.__graph_name = None + self.__graph_exists = False + + self.coo_load_parallelism = None + self.coo_load_batch_size = None + + self.set_db() + if self.__db is not None: + self.set_graph_name() diff --git a/nx_arangodb/convert.py b/nx_arangodb/convert.py index fae54ce4..12f46c11 100644 --- a/nx_arangodb/convert.py +++ b/nx_arangodb/convert.py @@ -3,21 +3,14 @@ from __future__ import annotations import itertools -import operator as op -from collections import Counter -from collections.abc import Mapping from typing import TYPE_CHECKING -# import cupy as cp import networkx as nx -import numpy as np import nx_arangodb as nxadb -from .utils import index_dtype - if TYPE_CHECKING: # pragma: no cover - from nx_arangodb.typing import AttrKey, Dtype, EdgeValue, NodeValue, any_ndarray + from nx_arangodb.typing import AttrKey, Dtype, EdgeValue, NodeValue __all__ = [ "from_networkx", @@ -167,19 +160,34 @@ def to_networkx(G: nxadb.Graph, *, sort_edges: bool = False) -> nx.Graph: return G.to_networkx_class()(incoming_graph_data=G) -def _to_graph( +def from_networkx_arangodb(G: nxadb.Graph) -> nxadb.Graph: + if not G.graph_exists: + print("ANTHONY: Graph does not exist, nothing to pull") + return G + + if G.use_node_and_adj_dict_cache and len(G.nodes) > 0 and len(G.adj) > 0: + print("ANTHONY: Using cached node and adj dict") + return G + + start_time = time.time() + G.pull(load_coo=False) + end_time = time.time() + + print("ANTHONY: Node & Adj Load took:", end_time - start_time) + + return G + + +def _to_nxadb_graph( G, edge_attr: AttrKey | None = None, edge_default: EdgeValue | None = 1, edge_dtype: Dtype | None = None, ) -> nxadb.Graph | nxadb.DiGraph: - """Ensure that input type is a nx_arangodb graph, and convert if necessary. - - Directed and undirected graphs are both allowed. - This is an internal utility function and may change or be removed. - """ + """Ensure that input type is a nx_arangodb graph, and convert if necessary.""" if isinstance(G, nxadb.Graph): - return G + return from_networkx_arangodb(G) + if isinstance(G, nx.Graph): return from_networkx( G, {edge_attr: edge_default} if edge_attr is not None else None, edge_dtype @@ -188,50 +196,102 @@ def _to_graph( raise TypeError -def _to_directed_graph( - G, - edge_attr: AttrKey | None = None, - edge_default: EdgeValue | None = 1, - edge_dtype: Dtype | None = None, -) -> nxadb.DiGraph: - """Ensure that input type is a nx_arangodb DiGraph, and convert if necessary. +try: + import os + import time + + import cupy as cp + import numpy as np + import nx_cugraph as nxcg + + def _to_nxcg_graph( + G, + edge_attr: AttrKey | None = None, + edge_default: EdgeValue | None = 1, + edge_dtype: Dtype | None = None, + as_directed: bool = False, + ) -> nxcg.Graph | nxcg.DiGraph: + """Ensure that input type is a nx_cugraph graph, and convert if necessary.""" + if isinstance(G, nxcg.Graph): + return G + if isinstance(G, nxadb.Graph): + # Assumption: G.adb_graph_name points to an existing graph in ArangoDB + # Therefore, the user wants us to pull the graph from ArangoDB, + # and convert it to an nx_cugraph graph. + # We currently accomplish this by using the NetworkX adapter for ArangoDB, + # which converts the ArangoDB graph to a NetworkX graph, and then we convert + # the NetworkX graph to an nx_cugraph graph. + # TODO: Implement a direct conversion from ArangoDB to nx_cugraph + if G.graph_exists: + print("ANTHONY: Graph exists, running _nxadb_to_nxcg()") + return _nxadb_to_nxcg(G, as_directed=as_directed) + + # If G is a networkx graph, or is a nxadb graph that doesn't point to an "existing" + # ArangoDB graph, then we just treat it as a normal networkx graph & + # convert it to nx_cugraph. + # TODO: Need to revisit the "existing" ArangoDB graph condition... + if isinstance(G, nx.Graph): + return nxcg.convert.from_networkx( + G, + {edge_attr: edge_default} if edge_attr is not None else None, + edge_dtype, + as_directed=as_directed, + ) + + # TODO: handle cugraph.Graph + raise TypeError + + def _nxadb_to_nxcg( + G: nxadb.Graph, as_directed: bool = False + ) -> nxcg.Graph | nxcg.DiGraph: + if G.is_multigraph(): + raise NotImplementedError("Multigraphs not yet supported") + + if ( + G.use_coo_cache + and G.src_indices is not None + and G.dst_indices is not None + and G.vertex_ids_to_index is not None + ): + print("ANTHONY: Using cached COO") - Undirected graphs will be converted to directed. - This is an internal utility function and may change or be removed. - """ - if isinstance(G, nxadb.DiGraph): - return G - if isinstance(G, nxadb.Graph): - return G.to_directed() - if isinstance(G, nx.Graph): - return from_networkx( - G, - {edge_attr: edge_default} if edge_attr is not None else None, - edge_dtype, - as_directed=True, - ) - # TODO: handle cugraph.Graph - raise TypeError + else: + start_time = time.time() + G.pull(load_node_and_adj_dict=False) + end_time = time.time() + print("ANTHONY: COO Load took:", end_time - start_time) -def _to_undirected_graph( - G, - edge_attr: AttrKey | None = None, - edge_default: EdgeValue | None = 1, - edge_dtype: Dtype | None = None, -) -> nxadb.Graph: - """Ensure that input type is a nx_arangodb Graph, and convert if necessary. + N = len(G.vertex_ids_to_index) - Only undirected graphs are allowed. Directed graphs will raise ValueError. - This is an internal utility function and may change or be removed. - """ - if isinstance(G, nxadb.Graph): - if G.is_directed(): - raise ValueError("Only undirected graphs supported; got a directed graph") - return G - if isinstance(G, nx.Graph): - return from_networkx( - G, {edge_attr: edge_default} if edge_attr is not None else None, edge_dtype + if G.is_directed() or as_directed: + klass = nxcg.DiGraph + else: + klass = nxcg.Graph + + start_time = time.time() + + rv = klass.from_coo( + N, + cp.array(G.src_indices), + cp.array(G.dst_indices), + key_to_id=G.vertex_ids_to_index, ) - # TODO: handle cugraph.Graph - raise TypeError + end_time = time.time() + + print("ANTHONY: from_coo took:", end_time - start_time) + + return rv + +except ModuleNotFoundError as e: + print(f"ANTHONY: {e}") + + def _to_nxcg_graph( + G, + edge_attr: AttrKey | None = None, + edge_default: EdgeValue | None = 1, + edge_dtype: Dtype | None = None, + as_directed: bool = False, + ) -> nxadb.Graph: + m = "nx-cugraph is not installed; cannot convert to nx-cugraph graph" + raise NotImplementedError(m) diff --git a/nx_arangodb/utils/misc.py b/nx_arangodb/utils/misc.py index 105228fd..55e339d3 100644 --- a/nx_arangodb/utils/misc.py +++ b/nx_arangodb/utils/misc.py @@ -31,6 +31,7 @@ def pairwise(it): "index_dtype", "_seed_to_int", "_get_int_dtype", + "_dtype_param", ] # This may switch to np.uint32 at some point
nxadb-to-nx-to-nxcg Story: I have an `nxadb.Graph` object that is connected to an existing ArangoDB Graph. I want to invoke `betweenness_centrality` on my ArangoDB Graph, using `nx-cugraph`. First solution: Use the NetworkX Adapter to pull the ArangoDB data into a NetworkX Graph, then call `nxcg.convert.from_networkx`.
2024-05-01T02:18:10
0.0
[]
[]
EnergyAssetOptimization/EAO
EnergyAssetOptimization__EAO-45
c0400193983fec2f7ed599a51a0abbccfbd37208
diff --git a/eaopack/assets.py b/eaopack/assets.py index f889dd8..e69fd2c 100644 --- a/eaopack/assets.py +++ b/eaopack/assets.py @@ -1540,18 +1540,19 @@ def _add_constraints_for_min_and_max_cap(self, op, min_cap, max_cap, time_alread start = max(0, start_ramp_time - time_already_running) if time_already_running > 0 else 0 A_lower_bounds = sp.lil_matrix((self.n, op.A.shape[1])) A_upper_bounds = sp.lil_matrix((self.n, op.A.shape[1])) + starting_timestep = self.timegrid.restricted.I[0] for i in range(start, self.n): var = op.mapping.iloc[i] A_lower_bounds[i, i] = 1 A_lower_bounds[i, self.heat_idx + i] = conversion_factor_power_heat[i] if include_on_variables: - A_lower_bounds[i, self.on_idx + var["time_step"]] = - min_cap[i] + A_lower_bounds[i, self.on_idx + var["time_step"] - starting_timestep] = - min_cap[i] A_upper_bounds[i, i] = 1 A_upper_bounds[i, self.heat_idx + i] = conversion_factor_power_heat[i] if include_on_variables: - A_upper_bounds[i, self.on_idx + var["time_step"]] = - max_cap[i] + A_upper_bounds[i, self.on_idx + var["time_step"] - starting_timestep] = - max_cap[i] for j in range(start_ramp_time): if i - j < 0: @@ -1833,6 +1834,96 @@ def _add_fuel_consumption(self, op: OptimProblem, fuel_efficiency, consumption_i op.mapping = new_map return op + +class CHPAsset_with_min_load_costs(CHPAsset): + def __init__(self, + min_load_threshhold: Union[float, Sequence[float], Dict] = 0., + min_load_costs: Union[float, Sequence[float], Dict] = None, + **kwargs + ): + """ CHPContract with additional Min Load costs: + adding costs when running below a threshhold capacity + Args: + + CHPAsset arguments + + additional: + + min_load_threshhold (float: optional): capacity below which additional costs apply + min_load_costs (float: optional): costs that apply below a threshhold (fixed costs "is below * costs" independend of capacity) + + """ + super().__init__(**kwargs) + self.min_load_threshhold = min_load_threshhold + self.min_load_costs = min_load_costs + + + def setup_optim_problem(self, prices: dict, timegrid: Timegrid = None, + costs_only: bool = False) -> OptimProblem: + """ Set up optimization problem for asset + + Args: + prices (dict): Dictionary of price arrays needed by assets in portfolio + timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, + in which case it must have been set previously + costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False + + Returns: + OptimProblem: Optimization problem to be used by optimizer + """ + op = super().setup_optim_problem(prices=prices, timegrid=timegrid, costs_only=costs_only) + + min_load_threshhold = self.make_vector(self.min_load_threshhold, prices, default_value=0., convert=True) + min_load_costs = self.make_vector(self.min_load_costs, prices, default_value=0., convert = True) + ### new part: add boolean "below threshhold" and restriction + if (min_load_threshhold is not None) and (max(min_load_threshhold) >=0.)\ + and (min_load_costs is not None) and (max(min_load_costs) >=0.): + + ### include bools: + map_bool = pd.DataFrame() + map_bool['time_step'] = self.timegrid.restricted.I + map_bool['node'] = np.nan + map_bool['asset'] = self.name + map_bool['type'] = 'i' # internal + map_bool['bool'] = True + map_bool['var_name'] = 'bool_threshhold' + map_bool.index += op.mapping.index.max()+1 # those are new variables + op.mapping = pd.concat([op.mapping, map_bool]) + # extend A for on variables (not relevant in exist. restrictions) + op.A = sp.hstack((op.A, sp.lil_matrix((op.A.shape[0], len(map_bool))))) + # set lower and upper bounds, costs: + op.l = np.hstack((op.l, np.zeros(self.timegrid.restricted.T))) + op.u = np.hstack((op.u, np.ones(self.timegrid.restricted.T))) + op.c = np.hstack([op.c, min_load_costs]) + ### Define restriction + node_power = self.nodes[0].name + map_disp = op.mapping.loc[(op.mapping['node'] == node_power) & (op.mapping['var_name'] == 'disp'),:] + map_bool = op.mapping.loc[(op.mapping['var_name'] == 'bool_threshhold'),:] + map_bool_on = op.mapping.loc[(op.mapping['var_name'] == 'bool_on') & (op.mapping['node'].isnull()),:] + assert len(map_disp)==len(map_bool), 'error- lengths of disp and bools do not match' + # disp_t >= threshhold * (1-bool_t) - threshhold * (1- bool_on) + # disp_t + (bool_t - bool_on) * threshhold >= 0 + myA = sp.lil_matrix((len(map_disp), op.A.shape[1])) + i_bool = 0 # counter booleans + myb = np.zeros(len(map_disp)) + for t in map_disp['time_step'].values: + ind_disp = map_disp.index[map_disp['time_step'] == t][0] + ind_bool = map_bool.index[map_bool['time_step'] == t][0] + myA[i_bool, ind_disp] = 1 + myA[i_bool, ind_bool] = min_load_threshhold[t] + if len(map_bool_on)>0: + ind_bool_on = map_bool_on.index[map_bool_on['time_step'] == t][0] + myA[i_bool, ind_bool_on] = -min_load_threshhold[t] + myb[i_bool] = 0. + else: + myb[i_bool] = min_load_threshhold[t] + i_bool += 1 + op.A = sp.vstack((op.A, myA)) + op.cType += 'L' * (len(map_disp)) + op.b = np.hstack((op.b, myb)) + + return op + class MultiCommodityContract(Contract): """ Multi commodity contract class - implements a Contract that generates two or more commoditites at a time. The main idea is to implement a CHP generating unit that would generate power and heat at the same time. diff --git a/eaopack/serialization.py b/eaopack/serialization.py index 8826793..f2e4917 100644 --- a/eaopack/serialization.py +++ b/eaopack/serialization.py @@ -49,8 +49,8 @@ def json_serialize_objects(obj) -> dict: elif isinstance(obj, Asset): res = obj.__dict__.copy() res.pop('asset_names',None) - res.pop('start_ramp_time', None) # only relevant for class CHPAsset - res.pop('shutdown_ramp_time', None) # only relevant for class CHPAsset + res.pop('start_ramp_time', None) # only relevant for class CHPAsset, calculated + res.pop('shutdown_ramp_time', None) # only relevant for class CHPAsset, calculated # res.pop('timegrid', None) # not to be serialized res['__class__'] = 'Asset' # super class Asset res['asset_type'] = obj.__class__.__name__ # store child class diff --git a/setup.cfg b/setup.cfg index b721c49..64579ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = eaopack -version = 1.2.4 +version = 1.2.8 author = The EAO development Team description = A Framework for Optimizing Decentralized Portfolios and Green Supply long_description = file: README.md
Bugfix in CHPAsset when setting start date
2023-04-06T14:39:08
0.0
[]
[]
EnergyAssetOptimization/EAO
EnergyAssetOptimization__EAO-37
eab2aa78504264ea42f5ea09f020930abd823c54
diff --git a/doc/source/samples.rst b/doc/source/samples.rst index b8d45bd..ddb0e4d 100644 --- a/doc/source/samples.rst +++ b/doc/source/samples.rst @@ -23,7 +23,7 @@ Multi commodity optimization samples/cross_commodity/cross_commodity_sample -Combining Heat and Power +Combined Heat and Power ---------------------------- .. toctree:: diff --git a/doc/source/samples/combined_heat_power/chp_sample.ipynb b/doc/source/samples/combined_heat_power/chp_sample.ipynb index cbe771e..a9a0fb5 100644 --- a/doc/source/samples/combined_heat_power/chp_sample.ipynb +++ b/doc/source/samples/combined_heat_power/chp_sample.ipynb @@ -4,7 +4,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# Combining heat and power\n", + "# Combined Heat and Power\n", "The CHPAsset class represents an asset that can generate both heat and power at the same time and models starting procedures, minimum loads, ramping and a minimum runtime." ] }, @@ -15,6 +15,7 @@ "## Technical Details\n", "### Input Parameters\n", "Possible input parameters of the CHPAsset are\n", + "\n", "- Ramp $r$\n", "- Conversion efficiency $\\alpha$ from heat to power.\n", "- Maximum share heat $\\beta$\n", @@ -22,8 +23,16 @@ "- Maximum capacity $u_t$ for every timestep $t \\in \\left\\{0,\\dots, T-1\\right\\}$\n", "- Dispatch power $x_{-1}$ from the previous timestep\n", "- Dispatch heat $w_{-1}$ from the previous timestep\n", - "- Number $k$ of timesteps the asset has already been running\n", - "- Minimum runtime $m$" + "- Number $k_{on}$ of timesteps the asset has already been running\n", + "- Number $k_{off}$ of timesteps the asset has already been of\n", + "- Minimum runtime $m_{run}$\n", + "- Minimum downtime $m_{down}$\n", + "- Start ramp specification:\n", + " - Minimum capacity $l^{start}_i$ for timestep $i \\in \\left\\{0,\\dots, k_{start}\\right\\}$ after starting\n", + " - Maximum capacity $u^{start}_i$ for timestep $i \\in \\left\\{0,\\dots, k_{start}\\right\\}$ after starting\n", + "- Shutdown ramp specification:\n", + " - Minimum capacity $l^{shutdown}_i$ for timestep $i \\in \\left\\{0,\\dots, k_{shutdown}\\right\\}$ before shutting off\n", + " - Maximum capacity $u^{shutdown}_i$ for timestep $i \\in \\left\\{0,\\dots, k_{shutdown}\\right\\}$ before shutting off" ] }, { @@ -32,10 +41,12 @@ "source": [ "### Output variables\n", "The following variables are computed for a CHPAsset that runs for $T$ timesteps:\n", + "\n", "- Dispatch power $x_t \\in \\mathbb{R}$, for every timestep $t \\in \\left\\{0,\\dots, T-1\\right\\}$\n", "- Dispatch heat $w_t \\in \\mathbb{R}$, for every timestep $t \\in \\left\\{0,\\dots, T-1\\right\\}$\n", "- \"On\"-variable $a_t \\in \\left\\{0,1\\right\\}$, for every timestep $t \\in \\left\\{0,\\dots, T-1\\right\\}$\n", "- \"Start\"-variable $s_t \\in \\left\\{0,1\\right\\}$, for every timestep $t \\in \\left\\{0,\\dots, T-1\\right\\}$\n", + "- \"Shutdown\"-variable $d_t \\in \\left\\{0,1\\right\\}$, for every timestep $t \\in \\left\\{0,\\dots, T-1\\right\\}$\n", "\n", "When they are not needed to enforce a minimum runtime, start costs or similar, the \"on\" and \"start\" variables are removed." ] @@ -46,10 +57,12 @@ "source": [ "### Variable bounds\n", "The output variables are within the following bounds in every timestep $t \\in \\left\\{0,\\dots, T-1\\right\\}$:\n", + "\n", "- $0 \\leq x_t \\leq u_t$\n", "- $0 \\leq w_t \\leq \\beta u_t$\n", "- $0 \\leq a_t \\leq 1$\n", - "- $0 \\leq s_t \\leq 1$" + "- $0 \\leq s_t \\leq 1$\n", + "- $0 \\leq d_t \\leq 1$" ] }, { @@ -59,32 +72,56 @@ "### Constraints\n", "The following constraints are used in the asset\n", "\n", - "- **Ramp**: Ensure that the increase/decrease of the virtual dispatch $\\tilde{x}_t = x_t + \\alpha w_t$ is bounded by $r$, i.e. \n", - "\t\\begin{align*}\n", - "\t\t\t\t\t-r \\leq \\tilde{x}_t-\\tilde{x}_{t-1} \\leq r,\n", - "\t\\end{align*} \n", - "&emsp;&nbsp;&nbsp;&nbsp; for $t \\in \\left\\{0,\\dots, T-1\\right\\}$.\n", + "- **Minimum and maximum capacity**: The virtual dispatch $\\tilde{x}_t = x_t + \\alpha w_t$ is 0 when $a_t = 0$, i.e. the asset is \"off\", it is bounded by the start or shutdown specifications during the start and shutdown, and otherwise it is between minimum and maximum capacity, i.e.\n", + "\\begin{align*} \n", + "\\tilde{x}_t &\\geq& l_t \\left[ a_t - \\sum_{i=0}^{k_{shutdown}-1}d_{t+i+1} - \\sum_{i=0}^{k_{start}-1}s_{t-i} \\right] + \\sum_{i=0}^{k_{start}-1}l^{start}_i s_{t-i} + \\sum_{i=0}^{k_{shutdown}-1}l^{shutdown}_i d_{t+i+1} \\\\\n", + "\\tilde{x}_t &\\leq& u_t \\left[ a_t - \\sum_{i=0}^{k_{shutdown}-1}d_{t+i+1} - \\sum_{i=0}^{k_{start}-1}s_{t-i} \\right] + \\sum_{i=0}^{k_{start}-1}u^{start}_i s_{t-i} + \\sum_{i=0}^{k_{shutdown}-1}u^{shutdown}_i d_{t+i+1}\n", + "\\end{align*} \n", + "for $t \\in \\left\\{0,\\dots, T-1\\right\\}$. It should be noted that the term $\\sum_{i=0}^{k_{start}-1}s_{t-i}$ is 1 if timestep $t$ is part of the start ramp and 0 otherwise. Analogously, $\\sum_{i=0}^{k_{shutdown}-1}d_{t+i+1}$ is 1 if timestep $t$ is part of the shutdown ramp and 0 otherwise. <br>\n", + "If $k_{on} > 0$ and $k_{on}<k_{start}$, i.e. the asset is in the starting process at timestep $0$, the first $k_{start}-k_{on}$ timesteps are instead bounded by\n", + "\\begin{align*} l^{start}_{k_{on}+i} \\leq \\tilde{x}_i \\leq u^{start}_{k_{on}+i} \\end{align*}\n", + "for every $i \\in \\left\\{0, \\dots, k_{start}-k_{on}-1\\right\\}$.\n", "\n", - "- **Minimum and maximum capacity**: The virtual dispatch $\\tilde{x}_t = x_t + \\alpha w_t$ is 0 when $a_t = 0$, i.e. the asset is \"off\", or between minimum and maximum capacity, i.e.\n", - "\\begin{align*} a_t l_t \\leq \\tilde{x}_t \\leq a_t u_t, \\end{align*} \n", - "&emsp;&nbsp;&nbsp;&nbsp; for $t \\in \\left\\{0,\\dots, T-1\\right\\}$.\n", + "- **Ramp**: Ensure that the increase/decrease of the virtual dispatch $\\tilde{x}_t = x_t + \\alpha w_t$ is bounded by $r$, unless during timesteps that belong to the start or shutdown ramp, i.e. \n", + "\\begin{align*}\n", + "\\tilde{x}_t-\\tilde{x}_{t-1} &\\geq& -r \\left[ a_{t-1} - \\sum_{i=0}^{k_{shutdown}-1}d_{t+i} \\right] - u_{t-1}\\sum_{i=0}^{k_{shutdown}-1}d_{t+i} \\\\\n", + "\\tilde{x}_t-\\tilde{x}_{t-1} &\\leq& r \\left[ a_{t} - \\sum_{i=0}^{k_{start}-1}s_{t-i} \\right] + u_{t}\\sum_{i=0}^{k_{start}-1}s_{t-i} ,\n", + "\\end{align*} \n", + "for $t \\in \\left\\{0,\\dots, T-1\\right\\}$.\n", "\n", - "- **Start constraints**: When the \"on\" variable changes from \"off\" to \"on\", the start variable has to be 1, i.e.\n", + "\n", + "- **Start constraints**: (Only applicable when there is no start- or shutdown ramp specification, otherwise the start variables are defined simultaneously with the shutdown variables, see \"start and shutdown constraints\") \n", + "When the \"on\" variable changes from \"off\" to \"on\", the start variable has to be 1, i.e.\n", "\\begin{align*}s_t \\geq a_t - a_{t-1},\\end{align*} \n", - "&emsp;&nbsp;&nbsp;&nbsp; for $t \\in \\left\\{1,\\dots, T-1\\right\\}$. <br>\n", - "&emsp;&nbsp;&nbsp;&nbsp; If $k = 0$, i.e. previous state $a_{-1}$ is \"off\", we need the additional condition \n", + "for $t \\in \\left\\{1,\\dots, T-1\\right\\}$. <br>\n", + "If $k_{on} = 0$, i.e. previous state $a_{-1}$ is \"off\", we need the additional condition \n", "\\begin{align*}s_0 \\geq a_0.\\end{align*}\n", "\n", - "- **Minimum runtime**: Ensure that the asset follows the minimum runtime $m$, i.e.\n", + "- **Start and shutdown constraints**: (Only applicable when start or shutdown ramp are defined)\n", + "Ensure that the start and shutdown variables are set correctly, i.e\n", + "\\begin{align*}\n", + "s_t - d_t &=& a_t - a_{t-1} \\\\\n", + "s_t + d_t &\\leq& 1\n", + "\\end{align*}\n", + "for $t \\in \\left\\{0,\\dots, T-1\\right\\}$.\n", + "\n", + "- **Minimum runtime**: Ensure that the asset follows the minimum runtime $m_{run}$ and is on during the start and shutdown ramp, i.e.\n", "\\begin{align*}a_t \\geq s_{t-i}\\end{align*} \n", - "&emsp;&nbsp;&nbsp;&nbsp; for $t \\in \\left\\{1,\\dots, T-1\\right\\}$ and $i \\in \\left\\{1, \\dots, m-1\\right\\}$. <br>\n", - "&emsp;&nbsp;&nbsp;&nbsp; If $k>0$ and $m > k$, we need the additional condition \n", + "for $t \\in \\left\\{1,\\dots, T-1\\right\\}$ and $i \\in \\left\\{1, \\dots, m_{run}+k_{start}+k_{shutdown}-1\\right\\}$. <br>\n", + "If $k_{on}>0$ and $m_{run}+k_{start}+k_{shutdown} > k_{on}$, we need the additional condition \n", "\\begin{align*}a_i \\geq 1,\\end{align*}\n", - "&emsp;&nbsp;&nbsp;&nbsp; for all $i \\in \\left\\{0, \\dots, m -k-1\\right\\}$.\n", + "for all $i \\in \\left\\{0, \\dots, m_{run}+k_{start}+k_{shutdown} -k_{on}-1\\right\\}$.\n", + "\n", + "- **Minimum downtime**: If the asset turns off, it has to stay off for the minimum downtime $m_{down}$, i.e.\n", + "\\begin{align*}a_t \\leq 1 - a_{t-i-1} + a_{t-i}\\end{align*} \n", + "for $t \\in \\left\\{1,\\dots, T-1\\right\\}$ and $i \\in \\left\\{1, \\dots, m_{down}-1\\right\\}$. <br>\n", + "If $k_{off}>0$ and $m_{down} > k_{off}$, we need the additional condition \n", + "\\begin{align*}a_i \\leq 0,\\end{align*}\n", + "for all $i \\in \\left\\{0, \\dots, m_{down} -k_{off}-1\\right\\}$.\n", "\n", "- **Maximum share heat**: Bound the heat dispatch by a percentage of the power dispatch, i.e.\n", "\\begin{align*}w_t \\leq \\beta x_t,\\end{align*} \n", - "&emsp;&nbsp;&nbsp;&nbsp; for $t \\in \\left\\{0, \\dots, T-1\\right\\}$." + "for $t \\in \\left\\{0, \\dots, T-1\\right\\}$." ] }, { @@ -105,6 +142,8 @@ "import datetime as dt\n", "import matplotlib.pyplot as plt\n", "\n", + "import sys\n", + "import os\n", "myDir = os.path.join(os.getcwd(), '../..')\n", "sys.path.append(myDir)\n", "addDir = os.path.join(os.getcwd(), '../../../..')\n", @@ -134,8 +173,8 @@ "output_type": "display_data", "data": { "text/plain": "<Figure size 432x288 with 1 Axes>", - "image/svg+xml": "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"\n \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"349.2pt\" height=\"246.958125pt\" viewBox=\"0 0 349.2 246.958125\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n <metadata>\n <rdf:RDF xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://creativecommons.org/ns#\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n <cc:Work>\n <dc:type rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\"/>\n <dc:date>2022-07-04T17:43:45.059505</dc:date>\n <dc:format>image/svg+xml</dc:format>\n <dc:creator>\n <cc:Agent>\n <dc:title>Matplotlib v3.5.0, https://matplotlib.org/</dc:title>\n </cc:Agent>\n </dc:creator>\n </cc:Work>\n </rdf:RDF>\n </metadata>\n <defs>\n <style type=\"text/css\">*{stroke-linejoin: round; stroke-linecap: butt}</style>\n </defs>\n <g id=\"figure_1\">\n <g id=\"patch_1\">\n <path d=\"M 0 246.958125 \nL 349.2 246.958125 \nL 349.2 0 \nL 0 0 \nL 0 246.958125 \nz\n\" style=\"fill: none\"/>\n </g>\n <g id=\"axes_1\">\n <g id=\"patch_2\">\n <path d=\"M 113.389051 92.789615 \nQ 126.026428 112.147428 138.052627 130.569045 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 137.54073 126.126302 \nL 138.052627 130.569045 \nL 134.191295 128.312917 \nL 137.54073 126.126302 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_3\">\n <path d=\"M 103.827583 78.343806 \nQ 93.773907 63.361067 84.343198 49.30672 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 84.911235 53.742634 \nL 84.343198 49.30672 \nL 88.232751 51.513839 \nL 84.911235 53.742634 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_4\">\n <path d=\"M 227.964533 147.024396 \nQ 189.990117 143.312333 153.128433 139.709041 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 156.914882 142.088705 \nL 153.128433 139.709041 \nL 157.304034 138.10768 \nL 156.914882 142.088705 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_5\">\n <path d=\"M 245.201951 148.724609 \nQ 274.763962 151.666578 303.213436 154.497829 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 299.431156 152.111542 \nL 303.213436 154.497829 \nL 299.035039 156.09188 \nL 299.431156 152.111542 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_6\">\n <path d=\"M 92.115023 178.363318 \nQ 114.330909 161.206383 135.661922 144.73282 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 131.273646 145.594817 \nL 135.661922 144.73282 \nL 133.718554 148.760639 \nL 131.273646 145.594817 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_7\">\n <path d=\"M 78.368184 188.893196 \nQ 60.758882 202.271477 44.039833 214.973407 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 48.434791 214.146156 \nL 44.039833 214.973407 \nL 46.015007 210.96109 \nL 48.434791 214.146156 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_8\">\n <path d=\"M 138.66314 131.504222 \nQ 126.025763 112.146409 113.999563 93.724792 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 114.51146 98.167535 \nL 113.999563 93.724792 \nL 117.860895 95.98092 \nL 114.51146 98.167535 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_9\">\n <path d=\"M 152.018129 139.600507 \nQ 189.992544 143.31257 226.854229 146.915862 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 223.06778 144.536197 \nL 226.854229 146.915862 \nL 222.678628 148.517222 \nL 223.06778 144.536197 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_10\">\n <path d=\"M 136.54682 144.049429 \nQ 114.330934 161.206364 92.999921 177.679926 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 97.388197 176.817929 \nL 92.999921 177.679926 \nL 94.943289 173.652108 \nL 97.388197 176.817929 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_11\">\n <path d=\"M 83.720671 48.378984 \nQ 93.774347 63.361723 103.205056 77.41607 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 102.63702 72.980156 \nL 103.205056 77.41607 \nL 99.315503 75.208951 \nL 102.63702 72.980156 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_12\">\n <path d=\"M 304.329234 154.608871 \nQ 274.767222 151.666902 246.317749 148.835652 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 250.100028 151.221938 \nL 246.317749 148.835652 \nL 250.496145 147.2416 \nL 250.100028 151.221938 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_13\">\n <path d=\"M 43.147967 215.650983 \nQ 60.757269 202.272702 77.476318 189.570772 \n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 73.08136 190.398023 \nL 77.476318 189.570772 \nL 75.501144 193.583089 \nL 73.08136 190.398023 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"PathCollection_1\">\n <path d=\"M 108.653605 96.716245 \nC 111.618666 96.716245 114.462685 95.538214 116.559299 93.441599 \nC 118.655914 91.344984 119.833945 88.500966 119.833945 85.535905 \nC 119.833945 82.570844 118.655914 79.726825 116.559299 77.630211 \nC 114.462685 75.533596 111.618666 74.355565 108.653605 74.355565 \nC 105.688544 74.355565 102.844526 75.533596 100.747911 77.630211 \nC 98.651296 79.726825 97.473265 82.570844 97.473265 85.535905 \nC 97.473265 88.500966 98.651296 91.344984 100.747911 93.441599 \nC 102.844526 95.538214 105.688544 96.716245 108.653605 96.716245 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #ffa500; fill-opacity: 0.7; stroke: #ffa500; stroke-opacity: 0.7\"/>\n <path d=\"M 236.584077 159.04731 \nC 239.549138 159.04731 242.393156 157.869279 244.489771 155.772665 \nC 246.586385 153.67605 247.764417 150.832031 247.764417 147.866971 \nC 247.764417 144.90191 246.586385 142.057891 244.489771 139.961276 \nC 242.393156 137.864662 239.549138 136.686631 236.584077 136.686631 \nC 233.619016 136.686631 230.774997 137.864662 228.678383 139.961276 \nC 226.581768 142.057891 225.403737 144.90191 225.403737 147.866971 \nC 225.403737 150.832031 226.581768 153.67605 228.678383 155.772665 \nC 230.774997 157.869279 233.619016 159.04731 236.584077 159.04731 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #ffa500; fill-opacity: 0.7; stroke: #ffa500; stroke-opacity: 0.7\"/>\n <path d=\"M 85.263258 194.835154 \nC 88.228319 194.835154 91.072338 193.657123 93.168952 191.560509 \nC 95.265567 189.463894 96.443598 186.619875 96.443598 183.654814 \nC 96.443598 180.689754 95.265567 177.845735 93.168952 175.74912 \nC 91.072338 173.652506 88.228319 172.474475 85.263258 172.474475 \nC 82.298197 172.474475 79.454178 173.652506 77.357564 175.74912 \nC 75.260949 177.845735 74.082918 180.689754 74.082918 183.654814 \nC 74.082918 186.619875 75.260949 189.463894 77.357564 191.560509 \nC 79.454178 193.657123 82.298197 194.835154 85.263258 194.835154 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #ffa500; fill-opacity: 0.7; stroke: #ffa500; stroke-opacity: 0.7\"/>\n <path d=\"M 143.398585 145.829 \nC 145.273854 145.829 147.07257 145.083948 148.398585 143.757932 \nC 149.724601 142.431917 150.469653 140.633201 150.469653 138.757932 \nC 150.469653 136.882663 149.724601 135.083948 148.398585 133.757932 \nC 147.07257 132.431917 145.273854 131.686864 143.398585 131.686864 \nC 141.523316 131.686864 139.724601 132.431917 138.398585 133.757932 \nC 137.07257 135.083948 136.327517 136.882663 136.327517 138.757932 \nC 136.327517 140.633201 137.07257 142.431917 138.398585 143.757932 \nC 139.724601 145.083948 141.523316 145.829 143.398585 145.829 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; fill-opacity: 0.7; stroke: #808080; stroke-opacity: 0.7\"/>\n <path d=\"M 78.894649 48.257953 \nC 80.769918 48.257953 82.568634 47.512901 83.894649 46.186885 \nC 85.220665 44.86087 85.965717 43.062154 85.965717 41.186885 \nC 85.965717 39.311616 85.220665 37.512901 83.894649 36.186885 \nC 82.568634 34.86087 80.769918 34.115818 78.894649 34.115818 \nC 77.01938 34.115818 75.220665 34.86087 73.894649 36.186885 \nC 72.568634 37.512901 71.823581 39.311616 71.823581 41.186885 \nC 71.823581 43.062154 72.568634 44.86087 73.894649 46.186885 \nC 75.220665 47.512901 77.01938 48.257953 78.894649 48.257953 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; fill-opacity: 0.7; stroke: #808080; stroke-opacity: 0.7\"/>\n <path d=\"M 312.947107 162.537577 \nC 314.822377 162.537577 316.621092 161.792525 317.947107 160.46651 \nC 319.273123 159.140494 320.018175 157.341779 320.018175 155.46651 \nC 320.018175 153.59124 319.273123 151.792525 317.947107 150.46651 \nC 316.621092 149.140494 314.822377 148.395442 312.947107 148.395442 \nC 311.071838 148.395442 309.273123 149.140494 307.947107 150.46651 \nC 306.621092 151.792525 305.87604 153.59124 305.87604 155.46651 \nC 305.87604 157.341779 306.621092 159.140494 307.947107 160.46651 \nC 309.273123 161.792525 311.071838 162.537577 312.947107 162.537577 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; fill-opacity: 0.7; stroke: #808080; stroke-opacity: 0.7\"/>\n <path d=\"M 36.252893 227.960432 \nC 38.128162 227.960432 39.926877 227.21538 41.252893 225.889365 \nC 42.578908 224.563349 43.32396 222.764634 43.32396 220.889365 \nC 43.32396 219.014096 42.578908 217.21538 41.252893 215.889365 \nC 39.926877 214.563349 38.128162 213.818297 36.252893 213.818297 \nC 34.377623 213.818297 32.578908 214.563349 31.252893 215.889365 \nC 29.926877 217.21538 29.181825 219.014096 29.181825 220.889365 \nC 29.181825 222.764634 29.926877 224.563349 31.252893 225.889365 \nC 32.578908 227.21538 34.377623 227.960432 36.252893 227.960432 \nz\n\" clip-path=\"url(#pd6ce77bb75)\" style=\"fill: #808080; fill-opacity: 0.7; stroke: #808080; stroke-opacity: 0.7\"/>\n </g>\n <g id=\"text_1\">\n <g clip-path=\"url(#pd6ce77bb75)\">\n <!-- node_power -->\n <g transform=\"translate(84.30673 87.632155)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-6e\" d=\"M 3513 2113 \nL 3513 0 \nL 2938 0 \nL 2938 2094 \nQ 2938 2591 2744 2837 \nQ 2550 3084 2163 3084 \nQ 1697 3084 1428 2787 \nQ 1159 2491 1159 1978 \nL 1159 0 \nL 581 0 \nL 581 3500 \nL 1159 3500 \nL 1159 2956 \nQ 1366 3272 1645 3428 \nQ 1925 3584 2291 3584 \nQ 2894 3584 3203 3211 \nQ 3513 2838 3513 2113 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6f\" d=\"M 1959 3097 \nQ 1497 3097 1228 2736 \nQ 959 2375 959 1747 \nQ 959 1119 1226 758 \nQ 1494 397 1959 397 \nQ 2419 397 2687 759 \nQ 2956 1122 2956 1747 \nQ 2956 2369 2687 2733 \nQ 2419 3097 1959 3097 \nz\nM 1959 3584 \nQ 2709 3584 3137 3096 \nQ 3566 2609 3566 1747 \nQ 3566 888 3137 398 \nQ 2709 -91 1959 -91 \nQ 1206 -91 779 398 \nQ 353 888 353 1747 \nQ 353 2609 779 3096 \nQ 1206 3584 1959 3584 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-64\" d=\"M 2906 2969 \nL 2906 4863 \nL 3481 4863 \nL 3481 0 \nL 2906 0 \nL 2906 525 \nQ 2725 213 2448 61 \nQ 2172 -91 1784 -91 \nQ 1150 -91 751 415 \nQ 353 922 353 1747 \nQ 353 2572 751 3078 \nQ 1150 3584 1784 3584 \nQ 2172 3584 2448 3432 \nQ 2725 3281 2906 2969 \nz\nM 947 1747 \nQ 947 1113 1208 752 \nQ 1469 391 1925 391 \nQ 2381 391 2643 752 \nQ 2906 1113 2906 1747 \nQ 2906 2381 2643 2742 \nQ 2381 3103 1925 3103 \nQ 1469 3103 1208 2742 \nQ 947 2381 947 1747 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-65\" d=\"M 3597 1894 \nL 3597 1613 \nL 953 1613 \nQ 991 1019 1311 708 \nQ 1631 397 2203 397 \nQ 2534 397 2845 478 \nQ 3156 559 3463 722 \nL 3463 178 \nQ 3153 47 2828 -22 \nQ 2503 -91 2169 -91 \nQ 1331 -91 842 396 \nQ 353 884 353 1716 \nQ 353 2575 817 3079 \nQ 1281 3584 2069 3584 \nQ 2775 3584 3186 3129 \nQ 3597 2675 3597 1894 \nz\nM 3022 2063 \nQ 3016 2534 2758 2815 \nQ 2500 3097 2075 3097 \nQ 1594 3097 1305 2825 \nQ 1016 2553 972 2059 \nL 3022 2063 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-5f\" d=\"M 3263 -1063 \nL 3263 -1509 \nL -63 -1509 \nL -63 -1063 \nL 3263 -1063 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-70\" d=\"M 1159 525 \nL 1159 -1331 \nL 581 -1331 \nL 581 3500 \nL 1159 3500 \nL 1159 2969 \nQ 1341 3281 1617 3432 \nQ 1894 3584 2278 3584 \nQ 2916 3584 3314 3078 \nQ 3713 2572 3713 1747 \nQ 3713 922 3314 415 \nQ 2916 -91 2278 -91 \nQ 1894 -91 1617 61 \nQ 1341 213 1159 525 \nz\nM 3116 1747 \nQ 3116 2381 2855 2742 \nQ 2594 3103 2138 3103 \nQ 1681 3103 1420 2742 \nQ 1159 2381 1159 1747 \nQ 1159 1113 1420 752 \nQ 1681 391 2138 391 \nQ 2594 391 2855 752 \nQ 3116 1113 3116 1747 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-77\" d=\"M 269 3500 \nL 844 3500 \nL 1563 769 \nL 2278 3500 \nL 2956 3500 \nL 3675 769 \nL 4391 3500 \nL 4966 3500 \nL 4050 0 \nL 3372 0 \nL 2619 2869 \nL 1863 0 \nL 1184 0 \nL 269 3500 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-72\" d=\"M 2631 2963 \nQ 2534 3019 2420 3045 \nQ 2306 3072 2169 3072 \nQ 1681 3072 1420 2755 \nQ 1159 2438 1159 1844 \nL 1159 0 \nL 581 0 \nL 581 3500 \nL 1159 3500 \nL 1159 2956 \nQ 1341 3275 1631 3429 \nQ 1922 3584 2338 3584 \nQ 2397 3584 2469 3576 \nQ 2541 3569 2628 3553 \nL 2631 2963 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-6e\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"63.378906\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"124.560547\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"188.037109\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"249.560547\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"299.560547\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"363.037109\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"424.21875\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"506.005859\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"567.529297\"/>\n </g>\n </g>\n </g>\n <g id=\"text_2\">\n <g clip-path=\"url(#pd6ce77bb75)\">\n <!-- node_heat -->\n <g transform=\"translate(215.585327 149.963221)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-68\" d=\"M 3513 2113 \nL 3513 0 \nL 2938 0 \nL 2938 2094 \nQ 2938 2591 2744 2837 \nQ 2550 3084 2163 3084 \nQ 1697 3084 1428 2787 \nQ 1159 2491 1159 1978 \nL 1159 0 \nL 581 0 \nL 581 4863 \nL 1159 4863 \nL 1159 2956 \nQ 1366 3272 1645 3428 \nQ 1925 3584 2291 3584 \nQ 2894 3584 3203 3211 \nQ 3513 2838 3513 2113 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-61\" d=\"M 2194 1759 \nQ 1497 1759 1228 1600 \nQ 959 1441 959 1056 \nQ 959 750 1161 570 \nQ 1363 391 1709 391 \nQ 2188 391 2477 730 \nQ 2766 1069 2766 1631 \nL 2766 1759 \nL 2194 1759 \nz\nM 3341 1997 \nL 3341 0 \nL 2766 0 \nL 2766 531 \nQ 2569 213 2275 61 \nQ 1981 -91 1556 -91 \nQ 1019 -91 701 211 \nQ 384 513 384 1019 \nQ 384 1609 779 1909 \nQ 1175 2209 1959 2209 \nL 2766 2209 \nL 2766 2266 \nQ 2766 2663 2505 2880 \nQ 2244 3097 1772 3097 \nQ 1472 3097 1187 3025 \nQ 903 2953 641 2809 \nL 641 3341 \nQ 956 3463 1253 3523 \nQ 1550 3584 1831 3584 \nQ 2591 3584 2966 3190 \nQ 3341 2797 3341 1997 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-74\" d=\"M 1172 4494 \nL 1172 3500 \nL 2356 3500 \nL 2356 3053 \nL 1172 3053 \nL 1172 1153 \nQ 1172 725 1289 603 \nQ 1406 481 1766 481 \nL 2356 481 \nL 2356 0 \nL 1766 0 \nQ 1100 0 847 248 \nQ 594 497 594 1153 \nL 594 3053 \nL 172 3053 \nL 172 3500 \nL 594 3500 \nL 594 4494 \nL 1172 4494 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-6e\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"63.378906\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"124.560547\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"188.037109\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"249.560547\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"299.560547\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"362.939453\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"424.462891\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"485.742188\"/>\n </g>\n </g>\n </g>\n <g id=\"text_3\">\n <g clip-path=\"url(#pd6ce77bb75)\">\n <!-- node_gas -->\n <g transform=\"translate(66.205758 185.751064)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-67\" d=\"M 2906 1791 \nQ 2906 2416 2648 2759 \nQ 2391 3103 1925 3103 \nQ 1463 3103 1205 2759 \nQ 947 2416 947 1791 \nQ 947 1169 1205 825 \nQ 1463 481 1925 481 \nQ 2391 481 2648 825 \nQ 2906 1169 2906 1791 \nz\nM 3481 434 \nQ 3481 -459 3084 -895 \nQ 2688 -1331 1869 -1331 \nQ 1566 -1331 1297 -1286 \nQ 1028 -1241 775 -1147 \nL 775 -588 \nQ 1028 -725 1275 -790 \nQ 1522 -856 1778 -856 \nQ 2344 -856 2625 -561 \nQ 2906 -266 2906 331 \nL 2906 616 \nQ 2728 306 2450 153 \nQ 2172 0 1784 0 \nQ 1141 0 747 490 \nQ 353 981 353 1791 \nQ 353 2603 747 3093 \nQ 1141 3584 1784 3584 \nQ 2172 3584 2450 3431 \nQ 2728 3278 2906 2969 \nL 2906 3500 \nL 3481 3500 \nL 3481 434 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-73\" d=\"M 2834 3397 \nL 2834 2853 \nQ 2591 2978 2328 3040 \nQ 2066 3103 1784 3103 \nQ 1356 3103 1142 2972 \nQ 928 2841 928 2578 \nQ 928 2378 1081 2264 \nQ 1234 2150 1697 2047 \nL 1894 2003 \nQ 2506 1872 2764 1633 \nQ 3022 1394 3022 966 \nQ 3022 478 2636 193 \nQ 2250 -91 1575 -91 \nQ 1294 -91 989 -36 \nQ 684 19 347 128 \nL 347 722 \nQ 666 556 975 473 \nQ 1284 391 1588 391 \nQ 1994 391 2212 530 \nQ 2431 669 2431 922 \nQ 2431 1156 2273 1281 \nQ 2116 1406 1581 1522 \nL 1381 1569 \nQ 847 1681 609 1914 \nQ 372 2147 372 2553 \nQ 372 3047 722 3315 \nQ 1072 3584 1716 3584 \nQ 2034 3584 2315 3537 \nQ 2597 3491 2834 3397 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-6e\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"63.378906\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"124.560547\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"188.037109\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"249.560547\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"299.560547\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"363.037109\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"424.316406\"/>\n </g>\n </g>\n </g>\n <g id=\"text_4\">\n <g clip-path=\"url(#pd6ce77bb75)\">\n <!-- CHP -->\n <g transform=\"translate(135.18546 140.965432)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-43\" d=\"M 4122 4306 \nL 4122 3641 \nQ 3803 3938 3442 4084 \nQ 3081 4231 2675 4231 \nQ 1875 4231 1450 3742 \nQ 1025 3253 1025 2328 \nQ 1025 1406 1450 917 \nQ 1875 428 2675 428 \nQ 3081 428 3442 575 \nQ 3803 722 4122 1019 \nL 4122 359 \nQ 3791 134 3420 21 \nQ 3050 -91 2638 -91 \nQ 1578 -91 968 557 \nQ 359 1206 359 2328 \nQ 359 3453 968 4101 \nQ 1578 4750 2638 4750 \nQ 3056 4750 3426 4639 \nQ 3797 4528 4122 4306 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-48\" d=\"M 628 4666 \nL 1259 4666 \nL 1259 2753 \nL 3553 2753 \nL 3553 4666 \nL 4184 4666 \nL 4184 0 \nL 3553 0 \nL 3553 2222 \nL 1259 2222 \nL 1259 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-50\" d=\"M 1259 4147 \nL 1259 2394 \nL 2053 2394 \nQ 2494 2394 2734 2622 \nQ 2975 2850 2975 3272 \nQ 2975 3691 2734 3919 \nQ 2494 4147 2053 4147 \nL 1259 4147 \nz\nM 628 4666 \nL 2053 4666 \nQ 2838 4666 3239 4311 \nQ 3641 3956 3641 3272 \nQ 3641 2581 3239 2228 \nQ 2838 1875 2053 1875 \nL 1259 1875 \nL 1259 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n </g>\n </g>\n </g>\n <g id=\"text_5\">\n <g clip-path=\"url(#pd6ce77bb75)\">\n <!-- SC_power -->\n <g transform=\"translate(59.198399 43.21251)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-53\" d=\"M 3425 4513 \nL 3425 3897 \nQ 3066 4069 2747 4153 \nQ 2428 4238 2131 4238 \nQ 1616 4238 1336 4038 \nQ 1056 3838 1056 3469 \nQ 1056 3159 1242 3001 \nQ 1428 2844 1947 2747 \nL 2328 2669 \nQ 3034 2534 3370 2195 \nQ 3706 1856 3706 1288 \nQ 3706 609 3251 259 \nQ 2797 -91 1919 -91 \nQ 1588 -91 1214 -16 \nQ 841 59 441 206 \nL 441 856 \nQ 825 641 1194 531 \nQ 1563 422 1919 422 \nQ 2459 422 2753 634 \nQ 3047 847 3047 1241 \nQ 3047 1584 2836 1778 \nQ 2625 1972 2144 2069 \nL 1759 2144 \nQ 1053 2284 737 2584 \nQ 422 2884 422 3419 \nQ 422 4038 858 4394 \nQ 1294 4750 2059 4750 \nQ 2388 4750 2728 4690 \nQ 3069 4631 3425 4513 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"246.777344\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"307.958984\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"389.746094\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"451.269531\"/>\n </g>\n </g>\n </g>\n <g id=\"text_6\">\n <g clip-path=\"url(#pd6ce77bb75)\">\n <!-- SC_heat -->\n <g transform=\"translate(296.598982 157.56276)scale(0.08 -0.08)\">\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"246.679688\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"308.203125\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"369.482422\"/>\n </g>\n </g>\n </g>\n <g id=\"text_7\">\n <g clip-path=\"url(#pd6ce77bb75)\">\n <!-- SC_gas -->\n <g transform=\"translate(21.846018 222.91499)scale(0.08 -0.08)\">\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"246.777344\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"308.056641\"/>\n </g>\n </g>\n </g>\n <g id=\"text_8\">\n <!-- Network graph for portfolio -->\n <g transform=\"translate(92.925938 16.318125)scale(0.12 -0.12)\">\n <defs>\n <path id=\"DejaVuSans-4e\" d=\"M 628 4666 \nL 1478 4666 \nL 3547 763 \nL 3547 4666 \nL 4159 4666 \nL 4159 0 \nL 3309 0 \nL 1241 3903 \nL 1241 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6b\" d=\"M 581 4863 \nL 1159 4863 \nL 1159 1991 \nL 2875 3500 \nL 3609 3500 \nL 1753 1863 \nL 3688 0 \nL 2938 0 \nL 1159 1709 \nL 1159 0 \nL 581 0 \nL 581 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-20\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-66\" d=\"M 2375 4863 \nL 2375 4384 \nL 1825 4384 \nQ 1516 4384 1395 4259 \nQ 1275 4134 1275 3809 \nL 1275 3500 \nL 2222 3500 \nL 2222 3053 \nL 1275 3053 \nL 1275 0 \nL 697 0 \nL 697 3053 \nL 147 3053 \nL 147 3500 \nL 697 3500 \nL 697 3744 \nQ 697 4328 969 4595 \nQ 1241 4863 1831 4863 \nL 2375 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6c\" d=\"M 603 4863 \nL 1178 4863 \nL 1178 0 \nL 603 0 \nL 603 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-69\" d=\"M 603 3500 \nL 1178 3500 \nL 1178 0 \nL 603 0 \nL 603 3500 \nz\nM 603 4863 \nL 1178 4863 \nL 1178 4134 \nL 603 4134 \nL 603 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-4e\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"74.804688\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"136.328125\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"175.537109\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"257.324219\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"318.505859\"/>\n <use xlink:href=\"#DejaVuSans-6b\" x=\"359.619141\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"417.529297\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"449.316406\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"512.792969\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"553.90625\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"615.185547\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"678.662109\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"742.041016\"/>\n <use xlink:href=\"#DejaVuSans-66\" x=\"773.828125\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"809.033203\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"870.214844\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"911.328125\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"943.115234\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"1006.591797\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"1067.773438\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"1108.886719\"/>\n <use xlink:href=\"#DejaVuSans-66\" x=\"1148.095703\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"1183.300781\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"1244.482422\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"1272.265625\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"1300.048828\"/>\n </g>\n </g>\n </g>\n </g>\n <defs>\n <clipPath id=\"pd6ce77bb75\">\n <rect x=\"7.2\" y=\"22.318125\" width=\"334.8\" height=\"217.44\"/>\n </clipPath>\n </defs>\n</svg>\n", - "image/png": "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\n" + "image/svg+xml": "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"\n \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"349.2pt\" height=\"246.958125pt\" viewBox=\"0 0 349.2 246.958125\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n <metadata>\n <rdf:RDF xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://creativecommons.org/ns#\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n <cc:Work>\n <dc:type rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\"/>\n <dc:date>2022-08-03T18:37:58.667188</dc:date>\n <dc:format>image/svg+xml</dc:format>\n <dc:creator>\n <cc:Agent>\n <dc:title>Matplotlib v3.5.0, https://matplotlib.org/</dc:title>\n </cc:Agent>\n </dc:creator>\n </cc:Work>\n </rdf:RDF>\n </metadata>\n <defs>\n <style type=\"text/css\">*{stroke-linejoin: round; stroke-linecap: butt}</style>\n </defs>\n <g id=\"figure_1\">\n <g id=\"patch_1\">\n <path d=\"M 0 246.958125 \nL 349.2 246.958125 \nL 349.2 0 \nL 0 0 \nL 0 246.958125 \nz\n\" style=\"fill: none\"/>\n </g>\n <g id=\"axes_1\">\n <g id=\"patch_2\">\n <path d=\"M 223.047532 136.167161 \nQ 182.236708 134.89692 142.543378 133.661462 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 146.479221 135.784934 \nL 142.543378 133.661462 \nL 146.603662 131.78687 \nL 146.479221 135.784934 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_3\">\n <path d=\"M 240.356352 136.740625 \nQ 272.32526 137.863953 303.176824 138.94802 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 299.249525 136.808788 \nL 303.176824 138.94802 \nL 299.109059 140.806321 \nL 299.249525 136.808788 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_4\">\n <path d=\"M 93.6438 89.431759 \nQ 110.326759 108.159918 126.266047 126.05324 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 125.098816 121.736114 \nL 126.266047 126.05324 \nL 122.112008 124.396749 \nL 125.098816 121.736114 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_5\">\n <path d=\"M 82.065176 76.545411 \nQ 68.949865 62.074183 56.585358 48.431383 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 57.789586 52.738334 \nL 56.585358 48.431383 \nL 60.753456 50.052171 \nL 57.789586 52.738334 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_6\">\n <path d=\"M 86.536246 175.24743 \nQ 106.44431 157.21071 125.523821 139.924658 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 121.21667 141.128172 \nL 125.523821 139.924658 \nL 123.902342 144.092488 \nL 121.21667 141.128172 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_7\">\n <path d=\"M 73.70616 186.883949 \nQ 58.185593 200.975732 43.492778 214.315964 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 47.798645 213.107862 \nL 43.492778 214.315964 \nL 45.109816 210.146409 \nL 47.798645 213.107862 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_8\">\n <path d=\"M 141.428355 133.626757 \nQ 182.239179 134.896997 221.93251 136.132456 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 217.996666 134.008984 \nL 221.93251 136.132456 \nL 217.872226 138.007048 \nL 217.996666 134.008984 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_9\">\n <path d=\"M 127.01047 126.888923 \nQ 110.327511 108.160763 94.388223 90.267442 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 95.555454 94.584568 \nL 94.388223 90.267442 \nL 98.542262 91.923933 \nL 95.555454 94.584568 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_10\">\n <path d=\"M 126.354644 139.171932 \nQ 106.44658 157.208652 87.367068 174.494704 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 91.67422 173.29119 \nL 87.367068 174.494704 \nL 88.988548 170.326874 \nL 91.67422 173.29119 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_11\">\n <path d=\"M 304.294135 138.98728 \nQ 272.325226 137.863952 241.473662 136.779885 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 245.400962 138.919117 \nL 241.473662 136.779885 \nL 245.541428 134.921584 \nL 245.400962 138.919117 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_12\">\n <path d=\"M 55.836236 47.604813 \nQ 68.951548 62.076041 81.316055 75.718842 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 80.111826 71.41189 \nL 81.316055 75.718842 \nL 77.147956 74.098053 \nL 80.111826 71.41189 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"patch_13\">\n <path d=\"M 42.665115 215.067435 \nQ 58.185681 200.975652 72.878496 187.63542 \n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: none; stroke: #808080; stroke-linecap: round\"/>\n <path d=\"M 68.572629 188.843522 \nL 72.878496 187.63542 \nL 71.261458 191.804975 \nL 68.572629 188.843522 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; stroke: #808080; stroke-linecap: round\"/>\n </g>\n <g id=\"PathCollection_1\">\n <path d=\"M 231.703379 147.616915 \nC 234.66844 147.616915 237.512459 146.438884 239.609073 144.342269 \nC 241.705688 142.245655 242.883719 139.401636 242.883719 136.436575 \nC 242.883719 133.471514 241.705688 130.627495 239.609073 128.530881 \nC 237.512459 126.434266 234.66844 125.256235 231.703379 125.256235 \nC 228.738318 125.256235 225.8943 126.434266 223.797685 128.530881 \nC 221.70107 130.627495 220.523039 133.471514 220.523039 136.436575 \nC 220.523039 139.401636 221.70107 142.245655 223.797685 144.342269 \nC 225.8943 146.438884 228.738318 147.616915 231.703379 147.616915 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #ffa500; fill-opacity: 0.7; stroke: #ffa500; stroke-opacity: 0.7\"/>\n <path d=\"M 87.881762 94.143679 \nC 90.846823 94.143679 93.690841 92.965648 95.787456 90.869033 \nC 97.884071 88.772419 99.062102 85.9284 99.062102 82.963339 \nC 99.062102 79.998278 97.884071 77.15426 95.787456 75.057645 \nC 93.690841 72.96103 90.846823 71.782999 87.881762 71.782999 \nC 84.916701 71.782999 82.072682 72.96103 79.976068 75.057645 \nC 77.879453 77.15426 76.701422 79.998278 76.701422 82.963339 \nC 76.701422 85.9284 77.879453 88.772419 79.976068 90.869033 \nC 82.072682 92.965648 84.916701 94.143679 87.881762 94.143679 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #ffa500; fill-opacity: 0.7; stroke: #ffa500; stroke-opacity: 0.7\"/>\n <path d=\"M 80.118382 192.242359 \nC 83.083443 192.242359 85.927461 191.064328 88.024076 188.967714 \nC 90.120691 186.871099 91.298722 184.02708 91.298722 181.062019 \nC 91.298722 178.096959 90.120691 175.25294 88.024076 173.156325 \nC 85.927461 171.059711 83.083443 169.88168 80.118382 169.88168 \nC 77.153321 169.88168 74.309302 171.059711 72.212688 173.156325 \nC 70.116073 175.25294 68.938042 178.096959 68.938042 181.062019 \nC 68.938042 184.02708 70.116073 186.871099 72.212688 188.967714 \nC 74.309302 191.064328 77.153321 192.242359 80.118382 192.242359 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #ffa500; fill-opacity: 0.7; stroke: #ffa500; stroke-opacity: 0.7\"/>\n <path d=\"M 132.772508 140.42841 \nC 134.647777 140.42841 136.446493 139.683358 137.772508 138.357343 \nC 139.098524 137.031327 139.843576 135.232612 139.843576 133.357343 \nC 139.843576 131.482073 139.098524 129.683358 137.772508 128.357343 \nC 136.446493 127.031327 134.647777 126.286275 132.772508 126.286275 \nC 130.897239 126.286275 129.098524 127.031327 127.772508 128.357343 \nC 126.446493 129.683358 125.70144 131.482073 125.70144 133.357343 \nC 125.70144 135.232612 126.446493 137.031327 127.772508 138.357343 \nC 129.098524 139.683358 130.897239 140.42841 132.772508 140.42841 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; fill-opacity: 0.7; stroke: #808080; stroke-opacity: 0.7\"/>\n <path d=\"M 312.947107 146.362398 \nC 314.822377 146.362398 316.621092 145.617345 317.947107 144.29133 \nC 319.273123 142.965314 320.018175 141.166599 320.018175 139.29133 \nC 320.018175 137.416061 319.273123 135.617345 317.947107 134.29133 \nC 316.621092 132.965314 314.822377 132.220262 312.947107 132.220262 \nC 311.071838 132.220262 309.273123 132.965314 307.947107 134.29133 \nC 306.621092 135.617345 305.87604 137.416061 305.87604 139.29133 \nC 305.87604 141.166599 306.621092 142.965314 307.947107 144.29133 \nC 309.273123 145.617345 311.071838 146.362398 312.947107 146.362398 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; fill-opacity: 0.7; stroke: #808080; stroke-opacity: 0.7\"/>\n <path d=\"M 50.019651 48.257953 \nC 51.89492 48.257953 53.693635 47.512901 55.019651 46.186885 \nC 56.345666 44.86087 57.090719 43.062154 57.090719 41.186885 \nC 57.090719 39.311616 56.345666 37.512901 55.019651 36.186885 \nC 53.693635 34.86087 51.89492 34.115818 50.019651 34.115818 \nC 48.144382 34.115818 46.345666 34.86087 45.019651 36.186885 \nC 43.693635 37.512901 42.948583 39.311616 42.948583 41.186885 \nC 42.948583 43.062154 43.693635 44.86087 45.019651 46.186885 \nC 46.345666 47.512901 48.144382 48.257953 50.019651 48.257953 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; fill-opacity: 0.7; stroke: #808080; stroke-opacity: 0.7\"/>\n <path d=\"M 36.252893 227.960432 \nC 38.128162 227.960432 39.926877 227.21538 41.252893 225.889365 \nC 42.578908 224.563349 43.32396 222.764634 43.32396 220.889365 \nC 43.32396 219.014096 42.578908 217.21538 41.252893 215.889365 \nC 39.926877 214.563349 38.128162 213.818297 36.252893 213.818297 \nC 34.377623 213.818297 32.578908 214.563349 31.252893 215.889365 \nC 29.926877 217.21538 29.181825 219.014096 29.181825 220.889365 \nC 29.181825 222.764634 29.926877 224.563349 31.252893 225.889365 \nC 32.578908 227.21538 34.377623 227.960432 36.252893 227.960432 \nz\n\" clip-path=\"url(#p82a8098e4b)\" style=\"fill: #808080; fill-opacity: 0.7; stroke: #808080; stroke-opacity: 0.7\"/>\n </g>\n <g id=\"text_1\">\n <g clip-path=\"url(#p82a8098e4b)\">\n <!-- node_power -->\n <g transform=\"translate(207.356504 138.532825)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-6e\" d=\"M 3513 2113 \nL 3513 0 \nL 2938 0 \nL 2938 2094 \nQ 2938 2591 2744 2837 \nQ 2550 3084 2163 3084 \nQ 1697 3084 1428 2787 \nQ 1159 2491 1159 1978 \nL 1159 0 \nL 581 0 \nL 581 3500 \nL 1159 3500 \nL 1159 2956 \nQ 1366 3272 1645 3428 \nQ 1925 3584 2291 3584 \nQ 2894 3584 3203 3211 \nQ 3513 2838 3513 2113 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6f\" d=\"M 1959 3097 \nQ 1497 3097 1228 2736 \nQ 959 2375 959 1747 \nQ 959 1119 1226 758 \nQ 1494 397 1959 397 \nQ 2419 397 2687 759 \nQ 2956 1122 2956 1747 \nQ 2956 2369 2687 2733 \nQ 2419 3097 1959 3097 \nz\nM 1959 3584 \nQ 2709 3584 3137 3096 \nQ 3566 2609 3566 1747 \nQ 3566 888 3137 398 \nQ 2709 -91 1959 -91 \nQ 1206 -91 779 398 \nQ 353 888 353 1747 \nQ 353 2609 779 3096 \nQ 1206 3584 1959 3584 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-64\" d=\"M 2906 2969 \nL 2906 4863 \nL 3481 4863 \nL 3481 0 \nL 2906 0 \nL 2906 525 \nQ 2725 213 2448 61 \nQ 2172 -91 1784 -91 \nQ 1150 -91 751 415 \nQ 353 922 353 1747 \nQ 353 2572 751 3078 \nQ 1150 3584 1784 3584 \nQ 2172 3584 2448 3432 \nQ 2725 3281 2906 2969 \nz\nM 947 1747 \nQ 947 1113 1208 752 \nQ 1469 391 1925 391 \nQ 2381 391 2643 752 \nQ 2906 1113 2906 1747 \nQ 2906 2381 2643 2742 \nQ 2381 3103 1925 3103 \nQ 1469 3103 1208 2742 \nQ 947 2381 947 1747 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-65\" d=\"M 3597 1894 \nL 3597 1613 \nL 953 1613 \nQ 991 1019 1311 708 \nQ 1631 397 2203 397 \nQ 2534 397 2845 478 \nQ 3156 559 3463 722 \nL 3463 178 \nQ 3153 47 2828 -22 \nQ 2503 -91 2169 -91 \nQ 1331 -91 842 396 \nQ 353 884 353 1716 \nQ 353 2575 817 3079 \nQ 1281 3584 2069 3584 \nQ 2775 3584 3186 3129 \nQ 3597 2675 3597 1894 \nz\nM 3022 2063 \nQ 3016 2534 2758 2815 \nQ 2500 3097 2075 3097 \nQ 1594 3097 1305 2825 \nQ 1016 2553 972 2059 \nL 3022 2063 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-5f\" d=\"M 3263 -1063 \nL 3263 -1509 \nL -63 -1509 \nL -63 -1063 \nL 3263 -1063 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-70\" d=\"M 1159 525 \nL 1159 -1331 \nL 581 -1331 \nL 581 3500 \nL 1159 3500 \nL 1159 2969 \nQ 1341 3281 1617 3432 \nQ 1894 3584 2278 3584 \nQ 2916 3584 3314 3078 \nQ 3713 2572 3713 1747 \nQ 3713 922 3314 415 \nQ 2916 -91 2278 -91 \nQ 1894 -91 1617 61 \nQ 1341 213 1159 525 \nz\nM 3116 1747 \nQ 3116 2381 2855 2742 \nQ 2594 3103 2138 3103 \nQ 1681 3103 1420 2742 \nQ 1159 2381 1159 1747 \nQ 1159 1113 1420 752 \nQ 1681 391 2138 391 \nQ 2594 391 2855 752 \nQ 3116 1113 3116 1747 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-77\" d=\"M 269 3500 \nL 844 3500 \nL 1563 769 \nL 2278 3500 \nL 2956 3500 \nL 3675 769 \nL 4391 3500 \nL 4966 3500 \nL 4050 0 \nL 3372 0 \nL 2619 2869 \nL 1863 0 \nL 1184 0 \nL 269 3500 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-72\" d=\"M 2631 2963 \nQ 2534 3019 2420 3045 \nQ 2306 3072 2169 3072 \nQ 1681 3072 1420 2755 \nQ 1159 2438 1159 1844 \nL 1159 0 \nL 581 0 \nL 581 3500 \nL 1159 3500 \nL 1159 2956 \nQ 1341 3275 1631 3429 \nQ 1922 3584 2338 3584 \nQ 2397 3584 2469 3576 \nQ 2541 3569 2628 3553 \nL 2631 2963 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-6e\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"63.378906\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"124.560547\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"188.037109\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"249.560547\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"299.560547\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"363.037109\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"424.21875\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"506.005859\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"567.529297\"/>\n </g>\n </g>\n </g>\n <g id=\"text_2\">\n <g clip-path=\"url(#p82a8098e4b)\">\n <!-- node_heat -->\n <g transform=\"translate(66.883012 85.059589)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-68\" d=\"M 3513 2113 \nL 3513 0 \nL 2938 0 \nL 2938 2094 \nQ 2938 2591 2744 2837 \nQ 2550 3084 2163 3084 \nQ 1697 3084 1428 2787 \nQ 1159 2491 1159 1978 \nL 1159 0 \nL 581 0 \nL 581 4863 \nL 1159 4863 \nL 1159 2956 \nQ 1366 3272 1645 3428 \nQ 1925 3584 2291 3584 \nQ 2894 3584 3203 3211 \nQ 3513 2838 3513 2113 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-61\" d=\"M 2194 1759 \nQ 1497 1759 1228 1600 \nQ 959 1441 959 1056 \nQ 959 750 1161 570 \nQ 1363 391 1709 391 \nQ 2188 391 2477 730 \nQ 2766 1069 2766 1631 \nL 2766 1759 \nL 2194 1759 \nz\nM 3341 1997 \nL 3341 0 \nL 2766 0 \nL 2766 531 \nQ 2569 213 2275 61 \nQ 1981 -91 1556 -91 \nQ 1019 -91 701 211 \nQ 384 513 384 1019 \nQ 384 1609 779 1909 \nQ 1175 2209 1959 2209 \nL 2766 2209 \nL 2766 2266 \nQ 2766 2663 2505 2880 \nQ 2244 3097 1772 3097 \nQ 1472 3097 1187 3025 \nQ 903 2953 641 2809 \nL 641 3341 \nQ 956 3463 1253 3523 \nQ 1550 3584 1831 3584 \nQ 2591 3584 2966 3190 \nQ 3341 2797 3341 1997 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-74\" d=\"M 1172 4494 \nL 1172 3500 \nL 2356 3500 \nL 2356 3053 \nL 1172 3053 \nL 1172 1153 \nQ 1172 725 1289 603 \nQ 1406 481 1766 481 \nL 2356 481 \nL 2356 0 \nL 1766 0 \nQ 1100 0 847 248 \nQ 594 497 594 1153 \nL 594 3053 \nL 172 3053 \nL 172 3500 \nL 594 3500 \nL 594 4494 \nL 1172 4494 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-6e\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"63.378906\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"124.560547\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"188.037109\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"249.560547\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"299.560547\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"362.939453\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"424.462891\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"485.742188\"/>\n </g>\n </g>\n </g>\n <g id=\"text_3\">\n <g clip-path=\"url(#p82a8098e4b)\">\n <!-- node_gas -->\n <g transform=\"translate(61.060882 183.158269)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-67\" d=\"M 2906 1791 \nQ 2906 2416 2648 2759 \nQ 2391 3103 1925 3103 \nQ 1463 3103 1205 2759 \nQ 947 2416 947 1791 \nQ 947 1169 1205 825 \nQ 1463 481 1925 481 \nQ 2391 481 2648 825 \nQ 2906 1169 2906 1791 \nz\nM 3481 434 \nQ 3481 -459 3084 -895 \nQ 2688 -1331 1869 -1331 \nQ 1566 -1331 1297 -1286 \nQ 1028 -1241 775 -1147 \nL 775 -588 \nQ 1028 -725 1275 -790 \nQ 1522 -856 1778 -856 \nQ 2344 -856 2625 -561 \nQ 2906 -266 2906 331 \nL 2906 616 \nQ 2728 306 2450 153 \nQ 2172 0 1784 0 \nQ 1141 0 747 490 \nQ 353 981 353 1791 \nQ 353 2603 747 3093 \nQ 1141 3584 1784 3584 \nQ 2172 3584 2450 3431 \nQ 2728 3278 2906 2969 \nL 2906 3500 \nL 3481 3500 \nL 3481 434 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-73\" d=\"M 2834 3397 \nL 2834 2853 \nQ 2591 2978 2328 3040 \nQ 2066 3103 1784 3103 \nQ 1356 3103 1142 2972 \nQ 928 2841 928 2578 \nQ 928 2378 1081 2264 \nQ 1234 2150 1697 2047 \nL 1894 2003 \nQ 2506 1872 2764 1633 \nQ 3022 1394 3022 966 \nQ 3022 478 2636 193 \nQ 2250 -91 1575 -91 \nQ 1294 -91 989 -36 \nQ 684 19 347 128 \nL 347 722 \nQ 666 556 975 473 \nQ 1284 391 1588 391 \nQ 1994 391 2212 530 \nQ 2431 669 2431 922 \nQ 2431 1156 2273 1281 \nQ 2116 1406 1581 1522 \nL 1381 1569 \nQ 847 1681 609 1914 \nQ 372 2147 372 2553 \nQ 372 3047 722 3315 \nQ 1072 3584 1716 3584 \nQ 2034 3584 2315 3537 \nQ 2597 3491 2834 3397 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-6e\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"63.378906\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"124.560547\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"188.037109\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"249.560547\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"299.560547\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"363.037109\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"424.316406\"/>\n </g>\n </g>\n </g>\n <g id=\"text_4\">\n <g clip-path=\"url(#p82a8098e4b)\">\n <!-- CHP -->\n <g transform=\"translate(124.559383 135.564843)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-43\" d=\"M 4122 4306 \nL 4122 3641 \nQ 3803 3938 3442 4084 \nQ 3081 4231 2675 4231 \nQ 1875 4231 1450 3742 \nQ 1025 3253 1025 2328 \nQ 1025 1406 1450 917 \nQ 1875 428 2675 428 \nQ 3081 428 3442 575 \nQ 3803 722 4122 1019 \nL 4122 359 \nQ 3791 134 3420 21 \nQ 3050 -91 2638 -91 \nQ 1578 -91 968 557 \nQ 359 1206 359 2328 \nQ 359 3453 968 4101 \nQ 1578 4750 2638 4750 \nQ 3056 4750 3426 4639 \nQ 3797 4528 4122 4306 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-48\" d=\"M 628 4666 \nL 1259 4666 \nL 1259 2753 \nL 3553 2753 \nL 3553 4666 \nL 4184 4666 \nL 4184 0 \nL 3553 0 \nL 3553 2222 \nL 1259 2222 \nL 1259 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-50\" d=\"M 1259 4147 \nL 1259 2394 \nL 2053 2394 \nQ 2494 2394 2734 2622 \nQ 2975 2850 2975 3272 \nQ 2975 3691 2734 3919 \nQ 2494 4147 2053 4147 \nL 1259 4147 \nz\nM 628 4666 \nL 2053 4666 \nQ 2838 4666 3239 4311 \nQ 3641 3956 3641 3272 \nQ 3641 2581 3239 2228 \nQ 2838 1875 2053 1875 \nL 1259 1875 \nL 1259 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n </g>\n </g>\n </g>\n <g id=\"text_5\">\n <g clip-path=\"url(#p82a8098e4b)\">\n <!-- SC_power -->\n <g transform=\"translate(293.250857 141.316955)scale(0.08 -0.08)\">\n <defs>\n <path id=\"DejaVuSans-53\" d=\"M 3425 4513 \nL 3425 3897 \nQ 3066 4069 2747 4153 \nQ 2428 4238 2131 4238 \nQ 1616 4238 1336 4038 \nQ 1056 3838 1056 3469 \nQ 1056 3159 1242 3001 \nQ 1428 2844 1947 2747 \nL 2328 2669 \nQ 3034 2534 3370 2195 \nQ 3706 1856 3706 1288 \nQ 3706 609 3251 259 \nQ 2797 -91 1919 -91 \nQ 1588 -91 1214 -16 \nQ 841 59 441 206 \nL 441 856 \nQ 825 641 1194 531 \nQ 1563 422 1919 422 \nQ 2459 422 2753 634 \nQ 3047 847 3047 1241 \nQ 3047 1584 2836 1778 \nQ 2625 1972 2144 2069 \nL 1759 2144 \nQ 1053 2284 737 2584 \nQ 422 2884 422 3419 \nQ 422 4038 858 4394 \nQ 1294 4750 2059 4750 \nQ 2388 4750 2728 4690 \nQ 3069 4631 3425 4513 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"246.777344\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"307.958984\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"389.746094\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"451.269531\"/>\n </g>\n </g>\n </g>\n <g id=\"text_6\">\n <g clip-path=\"url(#p82a8098e4b)\">\n <!-- SC_heat -->\n <g transform=\"translate(33.671526 43.283135)scale(0.08 -0.08)\">\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"246.679688\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"308.203125\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"369.482422\"/>\n </g>\n </g>\n </g>\n <g id=\"text_7\">\n <g clip-path=\"url(#p82a8098e4b)\">\n <!-- SC_gas -->\n <g transform=\"translate(21.846018 222.91499)scale(0.08 -0.08)\">\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"246.777344\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"308.056641\"/>\n </g>\n </g>\n </g>\n <g id=\"text_8\">\n <!-- Network graph for portfolio -->\n <g transform=\"translate(92.925938 16.318125)scale(0.12 -0.12)\">\n <defs>\n <path id=\"DejaVuSans-4e\" d=\"M 628 4666 \nL 1478 4666 \nL 3547 763 \nL 3547 4666 \nL 4159 4666 \nL 4159 0 \nL 3309 0 \nL 1241 3903 \nL 1241 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6b\" d=\"M 581 4863 \nL 1159 4863 \nL 1159 1991 \nL 2875 3500 \nL 3609 3500 \nL 1753 1863 \nL 3688 0 \nL 2938 0 \nL 1159 1709 \nL 1159 0 \nL 581 0 \nL 581 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-20\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-66\" d=\"M 2375 4863 \nL 2375 4384 \nL 1825 4384 \nQ 1516 4384 1395 4259 \nQ 1275 4134 1275 3809 \nL 1275 3500 \nL 2222 3500 \nL 2222 3053 \nL 1275 3053 \nL 1275 0 \nL 697 0 \nL 697 3053 \nL 147 3053 \nL 147 3500 \nL 697 3500 \nL 697 3744 \nQ 697 4328 969 4595 \nQ 1241 4863 1831 4863 \nL 2375 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6c\" d=\"M 603 4863 \nL 1178 4863 \nL 1178 0 \nL 603 0 \nL 603 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-69\" d=\"M 603 3500 \nL 1178 3500 \nL 1178 0 \nL 603 0 \nL 603 3500 \nz\nM 603 4863 \nL 1178 4863 \nL 1178 4134 \nL 603 4134 \nL 603 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-4e\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"74.804688\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"136.328125\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"175.537109\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"257.324219\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"318.505859\"/>\n <use xlink:href=\"#DejaVuSans-6b\" x=\"359.619141\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"417.529297\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"449.316406\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"512.792969\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"553.90625\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"615.185547\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"678.662109\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"742.041016\"/>\n <use xlink:href=\"#DejaVuSans-66\" x=\"773.828125\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"809.033203\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"870.214844\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"911.328125\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"943.115234\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"1006.591797\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"1067.773438\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"1108.886719\"/>\n <use xlink:href=\"#DejaVuSans-66\" x=\"1148.095703\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"1183.300781\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"1244.482422\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"1272.265625\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"1300.048828\"/>\n </g>\n </g>\n </g>\n </g>\n <defs>\n <clipPath id=\"p82a8098e4b\">\n <rect x=\"7.2\" y=\"22.318125\" width=\"334.8\" height=\"217.44\"/>\n </clipPath>\n </defs>\n</svg>\n", + "image/png": "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\n" }, "metadata": {} } @@ -162,11 +201,15 @@ " freq='h',\n", " conversion_factor_power_heat=0.5, \n", " max_share_heat=0.5,\n", - " ramp=20, \n", - " start_costs=1., \n", + " ramp=10, \n", + " start_ramp_lower_bounds=[3,4],\n", + " shutdown_ramp_lower_bounds=[1, 7],\n", + " start_costs=0., \n", " running_costs=0., \n", - " min_runtime=0, \n", + " min_runtime=0., \n", " time_already_running=0., \n", + " min_downtime=0.,\n", + " time_already_off=1.,\n", " last_dispatch=0., \n", " start_fuel=0)\n", "\n", @@ -201,8 +244,8 @@ { "output_type": "execute_result", "data": { - "text/plain": " Values\nParameter \nstatus successful\nvalue 254.108917", - "text/html": "<div>\n<style scoped>\n .dataframe tbody tr th:only-of-type {\n vertical-align: middle;\n }\n\n .dataframe tbody tr th {\n vertical-align: top;\n }\n\n .dataframe thead th {\n text-align: right;\n }\n</style>\n<table border=\"1\" class=\"dataframe\">\n <thead>\n <tr style=\"text-align: right;\">\n <th></th>\n <th>Values</th>\n </tr>\n <tr>\n <th>Parameter</th>\n <th></th>\n </tr>\n </thead>\n <tbody>\n <tr>\n <th>status</th>\n <td>successful</td>\n </tr>\n <tr>\n <th>value</th>\n <td>254.108917</td>\n </tr>\n </tbody>\n</table>\n</div>" + "text/plain": " Values\nParameter \nstatus successful\nvalue 206.848838", + "text/html": "<div>\n<style scoped>\n .dataframe tbody tr th:only-of-type {\n vertical-align: middle;\n }\n\n .dataframe tbody tr th {\n vertical-align: top;\n }\n\n .dataframe thead th {\n text-align: right;\n }\n</style>\n<table border=\"1\" class=\"dataframe\">\n <thead>\n <tr style=\"text-align: right;\">\n <th></th>\n <th>Values</th>\n </tr>\n <tr>\n <th>Parameter</th>\n <th></th>\n </tr>\n </thead>\n <tbody>\n <tr>\n <th>status</th>\n <td>successful</td>\n </tr>\n <tr>\n <th>value</th>\n <td>206.848838</td>\n </tr>\n </tbody>\n</table>\n</div>" }, "metadata": {}, "execution_count": 3 @@ -234,8 +277,8 @@ "output_type": "display_data", "data": { "text/plain": "<Figure size 1296x720 with 5 Axes>", - "image/svg+xml": "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"\n \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"1288.8pt\" height=\"712.8pt\" viewBox=\"0 0 1288.8 712.8\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n <metadata>\n <rdf:RDF xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://creativecommons.org/ns#\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n <cc:Work>\n <dc:type rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\"/>\n <dc:date>2022-07-04T17:43:46.560247</dc:date>\n <dc:format>image/svg+xml</dc:format>\n <dc:creator>\n <cc:Agent>\n <dc:title>Matplotlib v3.5.0, https://matplotlib.org/</dc:title>\n </cc:Agent>\n </dc:creator>\n </cc:Work>\n </rdf:RDF>\n </metadata>\n <defs>\n <style type=\"text/css\">*{stroke-linejoin: round; stroke-linecap: butt}</style>\n </defs>\n <g id=\"figure_1\">\n <g id=\"patch_1\">\n <path d=\"M 0 712.8 \nL 1288.8 712.8 \nL 1288.8 0 \nL 0 0 \nL 0 712.8 \nz\n\" style=\"fill: none\"/>\n </g>\n <g id=\"axes_1\">\n <g id=\"patch_2\">\n <path d=\"M 35.304688 311.92625 \nL 424.026042 311.92625 \nL 424.026042 22.318125 \nL 35.304688 22.318125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_1\">\n <g id=\"xtick_1\">\n <g id=\"line2d_1\">\n <defs>\n <path id=\"m444ee1ccb1\" d=\"M 0 0 \nL 0 3.5 \n\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </defs>\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"35.304688\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_1\">\n <!-- 00:00 -->\n <g transform=\"translate(20.895312 326.524687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-30\" d=\"M 2034 4250 \nQ 1547 4250 1301 3770 \nQ 1056 3291 1056 2328 \nQ 1056 1369 1301 889 \nQ 1547 409 2034 409 \nQ 2525 409 2770 889 \nQ 3016 1369 3016 2328 \nQ 3016 3291 2770 3770 \nQ 2525 4250 2034 4250 \nz\nM 2034 4750 \nQ 2819 4750 3233 4129 \nQ 3647 3509 3647 2328 \nQ 3647 1150 3233 529 \nQ 2819 -91 2034 -91 \nQ 1250 -91 836 529 \nQ 422 1150 422 2328 \nQ 422 3509 836 4129 \nQ 1250 4750 2034 4750 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-3a\" d=\"M 750 794 \nL 1409 794 \nL 1409 0 \nL 750 0 \nL 750 794 \nz\nM 750 3309 \nL 1409 3309 \nL 1409 2516 \nL 750 2516 \nL 750 3309 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n <!-- 01-Jan -->\n <g transform=\"translate(19.149219 337.7225)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-31\" d=\"M 794 531 \nL 1825 531 \nL 1825 4091 \nL 703 3866 \nL 703 4441 \nL 1819 4666 \nL 2450 4666 \nL 2450 531 \nL 3481 531 \nL 3481 0 \nL 794 0 \nL 794 531 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-2d\" d=\"M 313 2009 \nL 1997 2009 \nL 1997 1497 \nL 313 1497 \nL 313 2009 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-4a\" d=\"M 628 4666 \nL 1259 4666 \nL 1259 325 \nQ 1259 -519 939 -900 \nQ 619 -1281 -91 -1281 \nL -331 -1281 \nL -331 -750 \nL -134 -750 \nQ 284 -750 456 -515 \nQ 628 -281 628 325 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-61\" d=\"M 2194 1759 \nQ 1497 1759 1228 1600 \nQ 959 1441 959 1056 \nQ 959 750 1161 570 \nQ 1363 391 1709 391 \nQ 2188 391 2477 730 \nQ 2766 1069 2766 1631 \nL 2766 1759 \nL 2194 1759 \nz\nM 3341 1997 \nL 3341 0 \nL 2766 0 \nL 2766 531 \nQ 2569 213 2275 61 \nQ 1981 -91 1556 -91 \nQ 1019 -91 701 211 \nQ 384 513 384 1019 \nQ 384 1609 779 1909 \nQ 1175 2209 1959 2209 \nL 2766 2209 \nL 2766 2266 \nQ 2766 2663 2505 2880 \nQ 2244 3097 1772 3097 \nQ 1472 3097 1187 3025 \nQ 903 2953 641 2809 \nL 641 3341 \nQ 956 3463 1253 3523 \nQ 1550 3584 1831 3584 \nQ 2591 3584 2966 3190 \nQ 3341 2797 3341 1997 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6e\" d=\"M 3513 2113 \nL 3513 0 \nL 2938 0 \nL 2938 2094 \nQ 2938 2591 2744 2837 \nQ 2550 3084 2163 3084 \nQ 1697 3084 1428 2787 \nQ 1159 2491 1159 1978 \nL 1159 0 \nL 581 0 \nL 581 3500 \nL 1159 3500 \nL 1159 2956 \nQ 1366 3272 1645 3428 \nQ 1925 3584 2291 3584 \nQ 2894 3584 3203 3211 \nQ 3513 2838 3513 2113 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-2d\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-4a\" x=\"168.955078\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"198.447266\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"259.726562\"/>\n </g>\n <!-- 2021 -->\n <g transform=\"translate(22.579687 348.920312)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-32\" d=\"M 1228 531 \nL 3431 531 \nL 3431 0 \nL 469 0 \nL 469 531 \nQ 828 903 1448 1529 \nQ 2069 2156 2228 2338 \nQ 2531 2678 2651 2914 \nQ 2772 3150 2772 3378 \nQ 2772 3750 2511 3984 \nQ 2250 4219 1831 4219 \nQ 1534 4219 1204 4116 \nQ 875 4013 500 3803 \nL 500 4441 \nQ 881 4594 1212 4672 \nQ 1544 4750 1819 4750 \nQ 2544 4750 2975 4387 \nQ 3406 4025 3406 3419 \nQ 3406 3131 3298 2873 \nQ 3191 2616 2906 2266 \nQ 2828 2175 2409 1742 \nQ 1991 1309 1228 531 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"190.869141\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_2\">\n <g id=\"line2d_2\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"424.026042\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_3\">\n <g id=\"line2d_3\">\n <defs>\n <path id=\"mbdf76d2345\" d=\"M 0 0 \nL 0 2 \n\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </defs>\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"86.007473\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_2\">\n <!-- 03:00 -->\n <g transform=\"translate(71.598098 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-33\" d=\"M 2597 2516 \nQ 3050 2419 3304 2112 \nQ 3559 1806 3559 1356 \nQ 3559 666 3084 287 \nQ 2609 -91 1734 -91 \nQ 1441 -91 1130 -33 \nQ 819 25 488 141 \nL 488 750 \nQ 750 597 1062 519 \nQ 1375 441 1716 441 \nQ 2309 441 2620 675 \nQ 2931 909 2931 1356 \nQ 2931 1769 2642 2001 \nQ 2353 2234 1838 2234 \nL 1294 2234 \nL 1294 2753 \nL 1863 2753 \nQ 2328 2753 2575 2939 \nQ 2822 3125 2822 3475 \nQ 2822 3834 2567 4026 \nQ 2313 4219 1838 4219 \nQ 1578 4219 1281 4162 \nQ 984 4106 628 3988 \nL 628 4550 \nQ 988 4650 1302 4700 \nQ 1616 4750 1894 4750 \nQ 2613 4750 3031 4423 \nQ 3450 4097 3450 3541 \nQ 3450 3153 3228 2886 \nQ 3006 2619 2597 2516 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-33\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_4\">\n <g id=\"line2d_4\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"136.710258\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_3\">\n <!-- 06:00 -->\n <g transform=\"translate(122.300883 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-36\" d=\"M 2113 2584 \nQ 1688 2584 1439 2293 \nQ 1191 2003 1191 1497 \nQ 1191 994 1439 701 \nQ 1688 409 2113 409 \nQ 2538 409 2786 701 \nQ 3034 994 3034 1497 \nQ 3034 2003 2786 2293 \nQ 2538 2584 2113 2584 \nz\nM 3366 4563 \nL 3366 3988 \nQ 3128 4100 2886 4159 \nQ 2644 4219 2406 4219 \nQ 1781 4219 1451 3797 \nQ 1122 3375 1075 2522 \nQ 1259 2794 1537 2939 \nQ 1816 3084 2150 3084 \nQ 2853 3084 3261 2657 \nQ 3669 2231 3669 1497 \nQ 3669 778 3244 343 \nQ 2819 -91 2113 -91 \nQ 1303 -91 875 529 \nQ 447 1150 447 2328 \nQ 447 3434 972 4092 \nQ 1497 4750 2381 4750 \nQ 2619 4750 2861 4703 \nQ 3103 4656 3366 4563 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_5\">\n <g id=\"line2d_5\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"187.413043\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_4\">\n <!-- 09:00 -->\n <g transform=\"translate(173.003668 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-39\" d=\"M 703 97 \nL 703 672 \nQ 941 559 1184 500 \nQ 1428 441 1663 441 \nQ 2288 441 2617 861 \nQ 2947 1281 2994 2138 \nQ 2813 1869 2534 1725 \nQ 2256 1581 1919 1581 \nQ 1219 1581 811 2004 \nQ 403 2428 403 3163 \nQ 403 3881 828 4315 \nQ 1253 4750 1959 4750 \nQ 2769 4750 3195 4129 \nQ 3622 3509 3622 2328 \nQ 3622 1225 3098 567 \nQ 2575 -91 1691 -91 \nQ 1453 -91 1209 -44 \nQ 966 3 703 97 \nz\nM 1959 2075 \nQ 2384 2075 2632 2365 \nQ 2881 2656 2881 3163 \nQ 2881 3666 2632 3958 \nQ 2384 4250 1959 4250 \nQ 1534 4250 1286 3958 \nQ 1038 3666 1038 3163 \nQ 1038 2656 1286 2365 \nQ 1534 2075 1959 2075 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-39\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_6\">\n <g id=\"line2d_6\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"238.115829\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_5\">\n <!-- 12:00 -->\n <g transform=\"translate(223.706454 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_7\">\n <g id=\"line2d_7\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"288.818614\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_6\">\n <!-- 15:00 -->\n <g transform=\"translate(274.409239 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-35\" d=\"M 691 4666 \nL 3169 4666 \nL 3169 4134 \nL 1269 4134 \nL 1269 2991 \nQ 1406 3038 1543 3061 \nQ 1681 3084 1819 3084 \nQ 2600 3084 3056 2656 \nQ 3513 2228 3513 1497 \nQ 3513 744 3044 326 \nQ 2575 -91 1722 -91 \nQ 1428 -91 1123 -41 \nQ 819 9 494 109 \nL 494 744 \nQ 775 591 1075 516 \nQ 1375 441 1709 441 \nQ 2250 441 2565 725 \nQ 2881 1009 2881 1497 \nQ 2881 1984 2565 2268 \nQ 2250 2553 1709 2553 \nQ 1456 2553 1204 2497 \nQ 953 2441 691 2322 \nL 691 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_8\">\n <g id=\"line2d_8\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"339.521399\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_7\">\n <!-- 18:00 -->\n <g transform=\"translate(325.112024 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-38\" d=\"M 2034 2216 \nQ 1584 2216 1326 1975 \nQ 1069 1734 1069 1313 \nQ 1069 891 1326 650 \nQ 1584 409 2034 409 \nQ 2484 409 2743 651 \nQ 3003 894 3003 1313 \nQ 3003 1734 2745 1975 \nQ 2488 2216 2034 2216 \nz\nM 1403 2484 \nQ 997 2584 770 2862 \nQ 544 3141 544 3541 \nQ 544 4100 942 4425 \nQ 1341 4750 2034 4750 \nQ 2731 4750 3128 4425 \nQ 3525 4100 3525 3541 \nQ 3525 3141 3298 2862 \nQ 3072 2584 2669 2484 \nQ 3125 2378 3379 2068 \nQ 3634 1759 3634 1313 \nQ 3634 634 3220 271 \nQ 2806 -91 2034 -91 \nQ 1263 -91 848 271 \nQ 434 634 434 1313 \nQ 434 1759 690 2068 \nQ 947 2378 1403 2484 \nz\nM 1172 3481 \nQ 1172 3119 1398 2916 \nQ 1625 2713 2034 2713 \nQ 2441 2713 2670 2916 \nQ 2900 3119 2900 3481 \nQ 2900 3844 2670 4047 \nQ 2441 4250 2034 4250 \nQ 1625 4250 1398 4047 \nQ 1172 3844 1172 3481 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_9\">\n <g id=\"line2d_9\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"390.224185\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_8\">\n <!-- 21:00 -->\n <g transform=\"translate(375.81481 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_2\">\n <g id=\"ytick_1\">\n <g id=\"line2d_10\">\n <defs>\n <path id=\"mf12428344f\" d=\"M 0 0 \nL -3.5 0 \n\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </defs>\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"298.762244\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_9\">\n <!-- −20 -->\n <g transform=\"translate(7.2 302.561463)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-2212\" d=\"M 678 2272 \nL 4684 2272 \nL 4684 1741 \nL 678 1741 \nL 678 2272 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_2\">\n <g id=\"line2d_11\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"265.85223\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_10\">\n <!-- −15 -->\n <g transform=\"translate(7.2 269.651449)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_3\">\n <g id=\"line2d_12\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"232.942216\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_11\">\n <!-- −10 -->\n <g transform=\"translate(7.2 236.741435)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_4\">\n <g id=\"line2d_13\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"200.032202\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_12\">\n <!-- −5 -->\n <g transform=\"translate(13.5625 203.83142)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_5\">\n <g id=\"line2d_14\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"167.122187\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_13\">\n <!-- 0 -->\n <g transform=\"translate(21.942187 170.921406)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_6\">\n <g id=\"line2d_15\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"134.212173\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_14\">\n <!-- 5 -->\n <g transform=\"translate(21.942187 138.011392)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-35\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_7\">\n <g id=\"line2d_16\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"101.302159\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_15\">\n <!-- 10 -->\n <g transform=\"translate(15.579687 105.101378)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_8\">\n <g id=\"line2d_17\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"68.392145\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_16\">\n <!-- 15 -->\n <g transform=\"translate(15.579687 72.191364)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_9\">\n <g id=\"line2d_18\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"35.482131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_17\">\n <!-- 20 -->\n <g transform=\"translate(15.579687 39.281349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_19\">\n <path d=\"M 35.304688 61.810142 \nL 52.205616 61.810142 \nL 69.106544 61.810142 \nL 86.007473 61.810142 \nL 102.908401 61.810142 \nL 119.80933 35.482131 \nL 136.710258 35.482131 \nL 153.611187 167.122187 \nL 170.512115 167.122187 \nL 187.413043 167.122187 \nL 204.313972 167.122187 \nL 221.2149 61.810142 \nL 238.115829 61.810142 \nL 255.016757 61.810142 \nL 271.917686 61.810142 \nL 288.818614 61.810142 \nL 305.719543 61.810142 \nL 322.620471 61.810142 \nL 339.521399 35.482131 \nL 356.422328 35.482131 \nL 373.323256 167.122187 \nL 390.224185 167.122187 \nL 407.125113 167.122187 \nL 424.026042 167.122187 \n\" clip-path=\"url(#p695fc40edb)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <defs>\n <path id=\"mfe57183788\" d=\"M -3 3 \nL 3 -3 \nM -3 -3 \nL 3 3 \n\" style=\"stroke: #1f77b4\"/>\n </defs>\n <g clip-path=\"url(#p695fc40edb)\">\n <use xlink:href=\"#mfe57183788\" x=\"35.304688\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"52.205616\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"69.106544\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"86.007473\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"102.908401\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"119.80933\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"136.710258\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"153.611187\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"170.512115\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"187.413043\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"204.313972\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"221.2149\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"238.115829\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"255.016757\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"271.917686\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"288.818614\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"305.719543\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"322.620471\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"339.521399\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"356.422328\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"373.323256\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"390.224185\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"407.125113\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"424.026042\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_20\">\n <path d=\"M 35.304688 272.434233 \nL 52.205616 272.434233 \nL 69.106544 272.434233 \nL 86.007473 272.434233 \nL 102.908401 272.434233 \nL 119.80933 298.762244 \nL 136.710258 298.762244 \nL 153.611187 167.122187 \nL 170.512115 167.122187 \nL 187.413043 167.122187 \nL 204.313972 167.122187 \nL 221.2149 272.434233 \nL 238.115829 272.434233 \nL 255.016757 272.434233 \nL 271.917686 272.434233 \nL 288.818614 272.434233 \nL 305.719543 272.434233 \nL 322.620471 272.434233 \nL 339.521399 298.762244 \nL 356.422328 298.762244 \nL 373.323256 167.122187 \nL 390.224185 167.122187 \nL 407.125113 167.122187 \nL 424.026042 167.122187 \n\" clip-path=\"url(#p695fc40edb)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <defs>\n <path id=\"mfecacf5004\" d=\"M -3 3 \nL 3 -3 \nM -3 -3 \nL 3 3 \n\" style=\"stroke: #ff7f0e\"/>\n </defs>\n <g clip-path=\"url(#p695fc40edb)\">\n <use xlink:href=\"#mfecacf5004\" x=\"35.304688\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"52.205616\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"69.106544\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"86.007473\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"102.908401\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"119.80933\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"136.710258\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"153.611187\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"170.512115\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"187.413043\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"204.313972\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"221.2149\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"238.115829\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"255.016757\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"271.917686\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"288.818614\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"305.719543\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"322.620471\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"339.521399\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"356.422328\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"373.323256\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"390.224185\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"407.125113\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"424.026042\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"patch_3\">\n <path d=\"M 35.304688 311.92625 \nL 35.304688 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_4\">\n <path d=\"M 424.026042 311.92625 \nL 424.026042 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_5\">\n <path d=\"M 35.304688 311.92625 \nL 424.026042 311.92625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_6\">\n <path d=\"M 35.304688 22.318125 \nL 424.026042 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_18\">\n <!-- Dispatch node_power -->\n <g transform=\"translate(164.88599 16.318125)scale(0.12 -0.12)\">\n <defs>\n <path id=\"DejaVuSans-44\" d=\"M 1259 4147 \nL 1259 519 \nL 2022 519 \nQ 2988 519 3436 956 \nQ 3884 1394 3884 2338 \nQ 3884 3275 3436 3711 \nQ 2988 4147 2022 4147 \nL 1259 4147 \nz\nM 628 4666 \nL 1925 4666 \nQ 3281 4666 3915 4102 \nQ 4550 3538 4550 2338 \nQ 4550 1131 3912 565 \nQ 3275 0 1925 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-69\" d=\"M 603 3500 \nL 1178 3500 \nL 1178 0 \nL 603 0 \nL 603 3500 \nz\nM 603 4863 \nL 1178 4863 \nL 1178 4134 \nL 603 4134 \nL 603 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-73\" d=\"M 2834 3397 \nL 2834 2853 \nQ 2591 2978 2328 3040 \nQ 2066 3103 1784 3103 \nQ 1356 3103 1142 2972 \nQ 928 2841 928 2578 \nQ 928 2378 1081 2264 \nQ 1234 2150 1697 2047 \nL 1894 2003 \nQ 2506 1872 2764 1633 \nQ 3022 1394 3022 966 \nQ 3022 478 2636 193 \nQ 2250 -91 1575 -91 \nQ 1294 -91 989 -36 \nQ 684 19 347 128 \nL 347 722 \nQ 666 556 975 473 \nQ 1284 391 1588 391 \nQ 1994 391 2212 530 \nQ 2431 669 2431 922 \nQ 2431 1156 2273 1281 \nQ 2116 1406 1581 1522 \nL 1381 1569 \nQ 847 1681 609 1914 \nQ 372 2147 372 2553 \nQ 372 3047 722 3315 \nQ 1072 3584 1716 3584 \nQ 2034 3584 2315 3537 \nQ 2597 3491 2834 3397 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-70\" d=\"M 1159 525 \nL 1159 -1331 \nL 581 -1331 \nL 581 3500 \nL 1159 3500 \nL 1159 2969 \nQ 1341 3281 1617 3432 \nQ 1894 3584 2278 3584 \nQ 2916 3584 3314 3078 \nQ 3713 2572 3713 1747 \nQ 3713 922 3314 415 \nQ 2916 -91 2278 -91 \nQ 1894 -91 1617 61 \nQ 1341 213 1159 525 \nz\nM 3116 1747 \nQ 3116 2381 2855 2742 \nQ 2594 3103 2138 3103 \nQ 1681 3103 1420 2742 \nQ 1159 2381 1159 1747 \nQ 1159 1113 1420 752 \nQ 1681 391 2138 391 \nQ 2594 391 2855 752 \nQ 3116 1113 3116 1747 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-74\" d=\"M 1172 4494 \nL 1172 3500 \nL 2356 3500 \nL 2356 3053 \nL 1172 3053 \nL 1172 1153 \nQ 1172 725 1289 603 \nQ 1406 481 1766 481 \nL 2356 481 \nL 2356 0 \nL 1766 0 \nQ 1100 0 847 248 \nQ 594 497 594 1153 \nL 594 3053 \nL 172 3053 \nL 172 3500 \nL 594 3500 \nL 594 4494 \nL 1172 4494 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-63\" d=\"M 3122 3366 \nL 3122 2828 \nQ 2878 2963 2633 3030 \nQ 2388 3097 2138 3097 \nQ 1578 3097 1268 2742 \nQ 959 2388 959 1747 \nQ 959 1106 1268 751 \nQ 1578 397 2138 397 \nQ 2388 397 2633 464 \nQ 2878 531 3122 666 \nL 3122 134 \nQ 2881 22 2623 -34 \nQ 2366 -91 2075 -91 \nQ 1284 -91 818 406 \nQ 353 903 353 1747 \nQ 353 2603 823 3093 \nQ 1294 3584 2113 3584 \nQ 2378 3584 2631 3529 \nQ 2884 3475 3122 3366 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-68\" d=\"M 3513 2113 \nL 3513 0 \nL 2938 0 \nL 2938 2094 \nQ 2938 2591 2744 2837 \nQ 2550 3084 2163 3084 \nQ 1697 3084 1428 2787 \nQ 1159 2491 1159 1978 \nL 1159 0 \nL 581 0 \nL 581 4863 \nL 1159 4863 \nL 1159 2956 \nQ 1366 3272 1645 3428 \nQ 1925 3584 2291 3584 \nQ 2894 3584 3203 3211 \nQ 3513 2838 3513 2113 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-20\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6f\" d=\"M 1959 3097 \nQ 1497 3097 1228 2736 \nQ 959 2375 959 1747 \nQ 959 1119 1226 758 \nQ 1494 397 1959 397 \nQ 2419 397 2687 759 \nQ 2956 1122 2956 1747 \nQ 2956 2369 2687 2733 \nQ 2419 3097 1959 3097 \nz\nM 1959 3584 \nQ 2709 3584 3137 3096 \nQ 3566 2609 3566 1747 \nQ 3566 888 3137 398 \nQ 2709 -91 1959 -91 \nQ 1206 -91 779 398 \nQ 353 888 353 1747 \nQ 353 2609 779 3096 \nQ 1206 3584 1959 3584 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-64\" d=\"M 2906 2969 \nL 2906 4863 \nL 3481 4863 \nL 3481 0 \nL 2906 0 \nL 2906 525 \nQ 2725 213 2448 61 \nQ 2172 -91 1784 -91 \nQ 1150 -91 751 415 \nQ 353 922 353 1747 \nQ 353 2572 751 3078 \nQ 1150 3584 1784 3584 \nQ 2172 3584 2448 3432 \nQ 2725 3281 2906 2969 \nz\nM 947 1747 \nQ 947 1113 1208 752 \nQ 1469 391 1925 391 \nQ 2381 391 2643 752 \nQ 2906 1113 2906 1747 \nQ 2906 2381 2643 2742 \nQ 2381 3103 1925 3103 \nQ 1469 3103 1208 2742 \nQ 947 2381 947 1747 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-65\" d=\"M 3597 1894 \nL 3597 1613 \nL 953 1613 \nQ 991 1019 1311 708 \nQ 1631 397 2203 397 \nQ 2534 397 2845 478 \nQ 3156 559 3463 722 \nL 3463 178 \nQ 3153 47 2828 -22 \nQ 2503 -91 2169 -91 \nQ 1331 -91 842 396 \nQ 353 884 353 1716 \nQ 353 2575 817 3079 \nQ 1281 3584 2069 3584 \nQ 2775 3584 3186 3129 \nQ 3597 2675 3597 1894 \nz\nM 3022 2063 \nQ 3016 2534 2758 2815 \nQ 2500 3097 2075 3097 \nQ 1594 3097 1305 2825 \nQ 1016 2553 972 2059 \nL 3022 2063 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-5f\" d=\"M 3263 -1063 \nL 3263 -1509 \nL -63 -1509 \nL -63 -1063 \nL 3263 -1063 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-77\" d=\"M 269 3500 \nL 844 3500 \nL 1563 769 \nL 2278 3500 \nL 2956 3500 \nL 3675 769 \nL 4391 3500 \nL 4966 3500 \nL 4050 0 \nL 3372 0 \nL 2619 2869 \nL 1863 0 \nL 1184 0 \nL 269 3500 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-72\" d=\"M 2631 2963 \nQ 2534 3019 2420 3045 \nQ 2306 3072 2169 3072 \nQ 1681 3072 1420 2755 \nQ 1159 2438 1159 1844 \nL 1159 0 \nL 581 0 \nL 581 3500 \nL 1159 3500 \nL 1159 2956 \nQ 1341 3275 1631 3429 \nQ 1922 3584 2338 3584 \nQ 2397 3584 2469 3576 \nQ 2541 3569 2628 3553 \nL 2631 2963 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-44\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"77.001953\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"104.785156\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"156.884766\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"220.361328\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"281.640625\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"320.849609\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"375.830078\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"439.208984\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"470.996094\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"534.375\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"595.556641\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"659.033203\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"720.556641\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"770.556641\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"834.033203\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"895.214844\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"977.001953\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"1038.525391\"/>\n </g>\n </g>\n <g id=\"legend_1\">\n <g id=\"patch_7\">\n <path d=\"M 153.120833 306.92625 \nL 306.209896 306.92625 \nQ 308.209896 306.92625 308.209896 304.92625 \nL 308.209896 276.01375 \nQ 308.209896 274.01375 306.209896 274.01375 \nL 153.120833 274.01375 \nQ 151.120833 274.01375 151.120833 276.01375 \nL 151.120833 304.92625 \nQ 151.120833 306.92625 153.120833 306.92625 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_21\">\n <path d=\"M 155.120833 282.112187 \nL 165.120833 282.112187 \nL 175.120833 282.112187 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfe57183788\" x=\"165.120833\" y=\"282.112187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_19\">\n <!-- CHP (node_power) -->\n <g transform=\"translate(183.120833 285.612187)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-43\" d=\"M 4122 4306 \nL 4122 3641 \nQ 3803 3938 3442 4084 \nQ 3081 4231 2675 4231 \nQ 1875 4231 1450 3742 \nQ 1025 3253 1025 2328 \nQ 1025 1406 1450 917 \nQ 1875 428 2675 428 \nQ 3081 428 3442 575 \nQ 3803 722 4122 1019 \nL 4122 359 \nQ 3791 134 3420 21 \nQ 3050 -91 2638 -91 \nQ 1578 -91 968 557 \nQ 359 1206 359 2328 \nQ 359 3453 968 4101 \nQ 1578 4750 2638 4750 \nQ 3056 4750 3426 4639 \nQ 3797 4528 4122 4306 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-48\" d=\"M 628 4666 \nL 1259 4666 \nL 1259 2753 \nL 3553 2753 \nL 3553 4666 \nL 4184 4666 \nL 4184 0 \nL 3553 0 \nL 3553 2222 \nL 1259 2222 \nL 1259 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-50\" d=\"M 1259 4147 \nL 1259 2394 \nL 2053 2394 \nQ 2494 2394 2734 2622 \nQ 2975 2850 2975 3272 \nQ 2975 3691 2734 3919 \nQ 2494 4147 2053 4147 \nL 1259 4147 \nz\nM 628 4666 \nL 2053 4666 \nQ 2838 4666 3239 4311 \nQ 3641 3956 3641 3272 \nQ 3641 2581 3239 2228 \nQ 2838 1875 2053 1875 \nL 1259 1875 \nL 1259 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-28\" d=\"M 1984 4856 \nQ 1566 4138 1362 3434 \nQ 1159 2731 1159 2009 \nQ 1159 1288 1364 580 \nQ 1569 -128 1984 -844 \nL 1484 -844 \nQ 1016 -109 783 600 \nQ 550 1309 550 2009 \nQ 550 2706 781 3412 \nQ 1013 4119 1484 4856 \nL 1984 4856 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-29\" d=\"M 513 4856 \nL 1013 4856 \nQ 1481 4119 1714 3412 \nQ 1947 2706 1947 2009 \nQ 1947 1309 1714 600 \nQ 1481 -109 1013 -844 \nL 513 -844 \nQ 928 -128 1133 580 \nQ 1338 1288 1338 2009 \nQ 1338 2731 1133 3434 \nQ 928 4138 513 4856 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.501953\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"400.683594\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"464.160156\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"525.683594\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"575.683594\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"639.160156\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"700.341797\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"782.128906\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"843.652344\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"884.765625\"/>\n </g>\n </g>\n <g id=\"line2d_22\">\n <path d=\"M 155.120833 297.068437 \nL 165.120833 297.068437 \nL 175.120833 297.068437 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfecacf5004\" x=\"165.120833\" y=\"297.068437\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_20\">\n <!-- SC_power (node_power) -->\n <g transform=\"translate(183.120833 300.568437)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-53\" d=\"M 3425 4513 \nL 3425 3897 \nQ 3066 4069 2747 4153 \nQ 2428 4238 2131 4238 \nQ 1616 4238 1336 4038 \nQ 1056 3838 1056 3469 \nQ 1056 3159 1242 3001 \nQ 1428 2844 1947 2747 \nL 2328 2669 \nQ 3034 2534 3370 2195 \nQ 3706 1856 3706 1288 \nQ 3706 609 3251 259 \nQ 2797 -91 1919 -91 \nQ 1588 -91 1214 -16 \nQ 841 59 441 206 \nL 441 856 \nQ 825 641 1194 531 \nQ 1563 422 1919 422 \nQ 2459 422 2753 634 \nQ 3047 847 3047 1241 \nQ 3047 1584 2836 1778 \nQ 2625 1972 2144 2069 \nL 1759 2144 \nQ 1053 2284 737 2584 \nQ 422 2884 422 3419 \nQ 422 4038 858 4394 \nQ 1294 4750 2059 4750 \nQ 2388 4750 2728 4690 \nQ 3069 4631 3425 4513 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"246.777344\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"307.958984\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"389.746094\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"451.269531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"492.382812\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"524.169922\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"563.183594\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"626.5625\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"687.744141\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"751.220703\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"812.744141\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"862.744141\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"926.220703\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"987.402344\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"1069.189453\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"1130.712891\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"1171.826172\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"axes_2\">\n <g id=\"patch_8\">\n <path d=\"M 464.091667 311.92625 \nL 852.813021 311.92625 \nL 852.813021 22.318125 \nL 464.091667 22.318125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_3\">\n <g id=\"xtick_10\">\n <g id=\"line2d_23\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"464.091667\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_21\">\n <!-- 00:00 -->\n <g transform=\"translate(449.682292 326.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n <!-- 01-Jan -->\n <g transform=\"translate(447.936198 337.7225)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-2d\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-4a\" x=\"168.955078\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"198.447266\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"259.726562\"/>\n </g>\n <!-- 2021 -->\n <g transform=\"translate(451.366667 348.920312)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"190.869141\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_11\">\n <g id=\"line2d_24\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"852.813021\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_12\">\n <g id=\"line2d_25\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"514.794452\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_22\">\n <!-- 03:00 -->\n <g transform=\"translate(500.385077 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-33\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_13\">\n <g id=\"line2d_26\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"565.497237\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_23\">\n <!-- 06:00 -->\n <g transform=\"translate(551.087862 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_14\">\n <g id=\"line2d_27\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"616.200023\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_24\">\n <!-- 09:00 -->\n <g transform=\"translate(601.790648 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-39\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_15\">\n <g id=\"line2d_28\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"666.902808\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_25\">\n <!-- 12:00 -->\n <g transform=\"translate(652.493433 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_16\">\n <g id=\"line2d_29\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"717.605593\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_26\">\n <!-- 15:00 -->\n <g transform=\"translate(703.196218 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_17\">\n <g id=\"line2d_30\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"768.308379\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_27\">\n <!-- 18:00 -->\n <g transform=\"translate(753.899004 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_18\">\n <g id=\"line2d_31\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"819.011164\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_28\">\n <!-- 21:00 -->\n <g transform=\"translate(804.601789 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_4\">\n <g id=\"ytick_10\">\n <g id=\"line2d_32\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"298.762244\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_29\">\n <!-- −8 -->\n <g transform=\"translate(442.349479 302.561463)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_11\">\n <g id=\"line2d_33\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"265.85223\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_30\">\n <!-- −6 -->\n <g transform=\"translate(442.349479 269.651449)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_12\">\n <g id=\"line2d_34\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"232.942216\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_31\">\n <!-- −4 -->\n <g transform=\"translate(442.349479 236.741435)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-34\" d=\"M 2419 4116 \nL 825 1625 \nL 2419 1625 \nL 2419 4116 \nz\nM 2253 4666 \nL 3047 4666 \nL 3047 1625 \nL 3713 1625 \nL 3713 1100 \nL 3047 1100 \nL 3047 0 \nL 2419 0 \nL 2419 1100 \nL 313 1100 \nL 313 1709 \nL 2253 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-34\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_13\">\n <g id=\"line2d_35\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"200.032202\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_32\">\n <!-- −2 -->\n <g transform=\"translate(442.349479 203.83142)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_14\">\n <g id=\"line2d_36\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"167.122187\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_33\">\n <!-- 0 -->\n <g transform=\"translate(450.729167 170.921406)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_15\">\n <g id=\"line2d_37\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"134.212173\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_34\">\n <!-- 2 -->\n <g transform=\"translate(450.729167 138.011392)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_16\">\n <g id=\"line2d_38\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"101.302159\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_35\">\n <!-- 4 -->\n <g transform=\"translate(450.729167 105.101378)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-34\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_17\">\n <g id=\"line2d_39\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"68.392145\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_36\">\n <!-- 6 -->\n <g transform=\"translate(450.729167 72.191364)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-36\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_18\">\n <g id=\"line2d_40\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"35.482131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_37\">\n <!-- 8 -->\n <g transform=\"translate(450.729167 39.281349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-38\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_41\">\n <path d=\"M 464.091667 35.482131 \nL 480.992595 35.482131 \nL 497.893524 35.482131 \nL 514.794452 35.482131 \nL 531.69538 35.482131 \nL 548.596309 167.122187 \nL 565.497237 167.122187 \nL 582.398166 167.122187 \nL 599.299094 167.122187 \nL 616.200023 167.122187 \nL 633.100951 167.122187 \nL 650.00188 35.482131 \nL 666.902808 35.482131 \nL 683.803736 35.482131 \nL 700.704665 35.482131 \nL 717.605593 35.482131 \nL 734.506522 35.482131 \nL 751.40745 35.482131 \nL 768.308379 167.122187 \nL 785.209307 167.122187 \nL 802.110236 167.122187 \nL 819.011164 167.122187 \nL 835.912092 167.122187 \nL 852.813021 167.122187 \n\" clip-path=\"url(#p933ff6fbc5)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p933ff6fbc5)\">\n <use xlink:href=\"#mfe57183788\" x=\"464.091667\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"480.992595\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"497.893524\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"514.794452\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"531.69538\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"548.596309\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"565.497237\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"582.398166\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"599.299094\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"616.200023\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"633.100951\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"650.00188\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"666.902808\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"683.803736\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"700.704665\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"717.605593\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"734.506522\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"751.40745\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"768.308379\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"785.209307\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"802.110236\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"819.011164\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"835.912092\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"852.813021\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_42\">\n <path d=\"M 464.091667 298.762244 \nL 480.992595 298.762244 \nL 497.893524 298.762244 \nL 514.794452 298.762244 \nL 531.69538 298.762244 \nL 548.596309 167.122187 \nL 565.497237 167.122187 \nL 582.398166 167.122187 \nL 599.299094 167.122187 \nL 616.200023 167.122187 \nL 633.100951 167.122187 \nL 650.00188 298.762244 \nL 666.902808 298.762244 \nL 683.803736 298.762244 \nL 700.704665 298.762244 \nL 717.605593 298.762244 \nL 734.506522 298.762244 \nL 751.40745 298.762244 \nL 768.308379 167.122187 \nL 785.209307 167.122187 \nL 802.110236 167.122187 \nL 819.011164 167.122187 \nL 835.912092 167.122187 \nL 852.813021 167.122187 \n\" clip-path=\"url(#p933ff6fbc5)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p933ff6fbc5)\">\n <use xlink:href=\"#mfecacf5004\" x=\"464.091667\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"480.992595\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"497.893524\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"514.794452\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"531.69538\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"548.596309\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"565.497237\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"582.398166\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"599.299094\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"616.200023\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"633.100951\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"650.00188\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"666.902808\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"683.803736\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"700.704665\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"717.605593\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"734.506522\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"751.40745\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"768.308379\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"785.209307\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"802.110236\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"819.011164\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"835.912092\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"852.813021\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"patch_9\">\n <path d=\"M 464.091667 311.92625 \nL 464.091667 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_10\">\n <path d=\"M 852.813021 311.92625 \nL 852.813021 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_11\">\n <path d=\"M 464.091667 311.92625 \nL 852.813021 311.92625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_12\">\n <path d=\"M 464.091667 22.318125 \nL 852.813021 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_38\">\n <!-- Dispatch node_heat -->\n <g transform=\"translate(598.695156 16.318125)scale(0.12 -0.12)\">\n <use xlink:href=\"#DejaVuSans-44\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"77.001953\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"104.785156\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"156.884766\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"220.361328\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"281.640625\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"320.849609\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"375.830078\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"439.208984\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"470.996094\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"534.375\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"595.556641\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"659.033203\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"720.556641\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"770.556641\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"833.935547\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"895.458984\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"956.738281\"/>\n </g>\n </g>\n <g id=\"legend_2\">\n <g id=\"patch_13\">\n <path d=\"M 709.464583 60.230625 \nL 845.813021 60.230625 \nQ 847.813021 60.230625 847.813021 58.230625 \nL 847.813021 29.318125 \nQ 847.813021 27.318125 845.813021 27.318125 \nL 709.464583 27.318125 \nQ 707.464583 27.318125 707.464583 29.318125 \nL 707.464583 58.230625 \nQ 707.464583 60.230625 709.464583 60.230625 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_43\">\n <path d=\"M 711.464583 35.416563 \nL 721.464583 35.416563 \nL 731.464583 35.416563 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfe57183788\" x=\"721.464583\" y=\"35.416563\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_39\">\n <!-- CHP (node_heat) -->\n <g transform=\"translate(739.464583 38.916563)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.501953\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"400.683594\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"464.160156\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"525.683594\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"575.683594\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"639.0625\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"700.585938\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"761.865234\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"801.074219\"/>\n </g>\n </g>\n <g id=\"line2d_44\">\n <path d=\"M 711.464583 50.372813 \nL 721.464583 50.372813 \nL 731.464583 50.372813 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfecacf5004\" x=\"721.464583\" y=\"50.372813\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_40\">\n <!-- SC_heat (node_heat) -->\n <g transform=\"translate(739.464583 53.872813)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"246.679688\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"308.203125\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"369.482422\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"408.691406\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"440.478516\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"479.492188\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"542.871094\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"604.052734\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"667.529297\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"729.052734\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"779.052734\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"842.431641\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"903.955078\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"965.234375\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"1004.443359\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"axes_3\">\n <g id=\"patch_14\">\n <path d=\"M 892.878646 311.92625 \nL 1281.6 311.92625 \nL 1281.6 22.318125 \nL 892.878646 22.318125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_5\">\n <g id=\"xtick_19\">\n <g id=\"line2d_45\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"892.878646\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_41\">\n <!-- 00:00 -->\n <g transform=\"translate(878.469271 326.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n <!-- 01-Jan -->\n <g transform=\"translate(876.723177 337.7225)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-2d\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-4a\" x=\"168.955078\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"198.447266\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"259.726562\"/>\n </g>\n <!-- 2021 -->\n <g transform=\"translate(880.153646 348.920312)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"190.869141\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_20\">\n <g id=\"line2d_46\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"1281.6\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_21\">\n <g id=\"line2d_47\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"943.581431\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_42\">\n <!-- 03:00 -->\n <g transform=\"translate(929.172056 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-33\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_22\">\n <g id=\"line2d_48\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"994.284216\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_43\">\n <!-- 06:00 -->\n <g transform=\"translate(979.874841 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_23\">\n <g id=\"line2d_49\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"1044.987002\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_44\">\n <!-- 09:00 -->\n <g transform=\"translate(1030.577627 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-39\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_24\">\n <g id=\"line2d_50\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"1095.689787\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_45\">\n <!-- 12:00 -->\n <g transform=\"translate(1081.280412 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_25\">\n <g id=\"line2d_51\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"1146.392572\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_46\">\n <!-- 15:00 -->\n <g transform=\"translate(1131.983197 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_26\">\n <g id=\"line2d_52\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"1197.095358\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_47\">\n <!-- 18:00 -->\n <g transform=\"translate(1182.685983 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_27\">\n <g id=\"line2d_53\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"1247.798143\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_48\">\n <!-- 21:00 -->\n <g transform=\"translate(1233.388768 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_6\">\n <g id=\"ytick_19\">\n <g id=\"line2d_54\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"298.762244\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_49\">\n <!-- −20 -->\n <g transform=\"translate(864.773958 302.561463)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_20\">\n <g id=\"line2d_55\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"265.85223\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_50\">\n <!-- −15 -->\n <g transform=\"translate(864.773958 269.651449)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_21\">\n <g id=\"line2d_56\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"232.942216\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_51\">\n <!-- −10 -->\n <g transform=\"translate(864.773958 236.741435)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_22\">\n <g id=\"line2d_57\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"200.032202\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_52\">\n <!-- −5 -->\n <g transform=\"translate(871.136458 203.83142)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_23\">\n <g id=\"line2d_58\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"167.122187\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_53\">\n <!-- 0 -->\n <g transform=\"translate(879.516146 170.921406)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_24\">\n <g id=\"line2d_59\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"134.212173\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_54\">\n <!-- 5 -->\n <g transform=\"translate(879.516146 138.011392)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-35\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_25\">\n <g id=\"line2d_60\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"101.302159\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_55\">\n <!-- 10 -->\n <g transform=\"translate(873.153646 105.101378)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_26\">\n <g id=\"line2d_61\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"68.392145\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_56\">\n <!-- 15 -->\n <g transform=\"translate(873.153646 72.191364)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_27\">\n <g id=\"line2d_62\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"892.878646\" y=\"35.482131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_57\">\n <!-- 20 -->\n <g transform=\"translate(873.153646 39.281349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_63\">\n <path d=\"M 892.878646 298.762244 \nL 909.779574 298.762244 \nL 926.680503 298.762244 \nL 943.581431 298.762244 \nL 960.48236 298.762244 \nL 977.383288 298.762244 \nL 994.284216 298.762244 \nL 1011.185145 167.122187 \nL 1028.086073 167.122187 \nL 1044.987002 167.122187 \nL 1061.88793 167.122187 \nL 1078.788859 298.762244 \nL 1095.689787 298.762244 \nL 1112.590716 298.762244 \nL 1129.491644 298.762244 \nL 1146.392572 298.762244 \nL 1163.293501 298.762244 \nL 1180.194429 298.762244 \nL 1197.095358 298.762244 \nL 1213.996286 298.762244 \nL 1230.897215 167.122187 \nL 1247.798143 167.122187 \nL 1264.699072 167.122187 \nL 1281.6 167.122187 \n\" clip-path=\"url(#p85492851d4)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p85492851d4)\">\n <use xlink:href=\"#mfe57183788\" x=\"892.878646\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"909.779574\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"926.680503\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"943.581431\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"960.48236\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"977.383288\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"994.284216\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1011.185145\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1028.086073\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1044.987002\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1061.88793\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1078.788859\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1095.689787\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1112.590716\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1129.491644\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1146.392572\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1163.293501\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1180.194429\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1197.095358\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1213.996286\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1230.897215\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1247.798143\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1264.699072\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"1281.6\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_64\">\n <path d=\"M 892.878646 35.482131 \nL 909.779574 35.482131 \nL 926.680503 35.482131 \nL 943.581431 35.482131 \nL 960.48236 35.482131 \nL 977.383288 35.482131 \nL 994.284216 35.482131 \nL 1011.185145 167.122187 \nL 1028.086073 167.122187 \nL 1044.987002 167.122187 \nL 1061.88793 167.122187 \nL 1078.788859 35.482131 \nL 1095.689787 35.482131 \nL 1112.590716 35.482131 \nL 1129.491644 35.482131 \nL 1146.392572 35.482131 \nL 1163.293501 35.482131 \nL 1180.194429 35.482131 \nL 1197.095358 35.482131 \nL 1213.996286 35.482131 \nL 1230.897215 167.122187 \nL 1247.798143 167.122187 \nL 1264.699072 167.122187 \nL 1281.6 167.122187 \n\" clip-path=\"url(#p85492851d4)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p85492851d4)\">\n <use xlink:href=\"#mfecacf5004\" x=\"892.878646\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"909.779574\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"926.680503\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"943.581431\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"960.48236\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"977.383288\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"994.284216\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1011.185145\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1028.086073\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1044.987002\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1061.88793\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1078.788859\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1095.689787\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1112.590716\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1129.491644\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1146.392572\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1163.293501\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1180.194429\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1197.095358\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1213.996286\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1230.897215\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1247.798143\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1264.699072\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"1281.6\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"patch_15\">\n <path d=\"M 892.878646 311.92625 \nL 892.878646 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_16\">\n <path d=\"M 1281.6 311.92625 \nL 1281.6 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_17\">\n <path d=\"M 892.878646 311.92625 \nL 1281.6 311.92625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_18\">\n <path d=\"M 892.878646 22.318125 \nL 1281.6 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_58\">\n <!-- Dispatch node_gas -->\n <g transform=\"translate(1030.39401 16.318125)scale(0.12 -0.12)\">\n <defs>\n <path id=\"DejaVuSans-67\" d=\"M 2906 1791 \nQ 2906 2416 2648 2759 \nQ 2391 3103 1925 3103 \nQ 1463 3103 1205 2759 \nQ 947 2416 947 1791 \nQ 947 1169 1205 825 \nQ 1463 481 1925 481 \nQ 2391 481 2648 825 \nQ 2906 1169 2906 1791 \nz\nM 3481 434 \nQ 3481 -459 3084 -895 \nQ 2688 -1331 1869 -1331 \nQ 1566 -1331 1297 -1286 \nQ 1028 -1241 775 -1147 \nL 775 -588 \nQ 1028 -725 1275 -790 \nQ 1522 -856 1778 -856 \nQ 2344 -856 2625 -561 \nQ 2906 -266 2906 331 \nL 2906 616 \nQ 2728 306 2450 153 \nQ 2172 0 1784 0 \nQ 1141 0 747 490 \nQ 353 981 353 1791 \nQ 353 2603 747 3093 \nQ 1141 3584 1784 3584 \nQ 2172 3584 2450 3431 \nQ 2728 3278 2906 2969 \nL 2906 3500 \nL 3481 3500 \nL 3481 434 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-44\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"77.001953\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"104.785156\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"156.884766\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"220.361328\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"281.640625\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"320.849609\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"375.830078\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"439.208984\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"470.996094\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"534.375\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"595.556641\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"659.033203\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"720.556641\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"770.556641\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"834.033203\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"895.3125\"/>\n </g>\n </g>\n <g id=\"legend_3\">\n <g id=\"patch_19\">\n <path d=\"M 1147.957813 60.230625 \nL 1274.6 60.230625 \nQ 1276.6 60.230625 1276.6 58.230625 \nL 1276.6 29.318125 \nQ 1276.6 27.318125 1274.6 27.318125 \nL 1147.957813 27.318125 \nQ 1145.957813 27.318125 1145.957813 29.318125 \nL 1145.957813 58.230625 \nQ 1145.957813 60.230625 1147.957813 60.230625 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_65\">\n <path d=\"M 1149.957813 35.416563 \nL 1159.957813 35.416563 \nL 1169.957813 35.416563 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfe57183788\" x=\"1159.957813\" y=\"35.416563\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_59\">\n <!-- CHP (node_gas) -->\n <g transform=\"translate(1177.957813 38.916563)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.501953\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"400.683594\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"464.160156\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"525.683594\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"575.683594\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"639.160156\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"700.439453\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"752.539062\"/>\n </g>\n </g>\n <g id=\"line2d_66\">\n <path d=\"M 1149.957813 50.372813 \nL 1159.957813 50.372813 \nL 1169.957813 50.372813 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfecacf5004\" x=\"1159.957813\" y=\"50.372813\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_60\">\n <!-- SC_gas (node_gas) -->\n <g transform=\"translate(1177.957813 53.872813)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"246.777344\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"308.056641\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"360.15625\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"391.943359\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"430.957031\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"494.335938\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"555.517578\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"618.994141\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"680.517578\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"730.517578\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"793.994141\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"855.273438\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"907.373047\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"axes_4\">\n <g id=\"patch_20\">\n <path d=\"M 35.304688 666.52625 \nL 424.026042 666.52625 \nL 424.026042 376.918125 \nL 35.304688 376.918125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_7\">\n <g id=\"xtick_28\">\n <g id=\"line2d_67\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"35.304688\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_61\">\n <!-- 00:00 -->\n <g transform=\"translate(20.895312 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n <!-- 01-Jan -->\n <g transform=\"translate(19.149219 692.3225)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-2d\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-4a\" x=\"168.955078\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"198.447266\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"259.726562\"/>\n </g>\n <!-- 2021 -->\n <g transform=\"translate(22.579687 703.520312)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"190.869141\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_29\">\n <g id=\"line2d_68\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"424.026042\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_30\">\n <g id=\"line2d_69\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"86.007473\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_62\">\n <!-- 03:00 -->\n <g transform=\"translate(71.598098 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-33\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_31\">\n <g id=\"line2d_70\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"136.710258\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_63\">\n <!-- 06:00 -->\n <g transform=\"translate(122.300883 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_32\">\n <g id=\"line2d_71\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"187.413043\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_64\">\n <!-- 09:00 -->\n <g transform=\"translate(173.003668 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-39\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_33\">\n <g id=\"line2d_72\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"238.115829\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_65\">\n <!-- 12:00 -->\n <g transform=\"translate(223.706454 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_34\">\n <g id=\"line2d_73\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"288.818614\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_66\">\n <!-- 15:00 -->\n <g transform=\"translate(274.409239 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_35\">\n <g id=\"line2d_74\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"339.521399\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_67\">\n <!-- 18:00 -->\n <g transform=\"translate(325.112024 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_36\">\n <g id=\"line2d_75\">\n <g>\n <use xlink:href=\"#mbdf76d2345\" x=\"390.224185\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_68\">\n <!-- 21:00 -->\n <g transform=\"translate(375.81481 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_8\">\n <g id=\"ytick_28\">\n <g id=\"line2d_76\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"653.362244\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_69\">\n <!-- 0.0 -->\n <g transform=\"translate(12.401562 657.161463)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-2e\" d=\"M 684 794 \nL 1344 794 \nL 1344 0 \nL 684 0 \nL 684 794 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_29\">\n <g id=\"line2d_77\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"600.706222\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_70\">\n <!-- 0.2 -->\n <g transform=\"translate(12.401562 604.50544)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_30\">\n <g id=\"line2d_78\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"548.050199\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_71\">\n <!-- 0.4 -->\n <g transform=\"translate(12.401562 551.849418)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-34\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_31\">\n <g id=\"line2d_79\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"495.394176\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_72\">\n <!-- 0.6 -->\n <g transform=\"translate(12.401562 499.193395)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_32\">\n <g id=\"line2d_80\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"442.738153\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_73\">\n <!-- 0.8 -->\n <g transform=\"translate(12.401562 446.537372)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_33\">\n <g id=\"line2d_81\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"35.304688\" y=\"390.082131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_74\">\n <!-- 1.0 -->\n <g transform=\"translate(12.401562 393.881349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_82\">\n <path d=\"M 35.304688 390.082131 \nL 52.205616 390.082131 \nL 69.106544 390.082131 \nL 86.007473 390.082131 \nL 102.908401 390.082131 \nL 119.80933 390.082131 \nL 136.710258 390.082131 \nL 153.611187 653.362244 \nL 170.512115 653.362244 \nL 187.413043 653.362244 \nL 204.313972 653.362244 \nL 221.2149 390.082131 \nL 238.115829 390.082131 \nL 255.016757 390.082131 \nL 271.917686 390.082131 \nL 288.818614 390.082131 \nL 305.719543 390.082131 \nL 322.620471 390.082131 \nL 339.521399 390.082131 \nL 356.422328 390.082131 \nL 373.323256 653.362244 \nL 390.224185 653.362244 \nL 407.125113 653.362244 \nL 424.026042 653.362244 \n\" clip-path=\"url(#p385e791aea)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p385e791aea)\">\n <use xlink:href=\"#mfe57183788\" x=\"35.304688\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"52.205616\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"69.106544\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"86.007473\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"102.908401\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"119.80933\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"136.710258\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"153.611187\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"170.512115\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"187.413043\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"204.313972\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"221.2149\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"238.115829\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"255.016757\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"271.917686\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"288.818614\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"305.719543\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"322.620471\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"339.521399\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"356.422328\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"373.323256\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"390.224185\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"407.125113\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"424.026042\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_83\">\n <path d=\"M 35.304688 390.082131 \nL 52.205616 653.362244 \nL 69.106544 653.362244 \nL 86.007473 653.362244 \nL 102.908401 653.362244 \nL 119.80933 653.362244 \nL 136.710258 653.362244 \nL 153.611187 653.362244 \nL 170.512115 653.362244 \nL 187.413043 653.362244 \nL 204.313972 653.362244 \nL 221.2149 390.082131 \nL 238.115829 653.362244 \nL 255.016757 653.362244 \nL 271.917686 653.362244 \nL 288.818614 653.362244 \nL 305.719543 653.362244 \nL 322.620471 653.362244 \nL 339.521399 653.362244 \nL 356.422328 653.362244 \nL 373.323256 653.362244 \nL 390.224185 653.362244 \nL 407.125113 653.362244 \nL 424.026042 653.362244 \n\" clip-path=\"url(#p385e791aea)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p385e791aea)\">\n <use xlink:href=\"#mfecacf5004\" x=\"35.304688\" y=\"390.082131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"52.205616\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"69.106544\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"86.007473\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"102.908401\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"119.80933\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"136.710258\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"153.611187\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"170.512115\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"187.413043\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"204.313972\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"221.2149\" y=\"390.082131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"238.115829\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"255.016757\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"271.917686\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"288.818614\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"305.719543\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"322.620471\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"339.521399\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"356.422328\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"373.323256\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"390.224185\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"407.125113\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"424.026042\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"patch_21\">\n <path d=\"M 35.304688 666.52625 \nL 35.304688 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_22\">\n <path d=\"M 424.026042 666.52625 \nL 424.026042 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_23\">\n <path d=\"M 35.304688 666.52625 \nL 424.026042 666.52625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_24\">\n <path d=\"M 35.304688 376.918125 \nL 424.026042 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_75\">\n <!-- Bool Variables -->\n <g transform=\"translate(187.212552 370.918125)scale(0.12 -0.12)\">\n <defs>\n <path id=\"DejaVuSans-42\" d=\"M 1259 2228 \nL 1259 519 \nL 2272 519 \nQ 2781 519 3026 730 \nQ 3272 941 3272 1375 \nQ 3272 1813 3026 2020 \nQ 2781 2228 2272 2228 \nL 1259 2228 \nz\nM 1259 4147 \nL 1259 2741 \nL 2194 2741 \nQ 2656 2741 2882 2914 \nQ 3109 3088 3109 3444 \nQ 3109 3797 2882 3972 \nQ 2656 4147 2194 4147 \nL 1259 4147 \nz\nM 628 4666 \nL 2241 4666 \nQ 2963 4666 3353 4366 \nQ 3744 4066 3744 3513 \nQ 3744 3084 3544 2831 \nQ 3344 2578 2956 2516 \nQ 3422 2416 3680 2098 \nQ 3938 1781 3938 1306 \nQ 3938 681 3513 340 \nQ 3088 0 2303 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6c\" d=\"M 603 4863 \nL 1178 4863 \nL 1178 0 \nL 603 0 \nL 603 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-56\" d=\"M 1831 0 \nL 50 4666 \nL 709 4666 \nL 2188 738 \nL 3669 4666 \nL 4325 4666 \nL 2547 0 \nL 1831 0 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-62\" d=\"M 3116 1747 \nQ 3116 2381 2855 2742 \nQ 2594 3103 2138 3103 \nQ 1681 3103 1420 2742 \nQ 1159 2381 1159 1747 \nQ 1159 1113 1420 752 \nQ 1681 391 2138 391 \nQ 2594 391 2855 752 \nQ 3116 1113 3116 1747 \nz\nM 1159 2969 \nQ 1341 3281 1617 3432 \nQ 1894 3584 2278 3584 \nQ 2916 3584 3314 3078 \nQ 3713 2572 3713 1747 \nQ 3713 922 3314 415 \nQ 2916 -91 2278 -91 \nQ 1894 -91 1617 61 \nQ 1341 213 1159 525 \nL 1159 0 \nL 581 0 \nL 581 4863 \nL 1159 4863 \nL 1159 2969 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-42\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"68.603516\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"129.785156\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"190.966797\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"218.75\"/>\n <use xlink:href=\"#DejaVuSans-56\" x=\"250.537109\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"311.195312\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"372.474609\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"413.587891\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"441.371094\"/>\n <use xlink:href=\"#DejaVuSans-62\" x=\"502.650391\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"566.126953\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"593.910156\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"655.433594\"/>\n </g>\n </g>\n <g id=\"legend_4\">\n <g id=\"patch_25\">\n <path d=\"M 303.858854 538.178437 \nL 417.026042 538.178437 \nQ 419.026042 538.178437 419.026042 536.178437 \nL 419.026042 507.265937 \nQ 419.026042 505.265937 417.026042 505.265937 \nL 303.858854 505.265937 \nQ 301.858854 505.265937 301.858854 507.265937 \nL 301.858854 536.178437 \nQ 301.858854 538.178437 303.858854 538.178437 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_84\">\n <path d=\"M 305.858854 513.364375 \nL 315.858854 513.364375 \nL 325.858854 513.364375 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfe57183788\" x=\"315.858854\" y=\"513.364375\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_76\">\n <!-- CHP (bool_on) -->\n <g transform=\"translate(333.858854 516.864375)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-62\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.599609\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"400.78125\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"461.962891\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"489.746094\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"539.746094\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"600.927734\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"664.306641\"/>\n </g>\n </g>\n <g id=\"line2d_85\">\n <path d=\"M 305.858854 528.320625 \nL 315.858854 528.320625 \nL 325.858854 528.320625 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfecacf5004\" x=\"315.858854\" y=\"528.320625\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_77\">\n <!-- CHP (bool_start) -->\n <g transform=\"translate(333.858854 531.820625)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-62\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.599609\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"400.78125\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"461.962891\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"489.746094\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"539.746094\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"591.845703\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"631.054688\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"692.333984\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"733.447266\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"772.65625\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"axes_5\">\n <g id=\"patch_26\">\n <path d=\"M 464.091667 666.52625 \nL 852.813021 666.52625 \nL 852.813021 376.918125 \nL 464.091667 376.918125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_9\">\n <g id=\"xtick_37\">\n <g id=\"line2d_86\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"481.760819\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_78\">\n <!-- 0 -->\n <g transform=\"translate(478.579569 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_38\">\n <g id=\"line2d_87\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"558.583221\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_79\">\n <!-- 5 -->\n <g transform=\"translate(555.401971 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-35\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_39\">\n <g id=\"line2d_88\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"635.405623\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_80\">\n <!-- 10 -->\n <g transform=\"translate(629.043123 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_40\">\n <g id=\"line2d_89\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"712.228025\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_81\">\n <!-- 15 -->\n <g transform=\"translate(705.865525 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_41\">\n <g id=\"line2d_90\">\n <g>\n <use xlink:href=\"#m444ee1ccb1\" x=\"789.050427\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_82\">\n <!-- 20 -->\n <g transform=\"translate(782.687927 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_10\">\n <g id=\"ytick_34\">\n <g id=\"line2d_91\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"653.518114\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_83\">\n <!-- 1.00 -->\n <g transform=\"translate(434.826042 657.317333)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_35\">\n <g id=\"line2d_92\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"620.588616\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_84\">\n <!-- 1.25 -->\n <g transform=\"translate(434.826042 624.387835)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_36\">\n <g id=\"line2d_93\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"587.659118\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_85\">\n <!-- 1.50 -->\n <g transform=\"translate(434.826042 591.458337)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_37\">\n <g id=\"line2d_94\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"554.72962\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_86\">\n <!-- 1.75 -->\n <g transform=\"translate(434.826042 558.528839)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-37\" d=\"M 525 4666 \nL 3525 4666 \nL 3525 4397 \nL 1831 0 \nL 1172 0 \nL 2766 4134 \nL 525 4134 \nL 525 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-37\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_38\">\n <g id=\"line2d_95\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"521.800123\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_87\">\n <!-- 2.00 -->\n <g transform=\"translate(434.826042 525.599341)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_39\">\n <g id=\"line2d_96\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"488.870625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_88\">\n <!-- 2.25 -->\n <g transform=\"translate(434.826042 492.669843)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_40\">\n <g id=\"line2d_97\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"455.941127\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_89\">\n <!-- 2.50 -->\n <g transform=\"translate(434.826042 459.740345)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_41\">\n <g id=\"line2d_98\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"423.011629\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_90\">\n <!-- 2.75 -->\n <g transform=\"translate(434.826042 426.810847)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-37\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_42\">\n <g id=\"line2d_99\">\n <g>\n <use xlink:href=\"#mf12428344f\" x=\"464.091667\" y=\"390.082131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_91\">\n <!-- 3.00 -->\n <g transform=\"translate(434.826042 393.881349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-33\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_100\">\n <path d=\"M 481.760819 521.800123 \nL 497.1253 459.406134 \nL 512.48978 411.900644 \nL 527.85426 390.619447 \nL 543.218741 400.640679 \nL 558.583221 439.573065 \nL 573.947702 498.126531 \nL 589.312182 562.329007 \nL 604.676662 616.860451 \nL 620.041143 648.70853 \nL 635.405623 650.273633 \nL 650.770104 621.182294 \nL 666.134584 568.376309 \nL 681.499064 504.45628 \nL 696.863545 444.674852 \nL 712.228025 403.297112 \nL 727.592506 390.196646 \nL 742.956986 408.499498 \nL 758.321466 453.838227 \nL 773.685947 515.394072 \nL 789.050427 578.478535 \nL 804.414908 628.038353 \nL 819.779388 652.247528 \nL 835.143868 645.329248 \n\" clip-path=\"url(#p8508c639ee)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p8508c639ee)\">\n <use xlink:href=\"#mfe57183788\" x=\"481.760819\" y=\"521.800123\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"497.1253\" y=\"459.406134\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"512.48978\" y=\"411.900644\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"527.85426\" y=\"390.619447\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"543.218741\" y=\"400.640679\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"558.583221\" y=\"439.573065\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"573.947702\" y=\"498.126531\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"589.312182\" y=\"562.329007\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"604.676662\" y=\"616.860451\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"620.041143\" y=\"648.70853\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"635.405623\" y=\"650.273633\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"650.770104\" y=\"621.182294\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"666.134584\" y=\"568.376309\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"681.499064\" y=\"504.45628\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"696.863545\" y=\"444.674852\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"712.228025\" y=\"403.297112\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"727.592506\" y=\"390.196646\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"742.956986\" y=\"408.499498\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"758.321466\" y=\"453.838227\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"773.685947\" y=\"515.394072\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"789.050427\" y=\"578.478535\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"804.414908\" y=\"628.038353\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"819.779388\" y=\"652.247528\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#mfe57183788\" x=\"835.143868\" y=\"645.329248\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_101\">\n <path d=\"M 481.760819 390.082131 \nL 497.1253 405.797452 \nL 512.48978 449.193415 \nL 527.85426 509.914843 \nL 543.218741 573.472345 \nL 558.583221 624.699784 \nL 573.947702 651.373231 \nL 589.312182 647.127849 \nL 604.676662 612.976673 \nL 620.041143 557.068883 \nL 635.405623 492.745236 \nL 650.770104 435.354686 \nL 666.134584 398.59181 \nL 681.499064 391.228991 \nL 696.863545 415.023149 \nL 712.228025 464.296507 \nL 727.592506 527.291419 \nL 742.956986 588.975994 \nL 758.321466 634.631014 \nL 773.685947 653.362244 \nL 789.050427 640.700026 \nL 804.414908 599.665826 \nL 819.779388 540.051255 \nL 835.143868 476.081586 \n\" clip-path=\"url(#p8508c639ee)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p8508c639ee)\">\n <use xlink:href=\"#mfecacf5004\" x=\"481.760819\" y=\"390.082131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"497.1253\" y=\"405.797452\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"512.48978\" y=\"449.193415\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"527.85426\" y=\"509.914843\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"543.218741\" y=\"573.472345\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"558.583221\" y=\"624.699784\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"573.947702\" y=\"651.373231\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"589.312182\" y=\"647.127849\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"604.676662\" y=\"612.976673\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"620.041143\" y=\"557.068883\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"635.405623\" y=\"492.745236\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"650.770104\" y=\"435.354686\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"666.134584\" y=\"398.59181\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"681.499064\" y=\"391.228991\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"696.863545\" y=\"415.023149\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"712.228025\" y=\"464.296507\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"727.592506\" y=\"527.291419\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"742.956986\" y=\"588.975994\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"758.321466\" y=\"634.631014\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"773.685947\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"789.050427\" y=\"640.700026\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"804.414908\" y=\"599.665826\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"819.779388\" y=\"540.051255\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#mfecacf5004\" x=\"835.143868\" y=\"476.081586\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"line2d_102\">\n <path d=\"M 481.760819 521.800123 \nL 497.1253 521.800123 \nL 512.48978 521.800123 \nL 527.85426 521.800123 \nL 543.218741 521.800123 \nL 558.583221 521.800123 \nL 573.947702 521.800123 \nL 589.312182 521.800123 \nL 604.676662 521.800123 \nL 620.041143 521.800123 \nL 635.405623 521.800123 \nL 650.770104 521.800123 \nL 666.134584 521.800123 \nL 681.499064 521.800123 \nL 696.863545 521.800123 \nL 712.228025 521.800123 \nL 727.592506 521.800123 \nL 742.956986 521.800123 \nL 758.321466 521.800123 \nL 773.685947 521.800123 \nL 789.050427 521.800123 \nL 804.414908 521.800123 \nL 819.779388 521.800123 \nL 835.143868 521.800123 \n\" clip-path=\"url(#p8508c639ee)\" style=\"fill: none; stroke: #2ca02c; stroke-width: 1.5; stroke-linecap: square\"/>\n <defs>\n <path id=\"m430aff70d4\" d=\"M -3 3 \nL 3 -3 \nM -3 -3 \nL 3 3 \n\" style=\"stroke: #2ca02c\"/>\n </defs>\n <g clip-path=\"url(#p8508c639ee)\">\n <use xlink:href=\"#m430aff70d4\" x=\"481.760819\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"497.1253\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"512.48978\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"527.85426\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"543.218741\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"558.583221\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"573.947702\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"589.312182\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"604.676662\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"620.041143\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"635.405623\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"650.770104\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"666.134584\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"681.499064\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"696.863545\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"712.228025\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"727.592506\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"742.956986\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"758.321466\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"773.685947\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"789.050427\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"804.414908\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"819.779388\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#m430aff70d4\" x=\"835.143868\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n </g>\n </g>\n <g id=\"patch_27\">\n <path d=\"M 464.091667 666.52625 \nL 464.091667 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_28\">\n <path d=\"M 852.813021 666.52625 \nL 852.813021 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_29\">\n <path d=\"M 464.091667 666.52625 \nL 852.813021 666.52625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_30\">\n <path d=\"M 464.091667 376.918125 \nL 852.813021 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_92\">\n <!-- Prices -->\n <g transform=\"translate(640.689531 370.918125)scale(0.12 -0.12)\">\n <use xlink:href=\"#DejaVuSans-50\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"58.552734\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"99.666016\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"127.449219\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"182.429688\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"243.953125\"/>\n </g>\n </g>\n <g id=\"legend_5\">\n <g id=\"patch_31\">\n <path d=\"M 695.042708 429.786875 \nL 845.813021 429.786875 \nQ 847.813021 429.786875 847.813021 427.786875 \nL 847.813021 383.918125 \nQ 847.813021 381.918125 845.813021 381.918125 \nL 695.042708 381.918125 \nQ 693.042708 381.918125 693.042708 383.918125 \nL 693.042708 427.786875 \nQ 693.042708 429.786875 695.042708 429.786875 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_103\">\n <path d=\"M 697.042708 390.016563 \nL 707.042708 390.016563 \nL 717.042708 390.016563 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfe57183788\" x=\"707.042708\" y=\"390.016563\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_93\">\n <!-- input data: price_power -->\n <g transform=\"translate(725.042708 393.516563)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-75\" d=\"M 544 1381 \nL 544 3500 \nL 1119 3500 \nL 1119 1403 \nQ 1119 906 1312 657 \nQ 1506 409 1894 409 \nQ 2359 409 2629 706 \nQ 2900 1003 2900 1516 \nL 2900 3500 \nL 3475 3500 \nL 3475 0 \nL 2900 0 \nL 2900 538 \nQ 2691 219 2414 64 \nQ 2138 -91 1772 -91 \nQ 1169 -91 856 284 \nQ 544 659 544 1381 \nz\nM 1991 3584 \nL 1991 3584 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-69\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"27.783203\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"91.162109\"/>\n <use xlink:href=\"#DejaVuSans-75\" x=\"154.638672\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"218.017578\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"257.226562\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"289.013672\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"352.490234\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"413.769531\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"452.978516\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"514.257812\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"547.949219\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"579.736328\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"643.212891\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"684.326172\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"712.109375\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"767.089844\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"828.613281\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"878.613281\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"942.089844\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"1003.271484\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"1085.058594\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"1146.582031\"/>\n </g>\n </g>\n <g id=\"line2d_104\">\n <path d=\"M 697.042708 404.972813 \nL 707.042708 404.972813 \nL 717.042708 404.972813 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mfecacf5004\" x=\"707.042708\" y=\"404.972813\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_94\">\n <!-- input data: price_heat -->\n <g transform=\"translate(725.042708 408.472813)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-69\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"27.783203\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"91.162109\"/>\n <use xlink:href=\"#DejaVuSans-75\" x=\"154.638672\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"218.017578\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"257.226562\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"289.013672\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"352.490234\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"413.769531\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"452.978516\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"514.257812\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"547.949219\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"579.736328\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"643.212891\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"684.326172\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"712.109375\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"767.089844\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"828.613281\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"878.613281\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"941.992188\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"1003.515625\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"1064.794922\"/>\n </g>\n </g>\n <g id=\"line2d_105\">\n <path d=\"M 697.042708 419.929063 \nL 707.042708 419.929063 \nL 717.042708 419.929063 \n\" style=\"fill: none; stroke: #2ca02c; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m430aff70d4\" x=\"707.042708\" y=\"419.929063\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n </g>\n </g>\n <g id=\"text_95\">\n <!-- input data: price_gas -->\n <g transform=\"translate(725.042708 423.429063)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-69\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"27.783203\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"91.162109\"/>\n <use xlink:href=\"#DejaVuSans-75\" x=\"154.638672\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"218.017578\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"257.226562\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"289.013672\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"352.490234\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"413.769531\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"452.978516\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"514.257812\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"547.949219\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"579.736328\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"643.212891\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"684.326172\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"712.109375\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"767.089844\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"828.613281\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"878.613281\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"942.089844\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"1003.369141\"/>\n </g>\n </g>\n </g>\n </g>\n </g>\n <defs>\n <clipPath id=\"p695fc40edb\">\n <rect x=\"35.304688\" y=\"22.318125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n <clipPath id=\"p933ff6fbc5\">\n <rect x=\"464.091667\" y=\"22.318125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n <clipPath id=\"p85492851d4\">\n <rect x=\"892.878646\" y=\"22.318125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n <clipPath id=\"p385e791aea\">\n <rect x=\"35.304688\" y=\"376.918125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n <clipPath id=\"p8508c639ee\">\n <rect x=\"464.091667\" y=\"376.918125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n </defs>\n</svg>\n", - "image/png": "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yjLcU045BW+88QaOOOIIvPnmm8pWFVZlizaHzZKROQxQ5p8XX3wREyZMGNoPBWXl2d13343PPvsMLpcLF154IUKhEPLy8rBs2TK88847+Ne//oUHH3wQ7777LoD0nWNxibEO7GwL4bbX1+LgMW6ce3CVJjF43E74A2G0h/Z9VZlMaOvK3hPImHnK51tXDnnIb775plfH21WrVqG6uhpOpxM//OEPceWVV6K7W9lktqmpCf/85z/7HSsWiyW6HP7973/HkUceidLSUrhcrkQp9tNPP42jjjoK/kAYB848GP95+QWMHz8eFosFbrcbb7zxRmJ/ifnz5/faCHYwJzLjx49HbW3tPr/v4IMPxvJPP8L2HTsRjUbxj3/8A0cddRQOOeQQfPDBB9i1axfC4XCvnzfZeF555RWEQiHs2rUL77//Pg466CDMnTsXzz//PKLRKJqamvDhhx8m9rA49NBDcd9992HevHmYO3cu7r777kQ15XHHHYd//etf2LlzJwCgpaUFdXX9v8ldv379XsvSyDgqXQ50dkfhC3Cu0Ct1OxFTVxDuS47MeflWS59LjPvT31zR2tqK0aNHA1D2x1UVFxf3u2n8gQceiI0bN+7zmHPnzsXLL7+MQCCAzs5OvPTSS5g7dy7mzZuHl19+GcFgEO3t7XjttdcAACUlJRgzZkxijpNSDmlbihNOOAGPP/54orp/69at2LlzJ1pbW+FyueB0OrFu3Tp88sknicfYbLZe1ZO7du1CeXk5bLbkmpQRJUUIJbnFCsKh8dcpnWlLRmsdib7lyLzWl4MOOggffPABfD4fIpEIXnzxxcR9Peevp556KvH1TZs2YerUqfjVr36Fgw46aHdlnVVJArpKChGNRge8QAQAEyZMQG1tbWK+U88XJ06ciNraWmzatAkAem0tdcIJJ+BPf/pT4oLV559/3u/4RxxxBF544QUAyjZVX36p7BPZ1taGwsJClJaWYseOHYkOz2rV/8knn4x777231/yYrnMsJgh14OZXv0IoEsMdZ0yFxaJNRYYnvhcRlxlTn468au+rS2PmKV8foo6ODlxwwQWYNGkSpk2bhrVr1yauCt12222oqKjApEmTMGXKFJx66qkDXoEqLCzEsmXLMGXKFLz77rv49a9/DUCZSH75y19i2rRpWLVqFa674UZsaw1i3Nj9IQDMm6f8TEceeSTK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LiI+e4w9Y79Hyohv4E1wEuWR/p/2WrFiBWvXrmXAgAFMnTqVRYsWMW3aNACSk5NZvXo1Tz31FA/c9/948LG/U1lTR35pFdsLKxicenhxlF/+8pc88MADvPHGG8cc45VXXmHDhg2sW7eOffv2MWLECG666SYA5s6dy09/+lMArrvuOt544w0uv/xy5s2bxwMPPMC4ceOa3O/CCy/kkUceAWDOnDnHHHf58uWsWbOGuLg4xo8fz/nnn096ejobN27kySefZNKkSUfsv3btWu6//34WL15Meno6hYWFAHzve9/jzjvvZNq0aWzfvp2zzz6b9evXN/k3/eqrr1iwYAElJSUcf/zxfOc732HTpk08//zzLFq0iOjoaG699VaeffZZrr/+en7+85+TmppKXV0d3/jGN1i1ahW33347v/vd71iwYAHp6VpNXUREBNxWQRhIEGr4paska2XVoIipLaEiKtGpVgBVysoxAkP69XqTZgUSGlc8CaMud6rvG86j1ga7iiq466VV5GQk819nHR/0UFty9YTBfLW3hJU7irr82BJkPh989jcYPAX6jey640ZGwUXznD71nR+37b71r6X5cPpPKDjvLwz58DZS9i0NWngTJkwgIyODiIgIxowZw9atW+tvu/rqq+svly5ZQlZ6PMZAWVUtqfExJLRyqolPPvmEq6++msjISAYMGMDppx9eHGbBggVMnDiRUaNG8eGHH7J2beMroDe135w5cxpNDgKceeaZpKWl4fV6+eY3v8nChQsBGDJkyDHJQYAPP/yQK664oj4hl5rqfEn6/vvvM3fuXMaMGcNFF11EcXExpaWlTZ7v+eefT2xsLOnp6fTp04d9+/bxwQcf8PnnnzN+/HjGjBnDBx98wObNmwF44YUXOPnkkxk7dixr165l3bp1Lf1JRUREeiR3JQiNKgjdKMkTpYqmIPDUlVAVlXi4glCJcDmKFgWSVtn1xeE5B3OuhJpyp2Jr1xetuvsjH+exOC+f2jofd/5jJXU+y41TMnl80ZbOjbsRF40eQFxMJP9YvqPLjy1Btul9OLgVJnRh9WBAv5Ew/b9g1fNQU9H6+zV4LfmsZX/aRPLP/QuRe1YELbTY2MND9iMjI6mtPfwFUMOqWWMMlTV1REZG4fP5KCirori8iurq6nYfu7KykltvvZWXXnqJ1atXc/PNN1NZWdnu/Y52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EZHEljCLlIiIiIiIiIiIiEj8KUEoIiIiIiIiIiKSwpQgFBERERERERERSWExSRAaYy4zxmw0xmwxxnwjvO328G1rjOl9imNnGWP+EYu4RERERERERERE5HhRTxAaY9KAB4DLgVHAdcaYUcAi4P04q5qJiIiIiIiIiIhIAohFBeEUYIu1dqu1tgF4CrjSWvuOtXZbVwYyxkwxxiwxxrxjjFlsjCkOb7/JGPNXY8y/jTGbjTE/if7DEBERERERERERSX7pMRhzALCz3e1dwNQIx3oPmGGtbTLGvB/4IfDR8H3jgQlAPbDRGPNra+3OjocRERERERERERGRjsQiQRhNIeAxY8wIwAIZ7e6bZ62tBDDGrAeGcHxiUkRERERERERERE4jFlOMdwOD2t0eGN7WIWPMS8aYVcaY33dw9/eB1621Y4APAf5299W3+7mZxE92ioiIiIiIiIiIJJxYJNWWAyOMMYU4icFPANd3trO19tJTjBXiWHLxpmgFKCIiIiIiIiIiIo6oVxBaa5uA24GXgA3AM9badcaYLxpjduFUFK7upGIQnKRla3XgT4AfGWPeQRWCIiIiIiIiIiIiUWestW7HcBxjzJeAAdbaO92ORUREREREREREJNklVFWeMeZhYAxwjduxiIiIiIiIiIiIpIKEqyAUERERERERERGR+InFKsYiIiIiIiIiIiLiETFNEBpjBhljXjfGrDfGrAv3F8QYk2+MecUYszl83TO8/QZjzGpjzBpjzGJjzLh2Yz1ijDlgjFkby5hFRERERERERERSSawrCJuA/7bWjgLOB24zxowCvgHMs9aOAOaFbwOUAhdZa88Fvg881G6sucBlMY5XREREREREREQkpcQ0QWit3WutXRn+uRrYAAwArgQeC+/2GPCR8D6LrbWHw9vfAga2G2shUB7LeEVERERERERERFJN3HoQGmOGAhOApUBfa+3e8F37gL4dHHIz8K/4RCciIiIiIiIiIpKa0uNxEmNMDvAX4A5rbZUxpu0+a601xtgT9p+NkyCcHo/4REREREREREREUlXMKwiNMRk4ycHHrbV/DW/eb4zpH76/P3Cg3f5jgd8DV1prD8U6PhERERERERERkVQW61WMDfAwsMFa+4t2dz0P3Bj++Ubg7+H9BwN/BT5lrd0Uy9hEREREREREREQEjLX29HtFOrgx04E3gDVAS3jzt3D6ED4DDAa2A9dYa8uNMb8HPhreBtBkrZ0cHutJYBbQG9gPfM9a+3DMghcREREREREREUkBMU0QioiIiIiIiIiISGKL2yrGIiIiIiIiIiIikniUIBQREREREREREUlhShCKiIiIiIiIiIikMCUIRUREREREREREUpgShCIiIiIiIiIiIilMCUIREREREREREZEUpgShiIiIiIiIiIhICvv/tjT1XUzcBhkAAAAASUVORK5CYII=\n" + "image/svg+xml": "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"\n \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"1288.8pt\" height=\"712.8pt\" viewBox=\"0 0 1288.8 712.8\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n <metadata>\n <rdf:RDF xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://creativecommons.org/ns#\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n <cc:Work>\n <dc:type rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\"/>\n <dc:date>2022-08-03T18:38:00.716378</dc:date>\n <dc:format>image/svg+xml</dc:format>\n <dc:creator>\n <cc:Agent>\n <dc:title>Matplotlib v3.5.0, https://matplotlib.org/</dc:title>\n </cc:Agent>\n </dc:creator>\n </cc:Work>\n </rdf:RDF>\n </metadata>\n <defs>\n <style type=\"text/css\">*{stroke-linejoin: round; stroke-linecap: butt}</style>\n </defs>\n <g id=\"figure_1\">\n <g id=\"patch_1\">\n <path d=\"M 0 712.8 \nL 1288.8 712.8 \nL 1288.8 0 \nL 0 0 \nL 0 712.8 \nz\n\" style=\"fill: none\"/>\n </g>\n <g id=\"axes_1\">\n <g id=\"patch_2\">\n <path d=\"M 35.304688 311.92625 \nL 424.026042 311.92625 \nL 424.026042 22.318125 \nL 35.304688 22.318125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_1\">\n <g id=\"xtick_1\">\n <g id=\"line2d_1\">\n <defs>\n <path id=\"m243b741a0c\" d=\"M 0 0 \nL 0 3.5 \n\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </defs>\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"35.304688\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_1\">\n <!-- 00:00 -->\n <g transform=\"translate(20.895312 326.524687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-30\" d=\"M 2034 4250 \nQ 1547 4250 1301 3770 \nQ 1056 3291 1056 2328 \nQ 1056 1369 1301 889 \nQ 1547 409 2034 409 \nQ 2525 409 2770 889 \nQ 3016 1369 3016 2328 \nQ 3016 3291 2770 3770 \nQ 2525 4250 2034 4250 \nz\nM 2034 4750 \nQ 2819 4750 3233 4129 \nQ 3647 3509 3647 2328 \nQ 3647 1150 3233 529 \nQ 2819 -91 2034 -91 \nQ 1250 -91 836 529 \nQ 422 1150 422 2328 \nQ 422 3509 836 4129 \nQ 1250 4750 2034 4750 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-3a\" d=\"M 750 794 \nL 1409 794 \nL 1409 0 \nL 750 0 \nL 750 794 \nz\nM 750 3309 \nL 1409 3309 \nL 1409 2516 \nL 750 2516 \nL 750 3309 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n <!-- 01-Jan -->\n <g transform=\"translate(19.149219 337.7225)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-31\" d=\"M 794 531 \nL 1825 531 \nL 1825 4091 \nL 703 3866 \nL 703 4441 \nL 1819 4666 \nL 2450 4666 \nL 2450 531 \nL 3481 531 \nL 3481 0 \nL 794 0 \nL 794 531 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-2d\" d=\"M 313 2009 \nL 1997 2009 \nL 1997 1497 \nL 313 1497 \nL 313 2009 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-4a\" d=\"M 628 4666 \nL 1259 4666 \nL 1259 325 \nQ 1259 -519 939 -900 \nQ 619 -1281 -91 -1281 \nL -331 -1281 \nL -331 -750 \nL -134 -750 \nQ 284 -750 456 -515 \nQ 628 -281 628 325 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-61\" d=\"M 2194 1759 \nQ 1497 1759 1228 1600 \nQ 959 1441 959 1056 \nQ 959 750 1161 570 \nQ 1363 391 1709 391 \nQ 2188 391 2477 730 \nQ 2766 1069 2766 1631 \nL 2766 1759 \nL 2194 1759 \nz\nM 3341 1997 \nL 3341 0 \nL 2766 0 \nL 2766 531 \nQ 2569 213 2275 61 \nQ 1981 -91 1556 -91 \nQ 1019 -91 701 211 \nQ 384 513 384 1019 \nQ 384 1609 779 1909 \nQ 1175 2209 1959 2209 \nL 2766 2209 \nL 2766 2266 \nQ 2766 2663 2505 2880 \nQ 2244 3097 1772 3097 \nQ 1472 3097 1187 3025 \nQ 903 2953 641 2809 \nL 641 3341 \nQ 956 3463 1253 3523 \nQ 1550 3584 1831 3584 \nQ 2591 3584 2966 3190 \nQ 3341 2797 3341 1997 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6e\" d=\"M 3513 2113 \nL 3513 0 \nL 2938 0 \nL 2938 2094 \nQ 2938 2591 2744 2837 \nQ 2550 3084 2163 3084 \nQ 1697 3084 1428 2787 \nQ 1159 2491 1159 1978 \nL 1159 0 \nL 581 0 \nL 581 3500 \nL 1159 3500 \nL 1159 2956 \nQ 1366 3272 1645 3428 \nQ 1925 3584 2291 3584 \nQ 2894 3584 3203 3211 \nQ 3513 2838 3513 2113 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-2d\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-4a\" x=\"168.955078\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"198.447266\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"259.726562\"/>\n </g>\n <!-- 2021 -->\n <g transform=\"translate(22.579687 348.920312)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-32\" d=\"M 1228 531 \nL 3431 531 \nL 3431 0 \nL 469 0 \nL 469 531 \nQ 828 903 1448 1529 \nQ 2069 2156 2228 2338 \nQ 2531 2678 2651 2914 \nQ 2772 3150 2772 3378 \nQ 2772 3750 2511 3984 \nQ 2250 4219 1831 4219 \nQ 1534 4219 1204 4116 \nQ 875 4013 500 3803 \nL 500 4441 \nQ 881 4594 1212 4672 \nQ 1544 4750 1819 4750 \nQ 2544 4750 2975 4387 \nQ 3406 4025 3406 3419 \nQ 3406 3131 3298 2873 \nQ 3191 2616 2906 2266 \nQ 2828 2175 2409 1742 \nQ 1991 1309 1228 531 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"190.869141\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_2\">\n <g id=\"line2d_2\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"424.026042\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_3\">\n <g id=\"line2d_3\">\n <defs>\n <path id=\"mb30c5275d4\" d=\"M 0 0 \nL 0 2 \n\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </defs>\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"86.007473\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_2\">\n <!-- 03:00 -->\n <g transform=\"translate(71.598098 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-33\" d=\"M 2597 2516 \nQ 3050 2419 3304 2112 \nQ 3559 1806 3559 1356 \nQ 3559 666 3084 287 \nQ 2609 -91 1734 -91 \nQ 1441 -91 1130 -33 \nQ 819 25 488 141 \nL 488 750 \nQ 750 597 1062 519 \nQ 1375 441 1716 441 \nQ 2309 441 2620 675 \nQ 2931 909 2931 1356 \nQ 2931 1769 2642 2001 \nQ 2353 2234 1838 2234 \nL 1294 2234 \nL 1294 2753 \nL 1863 2753 \nQ 2328 2753 2575 2939 \nQ 2822 3125 2822 3475 \nQ 2822 3834 2567 4026 \nQ 2313 4219 1838 4219 \nQ 1578 4219 1281 4162 \nQ 984 4106 628 3988 \nL 628 4550 \nQ 988 4650 1302 4700 \nQ 1616 4750 1894 4750 \nQ 2613 4750 3031 4423 \nQ 3450 4097 3450 3541 \nQ 3450 3153 3228 2886 \nQ 3006 2619 2597 2516 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-33\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_4\">\n <g id=\"line2d_4\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"136.710258\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_3\">\n <!-- 06:00 -->\n <g transform=\"translate(122.300883 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-36\" d=\"M 2113 2584 \nQ 1688 2584 1439 2293 \nQ 1191 2003 1191 1497 \nQ 1191 994 1439 701 \nQ 1688 409 2113 409 \nQ 2538 409 2786 701 \nQ 3034 994 3034 1497 \nQ 3034 2003 2786 2293 \nQ 2538 2584 2113 2584 \nz\nM 3366 4563 \nL 3366 3988 \nQ 3128 4100 2886 4159 \nQ 2644 4219 2406 4219 \nQ 1781 4219 1451 3797 \nQ 1122 3375 1075 2522 \nQ 1259 2794 1537 2939 \nQ 1816 3084 2150 3084 \nQ 2853 3084 3261 2657 \nQ 3669 2231 3669 1497 \nQ 3669 778 3244 343 \nQ 2819 -91 2113 -91 \nQ 1303 -91 875 529 \nQ 447 1150 447 2328 \nQ 447 3434 972 4092 \nQ 1497 4750 2381 4750 \nQ 2619 4750 2861 4703 \nQ 3103 4656 3366 4563 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_5\">\n <g id=\"line2d_5\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"187.413043\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_4\">\n <!-- 09:00 -->\n <g transform=\"translate(173.003668 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-39\" d=\"M 703 97 \nL 703 672 \nQ 941 559 1184 500 \nQ 1428 441 1663 441 \nQ 2288 441 2617 861 \nQ 2947 1281 2994 2138 \nQ 2813 1869 2534 1725 \nQ 2256 1581 1919 1581 \nQ 1219 1581 811 2004 \nQ 403 2428 403 3163 \nQ 403 3881 828 4315 \nQ 1253 4750 1959 4750 \nQ 2769 4750 3195 4129 \nQ 3622 3509 3622 2328 \nQ 3622 1225 3098 567 \nQ 2575 -91 1691 -91 \nQ 1453 -91 1209 -44 \nQ 966 3 703 97 \nz\nM 1959 2075 \nQ 2384 2075 2632 2365 \nQ 2881 2656 2881 3163 \nQ 2881 3666 2632 3958 \nQ 2384 4250 1959 4250 \nQ 1534 4250 1286 3958 \nQ 1038 3666 1038 3163 \nQ 1038 2656 1286 2365 \nQ 1534 2075 1959 2075 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-39\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_6\">\n <g id=\"line2d_6\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"238.115829\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_5\">\n <!-- 12:00 -->\n <g transform=\"translate(223.706454 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_7\">\n <g id=\"line2d_7\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"288.818614\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_6\">\n <!-- 15:00 -->\n <g transform=\"translate(274.409239 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-35\" d=\"M 691 4666 \nL 3169 4666 \nL 3169 4134 \nL 1269 4134 \nL 1269 2991 \nQ 1406 3038 1543 3061 \nQ 1681 3084 1819 3084 \nQ 2600 3084 3056 2656 \nQ 3513 2228 3513 1497 \nQ 3513 744 3044 326 \nQ 2575 -91 1722 -91 \nQ 1428 -91 1123 -41 \nQ 819 9 494 109 \nL 494 744 \nQ 775 591 1075 516 \nQ 1375 441 1709 441 \nQ 2250 441 2565 725 \nQ 2881 1009 2881 1497 \nQ 2881 1984 2565 2268 \nQ 2250 2553 1709 2553 \nQ 1456 2553 1204 2497 \nQ 953 2441 691 2322 \nL 691 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_8\">\n <g id=\"line2d_8\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"339.521399\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_7\">\n <!-- 18:00 -->\n <g transform=\"translate(325.112024 324.924687)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-38\" d=\"M 2034 2216 \nQ 1584 2216 1326 1975 \nQ 1069 1734 1069 1313 \nQ 1069 891 1326 650 \nQ 1584 409 2034 409 \nQ 2484 409 2743 651 \nQ 3003 894 3003 1313 \nQ 3003 1734 2745 1975 \nQ 2488 2216 2034 2216 \nz\nM 1403 2484 \nQ 997 2584 770 2862 \nQ 544 3141 544 3541 \nQ 544 4100 942 4425 \nQ 1341 4750 2034 4750 \nQ 2731 4750 3128 4425 \nQ 3525 4100 3525 3541 \nQ 3525 3141 3298 2862 \nQ 3072 2584 2669 2484 \nQ 3125 2378 3379 2068 \nQ 3634 1759 3634 1313 \nQ 3634 634 3220 271 \nQ 2806 -91 2034 -91 \nQ 1263 -91 848 271 \nQ 434 634 434 1313 \nQ 434 1759 690 2068 \nQ 947 2378 1403 2484 \nz\nM 1172 3481 \nQ 1172 3119 1398 2916 \nQ 1625 2713 2034 2713 \nQ 2441 2713 2670 2916 \nQ 2900 3119 2900 3481 \nQ 2900 3844 2670 4047 \nQ 2441 4250 2034 4250 \nQ 1625 4250 1398 4047 \nQ 1172 3844 1172 3481 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_9\">\n <g id=\"line2d_9\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"390.224185\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_8\">\n <!-- 21:00 -->\n <g transform=\"translate(375.81481 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_2\">\n <g id=\"ytick_1\">\n <g id=\"line2d_10\">\n <defs>\n <path id=\"md4aa733a36\" d=\"M 0 0 \nL -3.5 0 \n\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </defs>\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"298.762244\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_9\">\n <!-- −20 -->\n <g transform=\"translate(7.2 302.561463)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-2212\" d=\"M 678 2272 \nL 4684 2272 \nL 4684 1741 \nL 678 1741 \nL 678 2272 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_2\">\n <g id=\"line2d_11\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"265.85223\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_10\">\n <!-- −15 -->\n <g transform=\"translate(7.2 269.651449)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_3\">\n <g id=\"line2d_12\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"232.942216\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_11\">\n <!-- −10 -->\n <g transform=\"translate(7.2 236.741435)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_4\">\n <g id=\"line2d_13\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"200.032202\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_12\">\n <!-- −5 -->\n <g transform=\"translate(13.5625 203.83142)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_5\">\n <g id=\"line2d_14\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"167.122187\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_13\">\n <!-- 0 -->\n <g transform=\"translate(21.942187 170.921406)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_6\">\n <g id=\"line2d_15\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"134.212173\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_14\">\n <!-- 5 -->\n <g transform=\"translate(21.942187 138.011392)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-35\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_7\">\n <g id=\"line2d_16\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"101.302159\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_15\">\n <!-- 10 -->\n <g transform=\"translate(15.579687 105.101378)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_8\">\n <g id=\"line2d_17\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"68.392145\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_16\">\n <!-- 15 -->\n <g transform=\"translate(15.579687 72.191364)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_9\">\n <g id=\"line2d_18\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"35.482131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_17\">\n <!-- 20 -->\n <g transform=\"translate(15.579687 39.281349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_19\">\n <path d=\"M 35.304688 151.325381 \nL 52.205616 146.059778 \nL 69.106544 93.403756 \nL 86.007473 61.810142 \nL 102.908401 61.810142 \nL 119.80933 35.482131 \nL 136.710258 55.228139 \nL 153.611187 130.262972 \nL 170.512115 161.856585 \nL 187.413043 167.122187 \nL 204.313972 151.325381 \nL 221.2149 146.059778 \nL 238.115829 93.403756 \nL 255.016757 61.810142 \nL 271.917686 61.810142 \nL 288.818614 61.810142 \nL 305.719543 61.810142 \nL 322.620471 61.810142 \nL 339.521399 55.228139 \nL 356.422328 121.048168 \nL 373.323256 161.856585 \nL 390.224185 167.122187 \nL 407.125113 167.122187 \nL 424.026042 167.122187 \n\" clip-path=\"url(#p77980ecbd7)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <defs>\n <path id=\"m74bd5641ce\" d=\"M -3 3 \nL 3 -3 \nM -3 -3 \nL 3 3 \n\" style=\"stroke: #1f77b4\"/>\n </defs>\n <g clip-path=\"url(#p77980ecbd7)\">\n <use xlink:href=\"#m74bd5641ce\" x=\"35.304688\" y=\"151.325381\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"52.205616\" y=\"146.059778\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"69.106544\" y=\"93.403756\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"86.007473\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"102.908401\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"119.80933\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"136.710258\" y=\"55.228139\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"153.611187\" y=\"130.262972\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"170.512115\" y=\"161.856585\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"187.413043\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"204.313972\" y=\"151.325381\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"221.2149\" y=\"146.059778\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"238.115829\" y=\"93.403756\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"255.016757\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"271.917686\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"288.818614\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"305.719543\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"322.620471\" y=\"61.810142\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"339.521399\" y=\"55.228139\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"356.422328\" y=\"121.048168\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"373.323256\" y=\"161.856585\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"390.224185\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"407.125113\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"424.026042\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_20\">\n <path d=\"M 35.304688 182.918994 \nL 52.205616 188.184597 \nL 69.106544 240.840619 \nL 86.007473 272.434233 \nL 102.908401 272.434233 \nL 119.80933 298.762244 \nL 136.710258 279.016236 \nL 153.611187 203.981403 \nL 170.512115 172.38779 \nL 187.413043 167.122187 \nL 204.313972 182.918994 \nL 221.2149 188.184597 \nL 238.115829 240.840619 \nL 255.016757 272.434233 \nL 271.917686 272.434233 \nL 288.818614 272.434233 \nL 305.719543 272.434233 \nL 322.620471 272.434233 \nL 339.521399 279.016236 \nL 356.422328 213.196207 \nL 373.323256 172.38779 \nL 390.224185 167.122187 \nL 407.125113 167.122187 \nL 424.026042 167.122187 \n\" clip-path=\"url(#p77980ecbd7)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <defs>\n <path id=\"m8197a7c924\" d=\"M -3 3 \nL 3 -3 \nM -3 -3 \nL 3 3 \n\" style=\"stroke: #ff7f0e\"/>\n </defs>\n <g clip-path=\"url(#p77980ecbd7)\">\n <use xlink:href=\"#m8197a7c924\" x=\"35.304688\" y=\"182.918994\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"52.205616\" y=\"188.184597\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"69.106544\" y=\"240.840619\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"86.007473\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"102.908401\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"119.80933\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"136.710258\" y=\"279.016236\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"153.611187\" y=\"203.981403\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"170.512115\" y=\"172.38779\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"187.413043\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"204.313972\" y=\"182.918994\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"221.2149\" y=\"188.184597\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"238.115829\" y=\"240.840619\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"255.016757\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"271.917686\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"288.818614\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"305.719543\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"322.620471\" y=\"272.434233\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"339.521399\" y=\"279.016236\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"356.422328\" y=\"213.196207\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"373.323256\" y=\"172.38779\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"390.224185\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"407.125113\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"424.026042\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"patch_3\">\n <path d=\"M 35.304688 311.92625 \nL 35.304688 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_4\">\n <path d=\"M 424.026042 311.92625 \nL 424.026042 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_5\">\n <path d=\"M 35.304688 311.92625 \nL 424.026042 311.92625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_6\">\n <path d=\"M 35.304688 22.318125 \nL 424.026042 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_18\">\n <!-- Dispatch node_power -->\n <g transform=\"translate(164.88599 16.318125)scale(0.12 -0.12)\">\n <defs>\n <path id=\"DejaVuSans-44\" d=\"M 1259 4147 \nL 1259 519 \nL 2022 519 \nQ 2988 519 3436 956 \nQ 3884 1394 3884 2338 \nQ 3884 3275 3436 3711 \nQ 2988 4147 2022 4147 \nL 1259 4147 \nz\nM 628 4666 \nL 1925 4666 \nQ 3281 4666 3915 4102 \nQ 4550 3538 4550 2338 \nQ 4550 1131 3912 565 \nQ 3275 0 1925 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-69\" d=\"M 603 3500 \nL 1178 3500 \nL 1178 0 \nL 603 0 \nL 603 3500 \nz\nM 603 4863 \nL 1178 4863 \nL 1178 4134 \nL 603 4134 \nL 603 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-73\" d=\"M 2834 3397 \nL 2834 2853 \nQ 2591 2978 2328 3040 \nQ 2066 3103 1784 3103 \nQ 1356 3103 1142 2972 \nQ 928 2841 928 2578 \nQ 928 2378 1081 2264 \nQ 1234 2150 1697 2047 \nL 1894 2003 \nQ 2506 1872 2764 1633 \nQ 3022 1394 3022 966 \nQ 3022 478 2636 193 \nQ 2250 -91 1575 -91 \nQ 1294 -91 989 -36 \nQ 684 19 347 128 \nL 347 722 \nQ 666 556 975 473 \nQ 1284 391 1588 391 \nQ 1994 391 2212 530 \nQ 2431 669 2431 922 \nQ 2431 1156 2273 1281 \nQ 2116 1406 1581 1522 \nL 1381 1569 \nQ 847 1681 609 1914 \nQ 372 2147 372 2553 \nQ 372 3047 722 3315 \nQ 1072 3584 1716 3584 \nQ 2034 3584 2315 3537 \nQ 2597 3491 2834 3397 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-70\" d=\"M 1159 525 \nL 1159 -1331 \nL 581 -1331 \nL 581 3500 \nL 1159 3500 \nL 1159 2969 \nQ 1341 3281 1617 3432 \nQ 1894 3584 2278 3584 \nQ 2916 3584 3314 3078 \nQ 3713 2572 3713 1747 \nQ 3713 922 3314 415 \nQ 2916 -91 2278 -91 \nQ 1894 -91 1617 61 \nQ 1341 213 1159 525 \nz\nM 3116 1747 \nQ 3116 2381 2855 2742 \nQ 2594 3103 2138 3103 \nQ 1681 3103 1420 2742 \nQ 1159 2381 1159 1747 \nQ 1159 1113 1420 752 \nQ 1681 391 2138 391 \nQ 2594 391 2855 752 \nQ 3116 1113 3116 1747 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-74\" d=\"M 1172 4494 \nL 1172 3500 \nL 2356 3500 \nL 2356 3053 \nL 1172 3053 \nL 1172 1153 \nQ 1172 725 1289 603 \nQ 1406 481 1766 481 \nL 2356 481 \nL 2356 0 \nL 1766 0 \nQ 1100 0 847 248 \nQ 594 497 594 1153 \nL 594 3053 \nL 172 3053 \nL 172 3500 \nL 594 3500 \nL 594 4494 \nL 1172 4494 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-63\" d=\"M 3122 3366 \nL 3122 2828 \nQ 2878 2963 2633 3030 \nQ 2388 3097 2138 3097 \nQ 1578 3097 1268 2742 \nQ 959 2388 959 1747 \nQ 959 1106 1268 751 \nQ 1578 397 2138 397 \nQ 2388 397 2633 464 \nQ 2878 531 3122 666 \nL 3122 134 \nQ 2881 22 2623 -34 \nQ 2366 -91 2075 -91 \nQ 1284 -91 818 406 \nQ 353 903 353 1747 \nQ 353 2603 823 3093 \nQ 1294 3584 2113 3584 \nQ 2378 3584 2631 3529 \nQ 2884 3475 3122 3366 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-68\" d=\"M 3513 2113 \nL 3513 0 \nL 2938 0 \nL 2938 2094 \nQ 2938 2591 2744 2837 \nQ 2550 3084 2163 3084 \nQ 1697 3084 1428 2787 \nQ 1159 2491 1159 1978 \nL 1159 0 \nL 581 0 \nL 581 4863 \nL 1159 4863 \nL 1159 2956 \nQ 1366 3272 1645 3428 \nQ 1925 3584 2291 3584 \nQ 2894 3584 3203 3211 \nQ 3513 2838 3513 2113 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-20\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6f\" d=\"M 1959 3097 \nQ 1497 3097 1228 2736 \nQ 959 2375 959 1747 \nQ 959 1119 1226 758 \nQ 1494 397 1959 397 \nQ 2419 397 2687 759 \nQ 2956 1122 2956 1747 \nQ 2956 2369 2687 2733 \nQ 2419 3097 1959 3097 \nz\nM 1959 3584 \nQ 2709 3584 3137 3096 \nQ 3566 2609 3566 1747 \nQ 3566 888 3137 398 \nQ 2709 -91 1959 -91 \nQ 1206 -91 779 398 \nQ 353 888 353 1747 \nQ 353 2609 779 3096 \nQ 1206 3584 1959 3584 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-64\" d=\"M 2906 2969 \nL 2906 4863 \nL 3481 4863 \nL 3481 0 \nL 2906 0 \nL 2906 525 \nQ 2725 213 2448 61 \nQ 2172 -91 1784 -91 \nQ 1150 -91 751 415 \nQ 353 922 353 1747 \nQ 353 2572 751 3078 \nQ 1150 3584 1784 3584 \nQ 2172 3584 2448 3432 \nQ 2725 3281 2906 2969 \nz\nM 947 1747 \nQ 947 1113 1208 752 \nQ 1469 391 1925 391 \nQ 2381 391 2643 752 \nQ 2906 1113 2906 1747 \nQ 2906 2381 2643 2742 \nQ 2381 3103 1925 3103 \nQ 1469 3103 1208 2742 \nQ 947 2381 947 1747 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-65\" d=\"M 3597 1894 \nL 3597 1613 \nL 953 1613 \nQ 991 1019 1311 708 \nQ 1631 397 2203 397 \nQ 2534 397 2845 478 \nQ 3156 559 3463 722 \nL 3463 178 \nQ 3153 47 2828 -22 \nQ 2503 -91 2169 -91 \nQ 1331 -91 842 396 \nQ 353 884 353 1716 \nQ 353 2575 817 3079 \nQ 1281 3584 2069 3584 \nQ 2775 3584 3186 3129 \nQ 3597 2675 3597 1894 \nz\nM 3022 2063 \nQ 3016 2534 2758 2815 \nQ 2500 3097 2075 3097 \nQ 1594 3097 1305 2825 \nQ 1016 2553 972 2059 \nL 3022 2063 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-5f\" d=\"M 3263 -1063 \nL 3263 -1509 \nL -63 -1509 \nL -63 -1063 \nL 3263 -1063 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-77\" d=\"M 269 3500 \nL 844 3500 \nL 1563 769 \nL 2278 3500 \nL 2956 3500 \nL 3675 769 \nL 4391 3500 \nL 4966 3500 \nL 4050 0 \nL 3372 0 \nL 2619 2869 \nL 1863 0 \nL 1184 0 \nL 269 3500 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-72\" d=\"M 2631 2963 \nQ 2534 3019 2420 3045 \nQ 2306 3072 2169 3072 \nQ 1681 3072 1420 2755 \nQ 1159 2438 1159 1844 \nL 1159 0 \nL 581 0 \nL 581 3500 \nL 1159 3500 \nL 1159 2956 \nQ 1341 3275 1631 3429 \nQ 1922 3584 2338 3584 \nQ 2397 3584 2469 3576 \nQ 2541 3569 2628 3553 \nL 2631 2963 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-44\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"77.001953\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"104.785156\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"156.884766\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"220.361328\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"281.640625\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"320.849609\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"375.830078\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"439.208984\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"470.996094\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"534.375\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"595.556641\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"659.033203\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"720.556641\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"770.556641\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"834.033203\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"895.214844\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"977.001953\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"1038.525391\"/>\n </g>\n </g>\n <g id=\"legend_1\">\n <g id=\"patch_7\">\n <path d=\"M 153.120833 306.92625 \nL 306.209896 306.92625 \nQ 308.209896 306.92625 308.209896 304.92625 \nL 308.209896 276.01375 \nQ 308.209896 274.01375 306.209896 274.01375 \nL 153.120833 274.01375 \nQ 151.120833 274.01375 151.120833 276.01375 \nL 151.120833 304.92625 \nQ 151.120833 306.92625 153.120833 306.92625 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_21\">\n <path d=\"M 155.120833 282.112187 \nL 165.120833 282.112187 \nL 175.120833 282.112187 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m74bd5641ce\" x=\"165.120833\" y=\"282.112187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_19\">\n <!-- CHP (node_power) -->\n <g transform=\"translate(183.120833 285.612187)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-43\" d=\"M 4122 4306 \nL 4122 3641 \nQ 3803 3938 3442 4084 \nQ 3081 4231 2675 4231 \nQ 1875 4231 1450 3742 \nQ 1025 3253 1025 2328 \nQ 1025 1406 1450 917 \nQ 1875 428 2675 428 \nQ 3081 428 3442 575 \nQ 3803 722 4122 1019 \nL 4122 359 \nQ 3791 134 3420 21 \nQ 3050 -91 2638 -91 \nQ 1578 -91 968 557 \nQ 359 1206 359 2328 \nQ 359 3453 968 4101 \nQ 1578 4750 2638 4750 \nQ 3056 4750 3426 4639 \nQ 3797 4528 4122 4306 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-48\" d=\"M 628 4666 \nL 1259 4666 \nL 1259 2753 \nL 3553 2753 \nL 3553 4666 \nL 4184 4666 \nL 4184 0 \nL 3553 0 \nL 3553 2222 \nL 1259 2222 \nL 1259 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-50\" d=\"M 1259 4147 \nL 1259 2394 \nL 2053 2394 \nQ 2494 2394 2734 2622 \nQ 2975 2850 2975 3272 \nQ 2975 3691 2734 3919 \nQ 2494 4147 2053 4147 \nL 1259 4147 \nz\nM 628 4666 \nL 2053 4666 \nQ 2838 4666 3239 4311 \nQ 3641 3956 3641 3272 \nQ 3641 2581 3239 2228 \nQ 2838 1875 2053 1875 \nL 1259 1875 \nL 1259 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-28\" d=\"M 1984 4856 \nQ 1566 4138 1362 3434 \nQ 1159 2731 1159 2009 \nQ 1159 1288 1364 580 \nQ 1569 -128 1984 -844 \nL 1484 -844 \nQ 1016 -109 783 600 \nQ 550 1309 550 2009 \nQ 550 2706 781 3412 \nQ 1013 4119 1484 4856 \nL 1984 4856 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-29\" d=\"M 513 4856 \nL 1013 4856 \nQ 1481 4119 1714 3412 \nQ 1947 2706 1947 2009 \nQ 1947 1309 1714 600 \nQ 1481 -109 1013 -844 \nL 513 -844 \nQ 928 -128 1133 580 \nQ 1338 1288 1338 2009 \nQ 1338 2731 1133 3434 \nQ 928 4138 513 4856 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.501953\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"400.683594\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"464.160156\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"525.683594\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"575.683594\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"639.160156\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"700.341797\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"782.128906\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"843.652344\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"884.765625\"/>\n </g>\n </g>\n <g id=\"line2d_22\">\n <path d=\"M 155.120833 297.068437 \nL 165.120833 297.068437 \nL 175.120833 297.068437 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m8197a7c924\" x=\"165.120833\" y=\"297.068437\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_20\">\n <!-- SC_power (node_power) -->\n <g transform=\"translate(183.120833 300.568437)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-53\" d=\"M 3425 4513 \nL 3425 3897 \nQ 3066 4069 2747 4153 \nQ 2428 4238 2131 4238 \nQ 1616 4238 1336 4038 \nQ 1056 3838 1056 3469 \nQ 1056 3159 1242 3001 \nQ 1428 2844 1947 2747 \nL 2328 2669 \nQ 3034 2534 3370 2195 \nQ 3706 1856 3706 1288 \nQ 3706 609 3251 259 \nQ 2797 -91 1919 -91 \nQ 1588 -91 1214 -16 \nQ 841 59 441 206 \nL 441 856 \nQ 825 641 1194 531 \nQ 1563 422 1919 422 \nQ 2459 422 2753 634 \nQ 3047 847 3047 1241 \nQ 3047 1584 2836 1778 \nQ 2625 1972 2144 2069 \nL 1759 2144 \nQ 1053 2284 737 2584 \nQ 422 2884 422 3419 \nQ 422 4038 858 4394 \nQ 1294 4750 2059 4750 \nQ 2388 4750 2728 4690 \nQ 3069 4631 3425 4513 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"246.777344\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"307.958984\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"389.746094\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"451.269531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"492.382812\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"524.169922\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"563.183594\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"626.5625\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"687.744141\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"751.220703\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"812.744141\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"862.744141\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"926.220703\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"987.402344\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"1069.189453\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"1130.712891\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"1171.826172\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"axes_2\">\n <g id=\"patch_8\">\n <path d=\"M 464.091667 311.92625 \nL 852.813021 311.92625 \nL 852.813021 22.318125 \nL 464.091667 22.318125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_3\">\n <g id=\"xtick_10\">\n <g id=\"line2d_23\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"464.091667\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_21\">\n <!-- 00:00 -->\n <g transform=\"translate(449.682292 326.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n <!-- 01-Jan -->\n <g transform=\"translate(447.936198 337.7225)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-2d\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-4a\" x=\"168.955078\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"198.447266\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"259.726562\"/>\n </g>\n <!-- 2021 -->\n <g transform=\"translate(451.366667 348.920312)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"190.869141\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_11\">\n <g id=\"line2d_24\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"852.813021\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_12\">\n <g id=\"line2d_25\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"514.794452\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_22\">\n <!-- 03:00 -->\n <g transform=\"translate(500.385077 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-33\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_13\">\n <g id=\"line2d_26\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"565.497237\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_23\">\n <!-- 06:00 -->\n <g transform=\"translate(551.087862 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_14\">\n <g id=\"line2d_27\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"616.200023\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_24\">\n <!-- 09:00 -->\n <g transform=\"translate(601.790648 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-39\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_15\">\n <g id=\"line2d_28\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"666.902808\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_25\">\n <!-- 12:00 -->\n <g transform=\"translate(652.493433 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_16\">\n <g id=\"line2d_29\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"717.605593\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_26\">\n <!-- 15:00 -->\n <g transform=\"translate(703.196218 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_17\">\n <g id=\"line2d_30\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"768.308379\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_27\">\n <!-- 18:00 -->\n <g transform=\"translate(753.899004 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_18\">\n <g id=\"line2d_31\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"819.011164\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_28\">\n <!-- 21:00 -->\n <g transform=\"translate(804.601789 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_4\">\n <g id=\"ytick_10\">\n <g id=\"line2d_32\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"298.762244\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_29\">\n <!-- −8 -->\n <g transform=\"translate(442.349479 302.561463)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_11\">\n <g id=\"line2d_33\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"265.85223\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_30\">\n <!-- −6 -->\n <g transform=\"translate(442.349479 269.651449)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_12\">\n <g id=\"line2d_34\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"232.942216\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_31\">\n <!-- −4 -->\n <g transform=\"translate(442.349479 236.741435)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-34\" d=\"M 2419 4116 \nL 825 1625 \nL 2419 1625 \nL 2419 4116 \nz\nM 2253 4666 \nL 3047 4666 \nL 3047 1625 \nL 3713 1625 \nL 3713 1100 \nL 3047 1100 \nL 3047 0 \nL 2419 0 \nL 2419 1100 \nL 313 1100 \nL 313 1709 \nL 2253 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-34\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_13\">\n <g id=\"line2d_35\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"200.032202\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_32\">\n <!-- −2 -->\n <g transform=\"translate(442.349479 203.83142)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_14\">\n <g id=\"line2d_36\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"167.122187\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_33\">\n <!-- 0 -->\n <g transform=\"translate(450.729167 170.921406)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_15\">\n <g id=\"line2d_37\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"134.212173\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_34\">\n <!-- 2 -->\n <g transform=\"translate(450.729167 138.011392)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_16\">\n <g id=\"line2d_38\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"101.302159\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_35\">\n <!-- 4 -->\n <g transform=\"translate(450.729167 105.101378)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-34\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_17\">\n <g id=\"line2d_39\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"68.392145\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_36\">\n <!-- 6 -->\n <g transform=\"translate(450.729167 72.191364)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-36\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_18\">\n <g id=\"line2d_40\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"35.482131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_37\">\n <!-- 8 -->\n <g transform=\"translate(450.729167 39.281349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-38\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_41\">\n <path d=\"M 464.091667 147.376179 \nL 480.992595 140.794176 \nL 497.893524 74.974148 \nL 514.794452 35.482131 \nL 531.69538 35.482131 \nL 548.596309 167.122187 \nL 565.497237 167.122187 \nL 582.398166 121.048168 \nL 599.299094 160.540185 \nL 616.200023 167.122187 \nL 633.100951 147.376179 \nL 650.00188 140.794176 \nL 666.902808 74.974148 \nL 683.803736 35.482131 \nL 700.704665 35.482131 \nL 717.605593 35.482131 \nL 734.506522 35.482131 \nL 751.40745 35.482131 \nL 768.308379 167.122187 \nL 785.209307 167.122187 \nL 802.110236 160.540185 \nL 819.011164 167.122187 \nL 835.912092 167.122187 \nL 852.813021 167.122187 \n\" clip-path=\"url(#p945eb226df)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p945eb226df)\">\n <use xlink:href=\"#m74bd5641ce\" x=\"464.091667\" y=\"147.376179\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"480.992595\" y=\"140.794176\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"497.893524\" y=\"74.974148\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"514.794452\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"531.69538\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"548.596309\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"565.497237\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"582.398166\" y=\"121.048168\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"599.299094\" y=\"160.540185\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"616.200023\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"633.100951\" y=\"147.376179\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"650.00188\" y=\"140.794176\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"666.902808\" y=\"74.974148\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"683.803736\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"700.704665\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"717.605593\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"734.506522\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"751.40745\" y=\"35.482131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"768.308379\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"785.209307\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"802.110236\" y=\"160.540185\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"819.011164\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"835.912092\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"852.813021\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_42\">\n <path d=\"M 464.091667 186.868196 \nL 480.992595 193.450199 \nL 497.893524 259.270227 \nL 514.794452 298.762244 \nL 531.69538 298.762244 \nL 548.596309 167.122187 \nL 565.497237 167.122187 \nL 582.398166 213.196207 \nL 599.299094 173.70419 \nL 616.200023 167.122187 \nL 633.100951 186.868196 \nL 650.00188 193.450199 \nL 666.902808 259.270227 \nL 683.803736 298.762244 \nL 700.704665 298.762244 \nL 717.605593 298.762244 \nL 734.506522 298.762244 \nL 751.40745 298.762244 \nL 768.308379 167.122187 \nL 785.209307 167.122187 \nL 802.110236 173.70419 \nL 819.011164 167.122187 \nL 835.912092 167.122187 \nL 852.813021 167.122187 \n\" clip-path=\"url(#p945eb226df)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p945eb226df)\">\n <use xlink:href=\"#m8197a7c924\" x=\"464.091667\" y=\"186.868196\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"480.992595\" y=\"193.450199\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"497.893524\" y=\"259.270227\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"514.794452\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"531.69538\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"548.596309\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"565.497237\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"582.398166\" y=\"213.196207\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"599.299094\" y=\"173.70419\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"616.200023\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"633.100951\" y=\"186.868196\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"650.00188\" y=\"193.450199\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"666.902808\" y=\"259.270227\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"683.803736\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"700.704665\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"717.605593\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"734.506522\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"751.40745\" y=\"298.762244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"768.308379\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"785.209307\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"802.110236\" y=\"173.70419\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"819.011164\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"835.912092\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"852.813021\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"patch_9\">\n <path d=\"M 464.091667 311.92625 \nL 464.091667 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_10\">\n <path d=\"M 852.813021 311.92625 \nL 852.813021 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_11\">\n <path d=\"M 464.091667 311.92625 \nL 852.813021 311.92625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_12\">\n <path d=\"M 464.091667 22.318125 \nL 852.813021 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_38\">\n <!-- Dispatch node_heat -->\n <g transform=\"translate(598.695156 16.318125)scale(0.12 -0.12)\">\n <use xlink:href=\"#DejaVuSans-44\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"77.001953\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"104.785156\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"156.884766\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"220.361328\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"281.640625\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"320.849609\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"375.830078\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"439.208984\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"470.996094\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"534.375\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"595.556641\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"659.033203\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"720.556641\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"770.556641\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"833.935547\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"895.458984\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"956.738281\"/>\n </g>\n </g>\n <g id=\"legend_2\">\n <g id=\"patch_13\">\n <path d=\"M 471.091667 60.230625 \nL 607.440104 60.230625 \nQ 609.440104 60.230625 609.440104 58.230625 \nL 609.440104 29.318125 \nQ 609.440104 27.318125 607.440104 27.318125 \nL 471.091667 27.318125 \nQ 469.091667 27.318125 469.091667 29.318125 \nL 469.091667 58.230625 \nQ 469.091667 60.230625 471.091667 60.230625 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_43\">\n <path d=\"M 473.091667 35.416563 \nL 483.091667 35.416563 \nL 493.091667 35.416563 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m74bd5641ce\" x=\"483.091667\" y=\"35.416563\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_39\">\n <!-- CHP (node_heat) -->\n <g transform=\"translate(501.091667 38.916563)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.501953\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"400.683594\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"464.160156\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"525.683594\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"575.683594\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"639.0625\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"700.585938\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"761.865234\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"801.074219\"/>\n </g>\n </g>\n <g id=\"line2d_44\">\n <path d=\"M 473.091667 50.372813 \nL 483.091667 50.372813 \nL 493.091667 50.372813 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m8197a7c924\" x=\"483.091667\" y=\"50.372813\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_40\">\n <!-- SC_heat (node_heat) -->\n <g transform=\"translate(501.091667 53.872813)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"246.679688\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"308.203125\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"369.482422\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"408.691406\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"440.478516\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"479.492188\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"542.871094\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"604.052734\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"667.529297\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"729.052734\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"779.052734\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"842.431641\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"903.955078\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"965.234375\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"1004.443359\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"axes_3\">\n <g id=\"patch_14\">\n <path d=\"M 892.878646 311.92625 \nL 1281.6 311.92625 \nL 1281.6 22.318125 \nL 892.878646 22.318125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_5\">\n <g id=\"xtick_19\">\n <g id=\"line2d_45\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"892.878646\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_41\">\n <!-- 00:00 -->\n <g transform=\"translate(878.469271 326.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n <!-- 01-Jan -->\n <g transform=\"translate(876.723177 337.7225)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-2d\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-4a\" x=\"168.955078\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"198.447266\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"259.726562\"/>\n </g>\n <!-- 2021 -->\n <g transform=\"translate(880.153646 348.920312)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"190.869141\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_20\">\n <g id=\"line2d_46\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"1281.6\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_21\">\n <g id=\"line2d_47\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"943.581431\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_42\">\n <!-- 03:00 -->\n <g transform=\"translate(929.172056 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-33\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_22\">\n <g id=\"line2d_48\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"994.284216\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_43\">\n <!-- 06:00 -->\n <g transform=\"translate(979.874841 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_23\">\n <g id=\"line2d_49\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"1044.987002\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_44\">\n <!-- 09:00 -->\n <g transform=\"translate(1030.577627 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-39\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_24\">\n <g id=\"line2d_50\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"1095.689787\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_45\">\n <!-- 12:00 -->\n <g transform=\"translate(1081.280412 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_25\">\n <g id=\"line2d_51\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"1146.392572\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_46\">\n <!-- 15:00 -->\n <g transform=\"translate(1131.983197 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_26\">\n <g id=\"line2d_52\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"1197.095358\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_47\">\n <!-- 18:00 -->\n <g transform=\"translate(1182.685983 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_27\">\n <g id=\"line2d_53\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"1247.798143\" y=\"311.92625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_48\">\n <!-- 21:00 -->\n <g transform=\"translate(1233.388768 324.924687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_6\">\n <g id=\"ytick_19\">\n <g id=\"line2d_54\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"298.762244\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_49\">\n <!-- −20 -->\n <g transform=\"translate(864.773958 302.561463)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_20\">\n <g id=\"line2d_55\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"265.85223\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_50\">\n <!-- −15 -->\n <g transform=\"translate(864.773958 269.651449)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_21\">\n <g id=\"line2d_56\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"232.942216\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_51\">\n <!-- −10 -->\n <g transform=\"translate(864.773958 236.741435)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"83.789062\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"147.412109\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_22\">\n <g id=\"line2d_57\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"200.032202\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_52\">\n <!-- −5 -->\n <g transform=\"translate(871.136458 203.83142)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-2212\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"83.789062\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_23\">\n <g id=\"line2d_58\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"167.122187\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_53\">\n <!-- 0 -->\n <g transform=\"translate(879.516146 170.921406)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_24\">\n <g id=\"line2d_59\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"134.212173\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_54\">\n <!-- 5 -->\n <g transform=\"translate(879.516146 138.011392)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-35\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_25\">\n <g id=\"line2d_60\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"101.302159\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_55\">\n <!-- 10 -->\n <g transform=\"translate(873.153646 105.101378)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_26\">\n <g id=\"line2d_61\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"68.392145\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_56\">\n <!-- 15 -->\n <g transform=\"translate(873.153646 72.191364)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_27\">\n <g id=\"line2d_62\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"892.878646\" y=\"35.482131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_57\">\n <!-- 20 -->\n <g transform=\"translate(873.153646 39.281349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_63\">\n <path d=\"M 892.878646 186.868196 \nL 909.779574 193.450199 \nL 926.680503 259.270227 \nL 943.581431 298.762244 \nL 960.48236 298.762244 \nL 977.383288 298.762244 \nL 994.284216 279.016236 \nL 1011.185145 213.196207 \nL 1028.086073 173.70419 \nL 1044.987002 167.122187 \nL 1061.88793 186.868196 \nL 1078.788859 193.450199 \nL 1095.689787 259.270227 \nL 1112.590716 298.762244 \nL 1129.491644 298.762244 \nL 1146.392572 298.762244 \nL 1163.293501 298.762244 \nL 1180.194429 298.762244 \nL 1197.095358 279.016236 \nL 1213.996286 213.196207 \nL 1230.897215 173.70419 \nL 1247.798143 167.122187 \nL 1264.699072 167.122187 \nL 1281.6 167.122187 \n\" clip-path=\"url(#pa91f26bb38)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#pa91f26bb38)\">\n <use xlink:href=\"#m74bd5641ce\" x=\"892.878646\" y=\"186.868196\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"909.779574\" y=\"193.450199\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"926.680503\" y=\"259.270227\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"943.581431\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"960.48236\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"977.383288\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"994.284216\" y=\"279.016236\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1011.185145\" y=\"213.196207\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1028.086073\" y=\"173.70419\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1044.987002\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1061.88793\" y=\"186.868196\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1078.788859\" y=\"193.450199\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1095.689787\" y=\"259.270227\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1112.590716\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1129.491644\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1146.392572\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1163.293501\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1180.194429\" y=\"298.762244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1197.095358\" y=\"279.016236\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1213.996286\" y=\"213.196207\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1230.897215\" y=\"173.70419\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1247.798143\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1264.699072\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"1281.6\" y=\"167.122187\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_64\">\n <path d=\"M 892.878646 147.376179 \nL 909.779574 140.794176 \nL 926.680503 74.974148 \nL 943.581431 35.482131 \nL 960.48236 35.482131 \nL 977.383288 35.482131 \nL 994.284216 55.228139 \nL 1011.185145 121.048168 \nL 1028.086073 160.540185 \nL 1044.987002 167.122187 \nL 1061.88793 147.376179 \nL 1078.788859 140.794176 \nL 1095.689787 74.974148 \nL 1112.590716 35.482131 \nL 1129.491644 35.482131 \nL 1146.392572 35.482131 \nL 1163.293501 35.482131 \nL 1180.194429 35.482131 \nL 1197.095358 55.228139 \nL 1213.996286 121.048168 \nL 1230.897215 160.540185 \nL 1247.798143 167.122187 \nL 1264.699072 167.122187 \nL 1281.6 167.122187 \n\" clip-path=\"url(#pa91f26bb38)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#pa91f26bb38)\">\n <use xlink:href=\"#m8197a7c924\" x=\"892.878646\" y=\"147.376179\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"909.779574\" y=\"140.794176\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"926.680503\" y=\"74.974148\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"943.581431\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"960.48236\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"977.383288\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"994.284216\" y=\"55.228139\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1011.185145\" y=\"121.048168\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1028.086073\" y=\"160.540185\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1044.987002\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1061.88793\" y=\"147.376179\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1078.788859\" y=\"140.794176\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1095.689787\" y=\"74.974148\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1112.590716\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1129.491644\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1146.392572\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1163.293501\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1180.194429\" y=\"35.482131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1197.095358\" y=\"55.228139\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1213.996286\" y=\"121.048168\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1230.897215\" y=\"160.540185\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1247.798143\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1264.699072\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"1281.6\" y=\"167.122187\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"patch_15\">\n <path d=\"M 892.878646 311.92625 \nL 892.878646 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_16\">\n <path d=\"M 1281.6 311.92625 \nL 1281.6 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_17\">\n <path d=\"M 892.878646 311.92625 \nL 1281.6 311.92625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_18\">\n <path d=\"M 892.878646 22.318125 \nL 1281.6 22.318125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_58\">\n <!-- Dispatch node_gas -->\n <g transform=\"translate(1030.39401 16.318125)scale(0.12 -0.12)\">\n <defs>\n <path id=\"DejaVuSans-67\" d=\"M 2906 1791 \nQ 2906 2416 2648 2759 \nQ 2391 3103 1925 3103 \nQ 1463 3103 1205 2759 \nQ 947 2416 947 1791 \nQ 947 1169 1205 825 \nQ 1463 481 1925 481 \nQ 2391 481 2648 825 \nQ 2906 1169 2906 1791 \nz\nM 3481 434 \nQ 3481 -459 3084 -895 \nQ 2688 -1331 1869 -1331 \nQ 1566 -1331 1297 -1286 \nQ 1028 -1241 775 -1147 \nL 775 -588 \nQ 1028 -725 1275 -790 \nQ 1522 -856 1778 -856 \nQ 2344 -856 2625 -561 \nQ 2906 -266 2906 331 \nL 2906 616 \nQ 2728 306 2450 153 \nQ 2172 0 1784 0 \nQ 1141 0 747 490 \nQ 353 981 353 1791 \nQ 353 2603 747 3093 \nQ 1141 3584 1784 3584 \nQ 2172 3584 2450 3431 \nQ 2728 3278 2906 2969 \nL 2906 3500 \nL 3481 3500 \nL 3481 434 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-44\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"77.001953\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"104.785156\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"156.884766\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"220.361328\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"281.640625\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"320.849609\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"375.830078\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"439.208984\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"470.996094\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"534.375\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"595.556641\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"659.033203\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"720.556641\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"770.556641\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"834.033203\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"895.3125\"/>\n </g>\n </g>\n <g id=\"legend_3\">\n <g id=\"patch_19\">\n <path d=\"M 899.878646 183.578437 \nL 1026.520833 183.578437 \nQ 1028.520833 183.578437 1028.520833 181.578437 \nL 1028.520833 152.665937 \nQ 1028.520833 150.665937 1026.520833 150.665937 \nL 899.878646 150.665937 \nQ 897.878646 150.665937 897.878646 152.665937 \nL 897.878646 181.578437 \nQ 897.878646 183.578437 899.878646 183.578437 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_65\">\n <path d=\"M 901.878646 158.764375 \nL 911.878646 158.764375 \nL 921.878646 158.764375 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m74bd5641ce\" x=\"911.878646\" y=\"158.764375\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_59\">\n <!-- CHP (node_gas) -->\n <g transform=\"translate(929.878646 162.264375)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.501953\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"400.683594\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"464.160156\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"525.683594\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"575.683594\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"639.160156\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"700.439453\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"752.539062\"/>\n </g>\n </g>\n <g id=\"line2d_66\">\n <path d=\"M 901.878646 173.720625 \nL 911.878646 173.720625 \nL 921.878646 173.720625 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m8197a7c924\" x=\"911.878646\" y=\"173.720625\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_60\">\n <!-- SC_gas (node_gas) -->\n <g transform=\"translate(929.878646 177.220625)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-53\"/>\n <use xlink:href=\"#DejaVuSans-43\" x=\"63.476562\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"133.300781\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"183.300781\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"246.777344\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"308.056641\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"360.15625\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"391.943359\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"430.957031\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"494.335938\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"555.517578\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"618.994141\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"680.517578\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"730.517578\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"793.994141\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"855.273438\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"907.373047\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"axes_4\">\n <g id=\"patch_20\">\n <path d=\"M 35.304688 666.52625 \nL 424.026042 666.52625 \nL 424.026042 376.918125 \nL 35.304688 376.918125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_7\">\n <g id=\"xtick_28\">\n <g id=\"line2d_67\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"35.304688\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_61\">\n <!-- 00:00 -->\n <g transform=\"translate(20.895312 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n <!-- 01-Jan -->\n <g transform=\"translate(19.149219 692.3225)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-2d\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-4a\" x=\"168.955078\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"198.447266\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"259.726562\"/>\n </g>\n <!-- 2021 -->\n <g transform=\"translate(22.579687 703.520312)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"190.869141\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_29\">\n <g id=\"line2d_68\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"424.026042\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_30\">\n <g id=\"line2d_69\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"86.007473\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_62\">\n <!-- 03:00 -->\n <g transform=\"translate(71.598098 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-33\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_31\">\n <g id=\"line2d_70\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"136.710258\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_63\">\n <!-- 06:00 -->\n <g transform=\"translate(122.300883 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_32\">\n <g id=\"line2d_71\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"187.413043\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_64\">\n <!-- 09:00 -->\n <g transform=\"translate(173.003668 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-39\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_33\">\n <g id=\"line2d_72\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"238.115829\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_65\">\n <!-- 12:00 -->\n <g transform=\"translate(223.706454 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_34\">\n <g id=\"line2d_73\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"288.818614\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_66\">\n <!-- 15:00 -->\n <g transform=\"translate(274.409239 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_35\">\n <g id=\"line2d_74\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"339.521399\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_67\">\n <!-- 18:00 -->\n <g transform=\"translate(325.112024 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_36\">\n <g id=\"line2d_75\">\n <g>\n <use xlink:href=\"#mb30c5275d4\" x=\"390.224185\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.6\"/>\n </g>\n </g>\n <g id=\"text_68\">\n <!-- 21:00 -->\n <g transform=\"translate(375.81481 679.524687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-31\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"127.246094\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"160.9375\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"224.560547\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_8\">\n <g id=\"ytick_28\">\n <g id=\"line2d_76\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"653.362244\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_69\">\n <!-- 0.0 -->\n <g transform=\"translate(12.401562 657.161463)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-2e\" d=\"M 684 794 \nL 1344 794 \nL 1344 0 \nL 684 0 \nL 684 794 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_29\">\n <g id=\"line2d_77\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"600.706222\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_70\">\n <!-- 0.2 -->\n <g transform=\"translate(12.401562 604.50544)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_30\">\n <g id=\"line2d_78\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"548.050199\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_71\">\n <!-- 0.4 -->\n <g transform=\"translate(12.401562 551.849418)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-34\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_31\">\n <g id=\"line2d_79\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"495.394176\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_72\">\n <!-- 0.6 -->\n <g transform=\"translate(12.401562 499.193395)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-36\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_32\">\n <g id=\"line2d_80\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"442.738153\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_73\">\n <!-- 0.8 -->\n <g transform=\"translate(12.401562 446.537372)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-38\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_33\">\n <g id=\"line2d_81\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"35.304688\" y=\"390.082131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_74\">\n <!-- 1.0 -->\n <g transform=\"translate(12.401562 393.881349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_82\">\n <path d=\"M 35.304688 390.082131 \nL 52.205616 390.082131 \nL 69.106544 390.082131 \nL 86.007473 390.082131 \nL 102.908401 390.082131 \nL 119.80933 390.082131 \nL 136.710258 390.082131 \nL 153.611187 390.082131 \nL 170.512115 390.082131 \nL 187.413043 653.362244 \nL 204.313972 390.082131 \nL 221.2149 390.082131 \nL 238.115829 390.082131 \nL 255.016757 390.082131 \nL 271.917686 390.082131 \nL 288.818614 390.082131 \nL 305.719543 390.082131 \nL 322.620471 390.082131 \nL 339.521399 390.082131 \nL 356.422328 390.082131 \nL 373.323256 390.082131 \nL 390.224185 653.362244 \nL 407.125113 653.362244 \nL 424.026042 653.362244 \n\" clip-path=\"url(#p95d50b5a2c)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p95d50b5a2c)\">\n <use xlink:href=\"#m74bd5641ce\" x=\"35.304688\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"52.205616\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"69.106544\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"86.007473\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"102.908401\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"119.80933\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"136.710258\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"153.611187\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"170.512115\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"187.413043\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"204.313972\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"221.2149\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"238.115829\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"255.016757\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"271.917686\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"288.818614\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"305.719543\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"322.620471\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"339.521399\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"356.422328\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"373.323256\" y=\"390.082131\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"390.224185\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"407.125113\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"424.026042\" y=\"653.362244\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_83\">\n <path d=\"M 35.304688 390.082131 \nL 52.205616 653.362244 \nL 69.106544 653.362244 \nL 86.007473 653.362244 \nL 102.908401 653.362244 \nL 119.80933 653.362244 \nL 136.710258 653.362244 \nL 153.611187 653.362244 \nL 170.512115 653.362244 \nL 187.413043 653.362244 \nL 204.313972 390.082131 \nL 221.2149 653.362244 \nL 238.115829 653.362244 \nL 255.016757 653.362244 \nL 271.917686 653.362244 \nL 288.818614 653.362244 \nL 305.719543 653.362244 \nL 322.620471 653.362244 \nL 339.521399 653.362244 \nL 356.422328 653.362244 \nL 373.323256 653.362244 \nL 390.224185 653.362244 \nL 407.125113 653.362244 \nL 424.026042 653.362244 \n\" clip-path=\"url(#p95d50b5a2c)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p95d50b5a2c)\">\n <use xlink:href=\"#m8197a7c924\" x=\"35.304688\" y=\"390.082131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"52.205616\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"69.106544\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"86.007473\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"102.908401\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"119.80933\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"136.710258\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"153.611187\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"170.512115\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"187.413043\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"204.313972\" y=\"390.082131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"221.2149\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"238.115829\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"255.016757\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"271.917686\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"288.818614\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"305.719543\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"322.620471\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"339.521399\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"356.422328\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"373.323256\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"390.224185\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"407.125113\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"424.026042\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"line2d_84\">\n <path d=\"M 35.304688 653.362244 \nL 52.205616 653.362244 \nL 69.106544 653.362244 \nL 86.007473 653.362244 \nL 102.908401 653.362244 \nL 119.80933 653.362244 \nL 136.710258 653.362244 \nL 153.611187 653.362244 \nL 170.512115 653.362244 \nL 187.413043 390.082131 \nL 204.313972 653.362244 \nL 221.2149 653.362244 \nL 238.115829 653.362244 \nL 255.016757 653.362244 \nL 271.917686 653.362244 \nL 288.818614 653.362244 \nL 305.719543 653.362244 \nL 322.620471 653.362244 \nL 339.521399 653.362244 \nL 356.422328 653.362244 \nL 373.323256 653.362244 \nL 390.224185 390.082131 \nL 407.125113 653.362244 \nL 424.026042 653.362244 \n\" clip-path=\"url(#p95d50b5a2c)\" style=\"fill: none; stroke: #2ca02c; stroke-width: 1.5; stroke-linecap: square\"/>\n <defs>\n <path id=\"mc4edb94a2c\" d=\"M -3 3 \nL 3 -3 \nM -3 -3 \nL 3 3 \n\" style=\"stroke: #2ca02c\"/>\n </defs>\n <g clip-path=\"url(#p95d50b5a2c)\">\n <use xlink:href=\"#mc4edb94a2c\" x=\"35.304688\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"52.205616\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"69.106544\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"86.007473\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"102.908401\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"119.80933\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"136.710258\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"153.611187\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"170.512115\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"187.413043\" y=\"390.082131\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"204.313972\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"221.2149\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"238.115829\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"255.016757\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"271.917686\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"288.818614\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"305.719543\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"322.620471\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"339.521399\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"356.422328\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"373.323256\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"390.224185\" y=\"390.082131\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"407.125113\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"424.026042\" y=\"653.362244\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n </g>\n </g>\n <g id=\"patch_21\">\n <path d=\"M 35.304688 666.52625 \nL 35.304688 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_22\">\n <path d=\"M 424.026042 666.52625 \nL 424.026042 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_23\">\n <path d=\"M 35.304688 666.52625 \nL 424.026042 666.52625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_24\">\n <path d=\"M 35.304688 376.918125 \nL 424.026042 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_75\">\n <!-- Bool Variables -->\n <g transform=\"translate(187.212552 370.918125)scale(0.12 -0.12)\">\n <defs>\n <path id=\"DejaVuSans-42\" d=\"M 1259 2228 \nL 1259 519 \nL 2272 519 \nQ 2781 519 3026 730 \nQ 3272 941 3272 1375 \nQ 3272 1813 3026 2020 \nQ 2781 2228 2272 2228 \nL 1259 2228 \nz\nM 1259 4147 \nL 1259 2741 \nL 2194 2741 \nQ 2656 2741 2882 2914 \nQ 3109 3088 3109 3444 \nQ 3109 3797 2882 3972 \nQ 2656 4147 2194 4147 \nL 1259 4147 \nz\nM 628 4666 \nL 2241 4666 \nQ 2963 4666 3353 4366 \nQ 3744 4066 3744 3513 \nQ 3744 3084 3544 2831 \nQ 3344 2578 2956 2516 \nQ 3422 2416 3680 2098 \nQ 3938 1781 3938 1306 \nQ 3938 681 3513 340 \nQ 3088 0 2303 0 \nL 628 0 \nL 628 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-6c\" d=\"M 603 4863 \nL 1178 4863 \nL 1178 0 \nL 603 0 \nL 603 4863 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-56\" d=\"M 1831 0 \nL 50 4666 \nL 709 4666 \nL 2188 738 \nL 3669 4666 \nL 4325 4666 \nL 2547 0 \nL 1831 0 \nz\n\" transform=\"scale(0.015625)\"/>\n <path id=\"DejaVuSans-62\" d=\"M 3116 1747 \nQ 3116 2381 2855 2742 \nQ 2594 3103 2138 3103 \nQ 1681 3103 1420 2742 \nQ 1159 2381 1159 1747 \nQ 1159 1113 1420 752 \nQ 1681 391 2138 391 \nQ 2594 391 2855 752 \nQ 3116 1113 3116 1747 \nz\nM 1159 2969 \nQ 1341 3281 1617 3432 \nQ 1894 3584 2278 3584 \nQ 2916 3584 3314 3078 \nQ 3713 2572 3713 1747 \nQ 3713 922 3314 415 \nQ 2916 -91 2278 -91 \nQ 1894 -91 1617 61 \nQ 1341 213 1159 525 \nL 1159 0 \nL 581 0 \nL 581 4863 \nL 1159 4863 \nL 1159 2969 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-42\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"68.603516\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"129.785156\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"190.966797\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"218.75\"/>\n <use xlink:href=\"#DejaVuSans-56\" x=\"250.537109\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"311.195312\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"372.474609\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"413.587891\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"441.371094\"/>\n <use xlink:href=\"#DejaVuSans-62\" x=\"502.650391\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"566.126953\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"593.910156\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"655.433594\"/>\n </g>\n </g>\n <g id=\"legend_4\">\n <g id=\"patch_25\">\n <path d=\"M 278.360417 545.656562 \nL 417.026042 545.656562 \nQ 419.026042 545.656562 419.026042 543.656562 \nL 419.026042 499.787812 \nQ 419.026042 497.787812 417.026042 497.787812 \nL 278.360417 497.787812 \nQ 276.360417 497.787812 276.360417 499.787812 \nL 276.360417 543.656562 \nQ 276.360417 545.656562 278.360417 545.656562 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_85\">\n <path d=\"M 280.360417 505.88625 \nL 290.360417 505.88625 \nL 300.360417 505.88625 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m74bd5641ce\" x=\"290.360417\" y=\"505.88625\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_76\">\n <!-- CHP (bool_on) -->\n <g transform=\"translate(308.360417 509.38625)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-62\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.599609\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"400.78125\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"461.962891\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"489.746094\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"539.746094\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"600.927734\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"664.306641\"/>\n </g>\n </g>\n <g id=\"line2d_86\">\n <path d=\"M 280.360417 520.8425 \nL 290.360417 520.8425 \nL 300.360417 520.8425 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m8197a7c924\" x=\"290.360417\" y=\"520.8425\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_77\">\n <!-- CHP (bool_start) -->\n <g transform=\"translate(308.360417 524.3425)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-62\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.599609\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"400.78125\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"461.962891\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"489.746094\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"539.746094\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"591.845703\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"631.054688\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"692.333984\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"733.447266\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"772.65625\"/>\n </g>\n </g>\n <g id=\"line2d_87\">\n <path d=\"M 280.360417 535.79875 \nL 290.360417 535.79875 \nL 300.360417 535.79875 \n\" style=\"fill: none; stroke: #2ca02c; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mc4edb94a2c\" x=\"290.360417\" y=\"535.79875\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n </g>\n </g>\n <g id=\"text_78\">\n <!-- CHP (bool_shutdown) -->\n <g transform=\"translate(308.360417 539.29875)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-75\" d=\"M 544 1381 \nL 544 3500 \nL 1119 3500 \nL 1119 1403 \nQ 1119 906 1312 657 \nQ 1506 409 1894 409 \nQ 2359 409 2629 706 \nQ 2900 1003 2900 1516 \nL 2900 3500 \nL 3475 3500 \nL 3475 0 \nL 2900 0 \nL 2900 538 \nQ 2691 219 2414 64 \nQ 2138 -91 1772 -91 \nQ 1169 -91 856 284 \nQ 544 659 544 1381 \nz\nM 1991 3584 \nL 1991 3584 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-43\"/>\n <use xlink:href=\"#DejaVuSans-48\" x=\"69.824219\"/>\n <use xlink:href=\"#DejaVuSans-50\" x=\"145.019531\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"205.322266\"/>\n <use xlink:href=\"#DejaVuSans-28\" x=\"237.109375\"/>\n <use xlink:href=\"#DejaVuSans-62\" x=\"276.123047\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"339.599609\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"400.78125\"/>\n <use xlink:href=\"#DejaVuSans-6c\" x=\"461.962891\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"489.746094\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"539.746094\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"591.845703\"/>\n <use xlink:href=\"#DejaVuSans-75\" x=\"655.224609\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"718.603516\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"757.8125\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"821.289062\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"882.470703\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"964.257812\"/>\n <use xlink:href=\"#DejaVuSans-29\" x=\"1027.636719\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"axes_5\">\n <g id=\"patch_26\">\n <path d=\"M 464.091667 666.52625 \nL 852.813021 666.52625 \nL 852.813021 376.918125 \nL 464.091667 376.918125 \nz\n\" style=\"fill: #ffffff\"/>\n </g>\n <g id=\"matplotlib.axis_9\">\n <g id=\"xtick_37\">\n <g id=\"line2d_88\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"481.760819\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_79\">\n <!-- 0 -->\n <g transform=\"translate(478.579569 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-30\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_38\">\n <g id=\"line2d_89\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"558.583221\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_80\">\n <!-- 5 -->\n <g transform=\"translate(555.401971 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-35\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_39\">\n <g id=\"line2d_90\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"635.405623\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_81\">\n <!-- 10 -->\n <g transform=\"translate(629.043123 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_40\">\n <g id=\"line2d_91\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"712.228025\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_82\">\n <!-- 15 -->\n <g transform=\"translate(705.865525 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n <g id=\"xtick_41\">\n <g id=\"line2d_92\">\n <g>\n <use xlink:href=\"#m243b741a0c\" x=\"789.050427\" y=\"666.52625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_83\">\n <!-- 20 -->\n <g transform=\"translate(782.687927 681.124687)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"63.623047\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"matplotlib.axis_10\">\n <g id=\"ytick_34\">\n <g id=\"line2d_93\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"653.518114\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_84\">\n <!-- 1.00 -->\n <g transform=\"translate(434.826042 657.317333)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_35\">\n <g id=\"line2d_94\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"620.588616\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_85\">\n <!-- 1.25 -->\n <g transform=\"translate(434.826042 624.387835)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_36\">\n <g id=\"line2d_95\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"587.659118\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_86\">\n <!-- 1.50 -->\n <g transform=\"translate(434.826042 591.458337)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_37\">\n <g id=\"line2d_96\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"554.72962\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_87\">\n <!-- 1.75 -->\n <g transform=\"translate(434.826042 558.528839)scale(0.1 -0.1)\">\n <defs>\n <path id=\"DejaVuSans-37\" d=\"M 525 4666 \nL 3525 4666 \nL 3525 4397 \nL 1831 0 \nL 1172 0 \nL 2766 4134 \nL 525 4134 \nL 525 4666 \nz\n\" transform=\"scale(0.015625)\"/>\n </defs>\n <use xlink:href=\"#DejaVuSans-31\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-37\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_38\">\n <g id=\"line2d_97\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"521.800123\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_88\">\n <!-- 2.00 -->\n <g transform=\"translate(434.826042 525.599341)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_39\">\n <g id=\"line2d_98\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"488.870625\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_89\">\n <!-- 2.25 -->\n <g transform=\"translate(434.826042 492.669843)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-32\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_40\">\n <g id=\"line2d_99\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"455.941127\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_90\">\n <!-- 2.50 -->\n <g transform=\"translate(434.826042 459.740345)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_41\">\n <g id=\"line2d_100\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"423.011629\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_91\">\n <!-- 2.75 -->\n <g transform=\"translate(434.826042 426.810847)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-32\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-37\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-35\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n <g id=\"ytick_42\">\n <g id=\"line2d_101\">\n <g>\n <use xlink:href=\"#md4aa733a36\" x=\"464.091667\" y=\"390.082131\" style=\"stroke: #000000; stroke-width: 0.8\"/>\n </g>\n </g>\n <g id=\"text_92\">\n <!-- 3.00 -->\n <g transform=\"translate(434.826042 393.881349)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-33\"/>\n <use xlink:href=\"#DejaVuSans-2e\" x=\"63.623047\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"95.410156\"/>\n <use xlink:href=\"#DejaVuSans-30\" x=\"159.033203\"/>\n </g>\n </g>\n </g>\n </g>\n <g id=\"line2d_102\">\n <path d=\"M 481.760819 521.800123 \nL 497.1253 459.406134 \nL 512.48978 411.900644 \nL 527.85426 390.619447 \nL 543.218741 400.640679 \nL 558.583221 439.573065 \nL 573.947702 498.126531 \nL 589.312182 562.329007 \nL 604.676662 616.860451 \nL 620.041143 648.70853 \nL 635.405623 650.273633 \nL 650.770104 621.182294 \nL 666.134584 568.376309 \nL 681.499064 504.45628 \nL 696.863545 444.674852 \nL 712.228025 403.297112 \nL 727.592506 390.196646 \nL 742.956986 408.499498 \nL 758.321466 453.838227 \nL 773.685947 515.394072 \nL 789.050427 578.478535 \nL 804.414908 628.038353 \nL 819.779388 652.247528 \nL 835.143868 645.329248 \n\" clip-path=\"url(#p2af35068f9)\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p2af35068f9)\">\n <use xlink:href=\"#m74bd5641ce\" x=\"481.760819\" y=\"521.800123\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"497.1253\" y=\"459.406134\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"512.48978\" y=\"411.900644\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"527.85426\" y=\"390.619447\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"543.218741\" y=\"400.640679\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"558.583221\" y=\"439.573065\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"573.947702\" y=\"498.126531\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"589.312182\" y=\"562.329007\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"604.676662\" y=\"616.860451\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"620.041143\" y=\"648.70853\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"635.405623\" y=\"650.273633\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"650.770104\" y=\"621.182294\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"666.134584\" y=\"568.376309\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"681.499064\" y=\"504.45628\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"696.863545\" y=\"444.674852\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"712.228025\" y=\"403.297112\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"727.592506\" y=\"390.196646\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"742.956986\" y=\"408.499498\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"758.321466\" y=\"453.838227\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"773.685947\" y=\"515.394072\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"789.050427\" y=\"578.478535\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"804.414908\" y=\"628.038353\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"819.779388\" y=\"652.247528\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n <use xlink:href=\"#m74bd5641ce\" x=\"835.143868\" y=\"645.329248\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"line2d_103\">\n <path d=\"M 481.760819 390.082131 \nL 497.1253 405.797452 \nL 512.48978 449.193415 \nL 527.85426 509.914843 \nL 543.218741 573.472345 \nL 558.583221 624.699784 \nL 573.947702 651.373231 \nL 589.312182 647.127849 \nL 604.676662 612.976673 \nL 620.041143 557.068883 \nL 635.405623 492.745236 \nL 650.770104 435.354686 \nL 666.134584 398.59181 \nL 681.499064 391.228991 \nL 696.863545 415.023149 \nL 712.228025 464.296507 \nL 727.592506 527.291419 \nL 742.956986 588.975994 \nL 758.321466 634.631014 \nL 773.685947 653.362244 \nL 789.050427 640.700026 \nL 804.414908 599.665826 \nL 819.779388 540.051255 \nL 835.143868 476.081586 \n\" clip-path=\"url(#p2af35068f9)\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p2af35068f9)\">\n <use xlink:href=\"#m8197a7c924\" x=\"481.760819\" y=\"390.082131\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"497.1253\" y=\"405.797452\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"512.48978\" y=\"449.193415\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"527.85426\" y=\"509.914843\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"543.218741\" y=\"573.472345\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"558.583221\" y=\"624.699784\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"573.947702\" y=\"651.373231\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"589.312182\" y=\"647.127849\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"604.676662\" y=\"612.976673\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"620.041143\" y=\"557.068883\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"635.405623\" y=\"492.745236\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"650.770104\" y=\"435.354686\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"666.134584\" y=\"398.59181\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"681.499064\" y=\"391.228991\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"696.863545\" y=\"415.023149\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"712.228025\" y=\"464.296507\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"727.592506\" y=\"527.291419\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"742.956986\" y=\"588.975994\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"758.321466\" y=\"634.631014\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"773.685947\" y=\"653.362244\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"789.050427\" y=\"640.700026\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"804.414908\" y=\"599.665826\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"819.779388\" y=\"540.051255\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n <use xlink:href=\"#m8197a7c924\" x=\"835.143868\" y=\"476.081586\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"line2d_104\">\n <path d=\"M 481.760819 521.800123 \nL 497.1253 521.800123 \nL 512.48978 521.800123 \nL 527.85426 521.800123 \nL 543.218741 521.800123 \nL 558.583221 521.800123 \nL 573.947702 521.800123 \nL 589.312182 521.800123 \nL 604.676662 521.800123 \nL 620.041143 521.800123 \nL 635.405623 521.800123 \nL 650.770104 521.800123 \nL 666.134584 521.800123 \nL 681.499064 521.800123 \nL 696.863545 521.800123 \nL 712.228025 521.800123 \nL 727.592506 521.800123 \nL 742.956986 521.800123 \nL 758.321466 521.800123 \nL 773.685947 521.800123 \nL 789.050427 521.800123 \nL 804.414908 521.800123 \nL 819.779388 521.800123 \nL 835.143868 521.800123 \n\" clip-path=\"url(#p2af35068f9)\" style=\"fill: none; stroke: #2ca02c; stroke-width: 1.5; stroke-linecap: square\"/>\n <g clip-path=\"url(#p2af35068f9)\">\n <use xlink:href=\"#mc4edb94a2c\" x=\"481.760819\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"497.1253\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"512.48978\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"527.85426\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"543.218741\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"558.583221\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"573.947702\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"589.312182\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"604.676662\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"620.041143\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"635.405623\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"650.770104\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"666.134584\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"681.499064\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"696.863545\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"712.228025\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"727.592506\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"742.956986\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"758.321466\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"773.685947\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"789.050427\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"804.414908\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"819.779388\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n <use xlink:href=\"#mc4edb94a2c\" x=\"835.143868\" y=\"521.800123\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n </g>\n </g>\n <g id=\"patch_27\">\n <path d=\"M 464.091667 666.52625 \nL 464.091667 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_28\">\n <path d=\"M 852.813021 666.52625 \nL 852.813021 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_29\">\n <path d=\"M 464.091667 666.52625 \nL 852.813021 666.52625 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"patch_30\">\n <path d=\"M 464.091667 376.918125 \nL 852.813021 376.918125 \n\" style=\"fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square\"/>\n </g>\n <g id=\"text_93\">\n <!-- Prices -->\n <g transform=\"translate(640.689531 370.918125)scale(0.12 -0.12)\">\n <use xlink:href=\"#DejaVuSans-50\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"58.552734\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"99.666016\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"127.449219\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"182.429688\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"243.953125\"/>\n </g>\n </g>\n <g id=\"legend_5\">\n <g id=\"patch_31\">\n <path d=\"M 695.042708 429.786875 \nL 845.813021 429.786875 \nQ 847.813021 429.786875 847.813021 427.786875 \nL 847.813021 383.918125 \nQ 847.813021 381.918125 845.813021 381.918125 \nL 695.042708 381.918125 \nQ 693.042708 381.918125 693.042708 383.918125 \nL 693.042708 427.786875 \nQ 693.042708 429.786875 695.042708 429.786875 \nz\n\" style=\"fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter\"/>\n </g>\n <g id=\"line2d_105\">\n <path d=\"M 697.042708 390.016563 \nL 707.042708 390.016563 \nL 717.042708 390.016563 \n\" style=\"fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m74bd5641ce\" x=\"707.042708\" y=\"390.016563\" style=\"fill: #1f77b4; stroke: #1f77b4\"/>\n </g>\n </g>\n <g id=\"text_94\">\n <!-- input data: price_power -->\n <g transform=\"translate(725.042708 393.516563)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-69\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"27.783203\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"91.162109\"/>\n <use xlink:href=\"#DejaVuSans-75\" x=\"154.638672\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"218.017578\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"257.226562\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"289.013672\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"352.490234\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"413.769531\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"452.978516\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"514.257812\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"547.949219\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"579.736328\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"643.212891\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"684.326172\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"712.109375\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"767.089844\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"828.613281\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"878.613281\"/>\n <use xlink:href=\"#DejaVuSans-6f\" x=\"942.089844\"/>\n <use xlink:href=\"#DejaVuSans-77\" x=\"1003.271484\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"1085.058594\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"1146.582031\"/>\n </g>\n </g>\n <g id=\"line2d_106\">\n <path d=\"M 697.042708 404.972813 \nL 707.042708 404.972813 \nL 717.042708 404.972813 \n\" style=\"fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#m8197a7c924\" x=\"707.042708\" y=\"404.972813\" style=\"fill: #ff7f0e; stroke: #ff7f0e\"/>\n </g>\n </g>\n <g id=\"text_95\">\n <!-- input data: price_heat -->\n <g transform=\"translate(725.042708 408.472813)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-69\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"27.783203\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"91.162109\"/>\n <use xlink:href=\"#DejaVuSans-75\" x=\"154.638672\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"218.017578\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"257.226562\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"289.013672\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"352.490234\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"413.769531\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"452.978516\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"514.257812\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"547.949219\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"579.736328\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"643.212891\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"684.326172\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"712.109375\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"767.089844\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"828.613281\"/>\n <use xlink:href=\"#DejaVuSans-68\" x=\"878.613281\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"941.992188\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"1003.515625\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"1064.794922\"/>\n </g>\n </g>\n <g id=\"line2d_107\">\n <path d=\"M 697.042708 419.929063 \nL 707.042708 419.929063 \nL 717.042708 419.929063 \n\" style=\"fill: none; stroke: #2ca02c; stroke-width: 1.5; stroke-linecap: square\"/>\n <g>\n <use xlink:href=\"#mc4edb94a2c\" x=\"707.042708\" y=\"419.929063\" style=\"fill: #2ca02c; stroke: #2ca02c\"/>\n </g>\n </g>\n <g id=\"text_96\">\n <!-- input data: price_gas -->\n <g transform=\"translate(725.042708 423.429063)scale(0.1 -0.1)\">\n <use xlink:href=\"#DejaVuSans-69\"/>\n <use xlink:href=\"#DejaVuSans-6e\" x=\"27.783203\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"91.162109\"/>\n <use xlink:href=\"#DejaVuSans-75\" x=\"154.638672\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"218.017578\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"257.226562\"/>\n <use xlink:href=\"#DejaVuSans-64\" x=\"289.013672\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"352.490234\"/>\n <use xlink:href=\"#DejaVuSans-74\" x=\"413.769531\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"452.978516\"/>\n <use xlink:href=\"#DejaVuSans-3a\" x=\"514.257812\"/>\n <use xlink:href=\"#DejaVuSans-20\" x=\"547.949219\"/>\n <use xlink:href=\"#DejaVuSans-70\" x=\"579.736328\"/>\n <use xlink:href=\"#DejaVuSans-72\" x=\"643.212891\"/>\n <use xlink:href=\"#DejaVuSans-69\" x=\"684.326172\"/>\n <use xlink:href=\"#DejaVuSans-63\" x=\"712.109375\"/>\n <use xlink:href=\"#DejaVuSans-65\" x=\"767.089844\"/>\n <use xlink:href=\"#DejaVuSans-5f\" x=\"828.613281\"/>\n <use xlink:href=\"#DejaVuSans-67\" x=\"878.613281\"/>\n <use xlink:href=\"#DejaVuSans-61\" x=\"942.089844\"/>\n <use xlink:href=\"#DejaVuSans-73\" x=\"1003.369141\"/>\n </g>\n </g>\n </g>\n </g>\n </g>\n <defs>\n <clipPath id=\"p77980ecbd7\">\n <rect x=\"35.304688\" y=\"22.318125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n <clipPath id=\"p945eb226df\">\n <rect x=\"464.091667\" y=\"22.318125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n <clipPath id=\"pa91f26bb38\">\n <rect x=\"892.878646\" y=\"22.318125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n <clipPath id=\"p95d50b5a2c\">\n <rect x=\"35.304688\" y=\"376.918125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n <clipPath id=\"p2af35068f9\">\n <rect x=\"464.091667\" y=\"376.918125\" width=\"388.721354\" height=\"289.608125\"/>\n </clipPath>\n </defs>\n</svg>\n", + "image/png": "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V1dXEDanc38458/wuwyzNiGYJPq170DPcZIctLuQKJMcLM4xX0Oi2tXcOeecQ05ODv379+e2225rqBDctWsXvXr1omPHji1qZ+/evfz5z39m5cqVLF++nO3btzfcN3nyZFauXMn69euZNWsWf//73wGYN28eTz31FBs2bOCHH34gNDT0uDarqqrYvXs3CQkJDbetX7+eJ598kq1bt7J7926WL19ORUUFc+bMYfHixWzevJmamhqeeeYZKioquPnmm/noo49Yu3Yt+/fvb2jn0Ucf5YwzziAtLY3vvvuO3/3ud5SVlTV5bE8//TSdOnVi69at/PnPf2bt2rXHtbNmzRo2bdrEkiVL2LRpEwUFBbz//vts2bKFTZs28cc//rHh8cnJyfzwww8N10OD/KlfbewXU/uw8KbxjO8T45SKv9+dM4ALhnfn/z7dzmeb97W7PSGsFODvR02dOVluOz2J+VeP9srkIEgFobCz8sOwcbH5NHnibea2+gqNvHXHr4HSHqGd4Pr/malbH94OFUWQcodz2hbCHfLWQVhns4FBffWFs88TIVylvqLJmQmLEVfD6hdgy/9gzGzntXsqK+abTRX6nwebF8PA85x7Dk79LRRmwpK/QqcEGHmV89oWvqEwG/yDTHLHSntWmA+xpt4Da1406wzKeGWtk1T6NaifVlz/ezvt3nb93iIiIli7di0//PAD3333HVdeeSV//etfGT16dKvaSUtLY9q0aURHmzVaZ86cyc6dZt3y3NxcrrzySvbt20dVVRWJiWajm0mTJvHrX/+aa665hssuu4z4+Pjj2szPzycqKuq428aNG9fwuJEjR5KVlUWHDh1ITEykf3+zfMTs2bN56qmnOO2000hMTKRfv34AXHvttTz//PMAfPnll3z44YfMmzcPgIqKCvbs2dPkepDLli1rqHQcOnQow4cPb7jvrbfe4vnnn6empoZ9+/axdetWBg8eTEhICDfddBMXXnghF154YcPju3TpclzydH9xBRpNeLA/b6/NZdqAzsets9Yefn6Kx2eOYF/RUe5avIGukSGM7tXJKW0L4W7zvtiOAuZOS+KNtBwm9Y112rliN1JBKOxr2RNmE5GL/nX87YlT27UYcpOCwuGqxebT7C//CN/8CVy8gY8QTtNznKkKGXvzseoLV5wnQrhCUbb56swpj3GjIba/2QXVXTKX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YqbnlYspGtyYq4C7gQLgQWvtd40xE3GW41YC64BPW2vbjDFXA7Oiy4yNU3vt8zj11+601v6xtzHTdgAiIiJpovez+ER+f3gq8q0XeFQ/szNFPuBYAAwFDgLfxlkp8AQwDtgNfKrbhxd5r5ef2QKc5cUW2AV8sVt9vbxmjJkLvIrzAXk4svnvcOoQ6jwTERFxqbQGCEVERERERERERCS35UyTEhEREREREREREck8BQhFRERERERERETymAKEIiIiIiIiIiIieSwtAUJjzGJjzDZjzA5jzDci25ZEvrfGmKF9PHeBMeb36ZiXiIiIiIiIiIiInCrlAUJjTAHwU+BKYCpwozFmKvA68CGcrmYiIiIiIiIiIiKSA9KRQTgb2GGt3WmtDQGPA9dYa9dZa3fFM5AxZrYxZqUxZp0xZoUxpiay/RZjzG+MMc8ZY941xvwg9YchIiIiIiIiIiIy8HnTMOZoYG+37/cBFyU41lbgMmtthzHmQ8D3gI9HHpsBzATagG3GmJ9Ya/f2PIyIiIiIiIiIiIj0JB0BwlQqBx42xkwGLODr9thSa+0JAGPMZmA8pwYmRUREREREREREpB/pWGK8Hxjb7fsxkW09MsY8b4xZb4y5v4eH/xF42Vp7LvBRoKjbY23dvu4k94OdIiIiIiIiIiIiOScdQbU3gcnGmCqcwOANwE297WytvaKPsco5GVy8JVUTFBEREREREREREUfKMwittR3AEuB5YAvwhLV2kzHmK8aYfTgZhRt6yRgEJ2gZzQ78AfDPxph1KENQREREREREREQk5Yy1NttzOIUx5i+B0dbar2V7LiIiIiIiIiIiIgNdTmXlGWMeAM4FPpXtuYiIiIiIiIiIiOSDnMsgFBERERERERERkcxJRxdjERERERERERERcYm0BgiNMWONMS8bYzYbYzZF6gtijKk0xrxojHk3cj84sv1mY8wGY8w7xpgVxpjzuo31oDHmkDFmYzrnLCIiIiIiIiIikk/SnUHYAfyNtXYqcDFwhzFmKvANYKm1djKwNPI9QB0w31r7AeAfgfu6jfUQsDjN8xUREREREREREckraQ0QWmvft9aujXzdAGwBRgPXAA9HdnsY+FhknxXW2mOR7W8AY7qNtRw4ms75ioiIiIiIiIiI5JuM1SA0xkwAZgKrgBHW2vcjDx0ARvTwlFuBP2ZmdiIiIiIiIiIiIvnJm4kXMcaUAr8G7rTWBo0xXY9Za60xxp62/0KcAOHcTMxPREREREREREQkX6U9g9AY48MJDj5irf1NZPNBY8yoyOOjgEPd9p8O3A9cY609ku75iYiIiIiIiIiI5LN0dzE2wAPAFmvtv3V76Gngs5GvPwv8LrL/OOA3wGestdvTOTcREREREREREREBY63tf69EBzdmLvAq8A4Qjmz+O5w6hE8A44DdwKestUeNMfcDH49sA+iw1s6KjPUYsAAYChwEvm2tfSBtkxcREREREREREckDaQ0QioiIiIiIiIiISG7LWBdjERERERERERERyT0KEIqIiIiIiIiIiOQxBQhFRERERERERETymAKEIiIiIiIiIiIieUwBQhERERERERERkTymAKGIiIiIiIiIiEgeU4BQREREREREREQkj/1/GE0QbQgJxVQAAAAASUVORK5CYII=\n" }, "metadata": { "needs_background": "light" diff --git a/eaopack/assets.py b/eaopack/assets.py index 6269344..47153dd 100644 --- a/eaopack/assets.py +++ b/eaopack/assets.py @@ -621,15 +621,12 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only ## if it's zero, one variable is enough # Make vector of single min/max capacities. - max_cap = self.make_vector(self.max_cap, prices) - min_cap = self.make_vector(self.min_cap, prices) + max_cap = self.make_vector(self.max_cap, prices, convert=True) + min_cap = self.make_vector(self.min_cap, prices, convert=True) # check integrity if any(min_cap>max_cap): raise ValueError('Asset --' + self.name+'--: Contract with min_cap > max_cap leads to ill-posed optimization problem') - # need to scale to discretization step since: flow * dT = volume in time step - min_cap = min_cap * self.timegrid.restricted.dt - max_cap = max_cap * self.timegrid.restricted.dt # Make vector of extra_costs: extra_costs = self.make_vector(self.extra_costs, prices, default_value=0) @@ -689,7 +686,7 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only return OptimProblem(c = c, l = l, u = u, mapping = mapping) - def make_vector(self, value: Union[float, Dict, str], prices:dict, default_value: float = None): + def make_vector(self, value: Union[float, Dict, str], prices:dict, default_value: float = None, convert=False): """ Make a vector out of value Args: @@ -719,6 +716,9 @@ def make_vector(self, value: Union[float, Dict, str], prices:dict, default_valu vec = self.timegrid.restricted.values_to_grid(value) if default_value is not None: vec[np.isnan(vec)] = default_value + + if convert: + vec = vec * self.timegrid.restricted.dt return vec @@ -1119,7 +1119,14 @@ def __init__(self, running_costs: Union[float, Dict, str] = 0., min_runtime: float = 0, time_already_running: float = 0, + min_downtime: float = 0, + time_already_off: float = 0, last_dispatch: float = 0, + start_ramp_lower_bounds: Sequence = None, + start_ramp_upper_bounds: Sequence = None, + shutdown_ramp_lower_bounds: Sequence = None, + shutdown_ramp_upper_bounds: Sequence = None, + interpolate_ramp_frequency: bool = True, start_fuel: Union[float, Dict, str] = 0., fuel_efficiency: Union[float, Dict, str] = 1., consumption_if_on: Union[float, Dict, str] = 0. @@ -1165,9 +1172,42 @@ def __init__(self, ramp (float): Maximum increase/decrease of virtual dispatch (power + conversion_factor_power_heat * heat) in one timestep. Defaults to 1. start_costs (float): Costs for starting. Defaults to 0. running_costs (float): Costs when on. Defaults to 0. - min_runtime (int): Minimum runtime in timegrids main_time_unit. Defaults to 0. + min_runtime (int): Minimum runtime in timegrids main_time_unit. (start ramp time and shutdown ramp time do not count towards the min runtime.) Defaults to 0. time_already_running (int): The number of timesteps the asset is already running in timegrids main_time_unit. Defaults to 0. + min_downtime (int): Minimum downtime in timegrids main_time_unit. Defaults to 0. + time_already_off (int): The number of timesteps the asset has already been off in timegrids main_time_unit. Defaults to 0. last_dispatch (float): Previous virtual dispatch (power + conversion_factor_power_heat * heat). Defaults to 0. + start_ramp_lower_bounds (Sequence): The i-th element of this sequence specifies a lower bound of the + virtual dispatch (power + conversion_factor_power_heat * heat) at i timesteps + after starting. If interpolate_ramp_frequency is False, it is assumed + that the ramp is given in the timegrids freq, otherwise it is assumed + that the ramp is given in the timegrids main_time_unit and will be + interpolated accordingly. Defaults to None. + start_ramp_upper_bounds (Sequence): The i-th element of this sequence specifies an upper bound of the + virtual dispatch (power + conversion_factor_power_heat * heat) at i timesteps + after starting. If it is None, it is set equal to start_ramp_lower_bounds. + If interpolate_ramp_frequency is False, it is assumed + that the ramp is given in the timegrids freq, otherwise it is assumed + that the ramp is given in the timegrids main_time_unit and will be + interpolated accordingly. + Defaults to None. + shutdown_ramp_lower_bounds (Sequence): The i-th element of this sequence specifies a lower bound of the + virtual dispatch (power + conversion_factor_power_heat * heat) at i timesteps + before turning off. If interpolate_ramp_frequency is False, it is assumed + that the ramp is given in the timegrids freq, otherwise it is assumed + that the ramp is given in the timegrids main_time_unit and will be + interpolated accordingly. Defaults to None. + shutdown_ramp_upper_bounds (Sequence): The i-th element of this sequence specifies an upper bound of the + virtual dispatch (power + conversion_factor_power_heat * heat) at i timesteps + before turning off. If it is None, it is set equal to shutdown_ramp_upper_bounds. + If interpolate_ramp_frequency is False, it is assumed + that the ramp is given in the timegrids freq, otherwise it is assumed + that the ramp is given in the timegrids main_time_unit and will be + interpolated accordingly. Defaults to None. + interpolate_ramp_frequency (bool): If this is False, it is assumed that the start and shutdown ramp specification + are given in the timegrids freq, otherwise it is assumed that they are given + in the timegrids main_time_unit and the ramps will be interpolated with + a piecewise linear function. Defaults to True. Optional: Explicit fuel consumption (e.g. gas) for multi-commodity simulation start_fuel (float, dict, str): detaults to 0 @@ -1195,13 +1235,35 @@ def __init__(self, self.start_costs = start_costs self.running_costs = running_costs self.min_runtime = min_runtime + assert self.min_runtime >= 0, "Min_runtime cannot be < 0. Asset: " + self.name self.time_already_running = time_already_running + self.min_downtime = min_downtime + self.time_already_off = time_already_off self.last_dispatch = last_dispatch + self.start_ramp_lower_bounds = start_ramp_lower_bounds + self.start_ramp_upper_bounds = start_ramp_upper_bounds + if self.start_ramp_upper_bounds is None: + self.start_ramp_upper_bounds = self.start_ramp_lower_bounds + assert self.start_ramp_lower_bounds is None or len(self.start_ramp_lower_bounds) == len(self.start_ramp_upper_bounds), "start_ramp_lower_bounds and start_ramp_upper_bounds cannot have different lengths. Asset: " + self.name + self.start_ramp_time = len(self.start_ramp_lower_bounds) if self.start_ramp_lower_bounds is not None else 0 + assert np.all([self.start_ramp_lower_bounds[i] <= self.start_ramp_upper_bounds[i] for i in range(self.start_ramp_time)]), "shutdown_ramp_lower_bounds is higher than shutdown_ramp_upper bounds at some point. Asset: " + self.name + self.shutdown_ramp_lower_bounds = shutdown_ramp_lower_bounds + self.shutdown_ramp_upper_bounds = shutdown_ramp_upper_bounds + if self.shutdown_ramp_upper_bounds is None: + self.shutdown_ramp_upper_bounds = self.shutdown_ramp_lower_bounds + assert self.shutdown_ramp_lower_bounds is None or len(self.shutdown_ramp_lower_bounds) == len(self.shutdown_ramp_upper_bounds), "start_ramp_lower_bounds and start_ramp_upper_bounds cannot have different lengths. Asset: " + self.name + self.shutdown_ramp_time = len(self.shutdown_ramp_lower_bounds) if self.shutdown_ramp_lower_bounds is not None else 0 + assert np.all([self.shutdown_ramp_lower_bounds[i] <= self.shutdown_ramp_upper_bounds[i] for i in range(self.shutdown_ramp_time)]), "shutdown_ramp_lower_bounds is higher than shutdown_ramp_upper bounds at some point. Asset: " + self.name + self.interpolate_ramp_frequency = interpolate_ramp_frequency + if len(nodes) >= 3: self.fuel_efficiency = fuel_efficiency self.consumption_if_on = consumption_if_on self.start_fuel = start_fuel + if self.min_downtime > 1: + assert (self.time_already_off == 0) ^ (self.time_already_running == 0), "Either time_already_off or time_already_running has to be 0, but not both. Asset: " + self.name + if len(nodes) not in (2,3): raise ValueError('Length of nodes has to be 2 or 3; power, heat and optionally fuel. Asset: ' + self.name) @@ -1218,29 +1280,57 @@ def setup_optim_problem(self, prices: dict, timegrid: Timegrid = None, Returns: OptimProblem: Optimization problem to be used by optimizer """ - if self.freq is not None and self.freq != timegrid.freq: - raise ValueError('Freq of asset' + self.name + ' is ' + str(self.freq) + ' which is unequal to freq ' + timegrid.freq + ' of timegrid. Asset: ' + self.name) - - # convert min_runtime and time_already_running from timegrids main_time_unit to timegrid.freq - min_runtime = self.convert_to_timegrid_freq(self.min_runtime, "min_runtime", timegrid) - time_already_running = self.convert_to_timegrid_freq(self.time_already_running, "time_already_running", timegrid) - op = super().setup_optim_problem(prices=prices, timegrid=timegrid, costs_only=costs_only) - # Check that min_cap and max_cap are >= 0 - assert np.all(op.l >= 0.), 'min_cap has to be greater or equal to 0. Asset: ' + self.name - assert np.all(op.u >= 0.), 'max_cap has to be greater or equal to 0. Asset: ' + self.name + if self.freq is not None and self.freq != self.timegrid.freq: + raise ValueError('Freq of asset' + self.name + ' is ' + str(self.freq) + ' which is unequal to freq ' + self.timegrid.freq + ' of timegrid. Asset: ' + self.name) + + # convert min_runtime and time_already_running from timegrids main_time_unit to timegrid.freq + min_runtime = self.convert_to_timegrid_freq(self.min_runtime, "min_runtime") + time_already_running = self.convert_to_timegrid_freq(self.time_already_running, "time_already_running") + min_downtime = self.convert_to_timegrid_freq(self.min_downtime, "min_downtime") + time_already_off = self.convert_to_timegrid_freq(self.time_already_off, "time_already_off") + + # Convert start ramp and shutdown ramp from timegrids main_time_unit to + # timegrid.freq IF self.interpolate_ramp_frequency is True, otherwise leave as is + start_ramp_time = self.start_ramp_time + start_ramp_lower_bounds = self.start_ramp_lower_bounds + start_ramp_upper_bounds = self.start_ramp_upper_bounds + shutdown_ramp_time = self.shutdown_ramp_time + shutdown_ramp_lower_bounds = self.shutdown_ramp_lower_bounds + shutdown_ramp_upper_bounds = self.shutdown_ramp_upper_bounds + if self.interpolate_ramp_frequency: + if self.start_ramp_time: + start_ramp_lower_bounds = self._convert_ramp(self.start_ramp_lower_bounds) + start_ramp_upper_bounds = self._convert_ramp(self.start_ramp_upper_bounds) + start_ramp_time = len(start_ramp_lower_bounds) + if self.shutdown_ramp_time: + shutdown_ramp_lower_bounds = self._convert_ramp(self.shutdown_ramp_lower_bounds) + shutdown_ramp_upper_bounds = self._convert_ramp(self.shutdown_ramp_upper_bounds) + shutdown_ramp_time = len(shutdown_ramp_lower_bounds) + if start_ramp_time: + start_ramp_lower_bounds *= self.timegrid.restricted.dt[:start_ramp_time] + start_ramp_upper_bounds *= self.timegrid.restricted.dt[:start_ramp_time] + if shutdown_ramp_time: + shutdown_ramp_lower_bounds *= self.timegrid.restricted.dt[:shutdown_ramp_time] + shutdown_ramp_upper_bounds *= self.timegrid.restricted.dt[:shutdown_ramp_time] + + min_runtime += start_ramp_time + shutdown_ramp_time + + # scale ramp and last dispatch in case timegrid.freq and timegrid.main_time_unit are not equal + ramp = self.ramp * self.timegrid.restricted.dt[0] if self.ramp is not None else None + last_dispatch = self.last_dispatch * self.timegrid.restricted.dt[0] # Make vectors of input params: start_costs = self.make_vector(self.start_costs, prices, default_value=0.) - running_costs = self.make_vector(self.running_costs, prices, default_value=0.) + running_costs = self.make_vector(self.running_costs, prices, default_value=0., convert=True) max_share_heat = self.make_vector(self.max_share_heat, prices, default_value=1.) conversion_factor_power_heat = self.make_vector(self.conversion_factor_power_heat, prices, default_value=1.) assert np.all(conversion_factor_power_heat != 0), 'conversion_factor_power_heat must not be zero. Asset: ' + self.name if len(self.nodes) >= 3: start_fuel = self.make_vector(self.start_fuel, prices, default_value=0.) fuel_efficiency = self.make_vector(self.fuel_efficiency, prices, default_value=1.) - consumption_if_on = self.make_vector(self.consumption_if_on, prices, default_value=0.) + consumption_if_on = self.make_vector(self.consumption_if_on, prices, default_value=0., convert=True) assert np.all(fuel_efficiency != 0), 'fuel efficiency must not be zero. Asset: ' + self.name # calculate costs: @@ -1249,85 +1339,127 @@ def setup_optim_problem(self, prices: dict, timegrid: Timegrid = None, else: c = op.c c = np.hstack([c, conversion_factor_power_heat * c]) # costs for power and heat dispatch - if len(self.nodes)==2: - include_start_variables = min_runtime > 1 or np.any(start_costs != 0) - include_on_variables = include_start_variables or np.any(self.min_cap != 0.) - else: - include_start_variables = min_runtime > 1 or np.any(start_costs != 0) or np.any(start_fuel !=0.) - include_on_variables = include_start_variables or np.any(self.min_cap != 0.) or np.any(consumption_if_on != 0.) + + include_shutdown_variables = shutdown_ramp_time > 0 or start_ramp_time > 0 + include_start_variables = min_runtime > 1 or np.any(start_costs != 0) or start_ramp_time > 0 or shutdown_ramp_time > 0 + include_on_variables = include_start_variables or min_downtime > 1 or include_shutdown_variables or np.any(self.min_cap != 0.) + if len(self.nodes) >= 3: + include_start_variables = include_start_variables or np.any(start_fuel != 0.) + include_on_variables = include_on_variables or include_start_variables or np.any(consumption_if_on != 0.) if include_on_variables: c = np.hstack([c, running_costs]) # add costs for on variables if include_start_variables: c = np.hstack([c, start_costs]) # add costs for start variables + if include_shutdown_variables: + c = np.hstack([c, np.zeros(self.timegrid.restricted.T)]) # costs for shutdown are 0 if costs_only: return c op.c = c + # Check that min_cap and max_cap are >= 0 + min_cap = op.l.copy() + max_cap = op.u.copy() + assert np.all(min_cap >= 0.), 'min_cap has to be greater or equal to 0. Asset: ' + self.name + assert np.all(max_cap >= 0.), 'max_cap has to be greater or equal to 0. Asset: ' + self.name + # Check that if include_on_variables is True, the minimum capacity is not 0. Otherwise the "on" variables cannot be computed correctly. - if np.any(op.l == 0) and include_on_variables: + if np.any(min_cap == 0) and include_on_variables: print("Warning for asset " + self.name + ": The minimum capacity is 0 at some point and 'on'-variables are included" ". This can lead to incorrect 'on' and 'start' variables. " "To prevent this either set min_cap>0 or set min_runtime=0 and start_costs=0 and start_fuel=0" " and consumption_if_on=0.") # Prepare matrix A: - n = len(op.l) + self.n = len(min_cap) if op.A is None: - op.A = sp.lil_matrix((0, n)) + op.A = sp.lil_matrix((0, self.n)) op.cType = '' op.b = np.zeros(0) + # Define the dispatch variables: + op = self._add_dispatch_variables(op, conversion_factor_power_heat, max_cap, max_share_heat) + + # Add on-, start-, and shutdown-variables: + op = self._add_bool_variables(op, include_on_variables, include_start_variables, include_shutdown_variables) + + # Minimum and maximum capacity: + op = self._add_constraints_for_min_and_max_cap(op, min_cap, max_cap, time_already_running, + conversion_factor_power_heat, include_on_variables, start_ramp_time, + start_ramp_lower_bounds, start_ramp_upper_bounds, shutdown_ramp_time, + shutdown_ramp_lower_bounds, shutdown_ramp_upper_bounds) + # Ramp constraints: - if self.ramp is not None: - variables = op.mapping[["asset", "node", "var_name"]].drop_duplicates() - for i in range(len(variables)): - I_past = None - for t in range(self.timegrid.restricted.T): - I_curr = np.where((op.mapping["asset"] == variables.iloc[i]["asset"]) - & (op.mapping["node"] == variables.iloc[i]["node"]) - & (op.mapping["var_name"] == variables.iloc[i]["var_name"]) - & (op.mapping["time_step"] == self.timegrid.restricted.I[t])) - if I_past and I_curr: - a = sp.lil_matrix((1, n)) - a[0, I_curr] = 1 - a[0, I_past] = -1 - op.A = sp.vstack([op.A, a]) - op.cType += 'L' - op.b = np.hstack([op.b, -self.ramp]) - op.A = sp.vstack([op.A, a]) - op.cType += 'U' - op.b = np.hstack([op.b, self.ramp]) - I_past = I_curr + op = self._add_constraints_for_ramp(op, ramp, conversion_factor_power_heat, time_already_running, + include_on_variables, max_cap, start_ramp_time, shutdown_ramp_time, last_dispatch) - # Initial ramp constraint - a = sp.lil_matrix((1, n)) - a[0, 0] = 1 - op.A = sp.vstack([op.A, a]) - op.cType += 'L' - op.b = np.hstack([op.b, -self.ramp + self.last_dispatch]) - op.A = sp.vstack([op.A, a]) - op.cType += 'U' - op.b = np.hstack([op.b, self.ramp + self.last_dispatch]) + # Start and shutdown constraints: + op = self._add_constrains_for_start_and_shutdown(op, time_already_running, include_start_variables, include_shutdown_variables) + + # Minimum runtime: + op = self._add_constraints_for_min_runtime(op, min_runtime, include_start_variables, time_already_running) + + # Minimum Downtime: + op = self._add_constraints_for_min_downtime(op, min_downtime, time_already_off) + # Boundaries for the heat variable: + op = self._add_constraints_for_heat(op, max_share_heat) + + # Reset mapping index: + op.mapping.reset_index(inplace=True, drop=True) # need to reset index (which enumerates variables) + + # Model fuel consumption: + if len(self.nodes) >= 3: + op = self._add_fuel_consumption(op, fuel_efficiency, consumption_if_on, start_fuel, conversion_factor_power_heat, include_on_variables, include_start_variables) + + return op + + def _convert_ramp(self, ramp, timegrid=None): + ramp_duration = len(ramp) + old_timepoints_in_new_freq = [self.convert_to_timegrid_freq(i, "ramp", timegrid, round=False) for i in + range(ramp_duration)] + new_timepoints = np.arange(self.convert_to_timegrid_freq(ramp_duration, "ramp_duration", timegrid)) + ramp_new_freq = np.interp(new_timepoints, old_timepoints_in_new_freq, ramp) + return ramp_new_freq + + def _add_dispatch_variables(self, op, conversion_factor_power_heat, max_cap, max_share_heat): + """ Divide each dispatch variable in op into a power dispatch that flows into the power node self.nodes[1] + and a heat dispatch that flows into self.nodes[2] """ # Make sure that op.mapping contains only dispatch variables (i.e. with type=='d') var_types = op.mapping['type'].unique() - assert np.all(var_types=='d'), "Only variables of type 'd' (i.e. dispatch variables) are allowed in op.mapping at this point. " \ - "However, there are variables with types " + str(var_types[var_types != 'd']) + " in the mapping." \ - "This is likely due to a change in a superclass." + assert np.all( + var_types == 'd'), "Only variables of type 'd' (i.e. dispatch variables) are allowed in op.mapping at this point. " \ + "However, there are variables with types " + str( + var_types[var_types != 'd']) + " in the mapping." \ + "This is likely due to a change in a superclass." + + self.heat_idx = len(op.mapping) # Divide each dispatch variable in power and heat: new_map = pd.DataFrame() for i, mynode in enumerate(self.nodes): - if i>=2: continue # do only for power and heat + if i >= 2: continue # do only for power and heat initial_map = op.mapping[op.mapping['type'] == 'd'].copy() initial_map['node'] = mynode.name new_map = pd.concat([new_map, initial_map.copy()]) op.mapping = new_map op.A = sp.hstack([op.A, sp.coo_matrix(conversion_factor_power_heat * op.A.toarray())]) + # Set lower and upper bounds + op.l = np.zeros(op.A.shape[1]) + if max_share_heat is not None: + u_heat = max_share_heat * max_cap + else: + u_heat = max_cap / conversion_factor_power_heat + op.u = np.hstack((max_cap, u_heat)) + + return op + + def _add_bool_variables(self, op, include_on_variables, include_start_variables, include_shutdown_variables): + """ Add the bool variables for 'on', 'start' and 'shutdown' to the OptimProblem op if needed """ # Add on variables if include_on_variables: + self.on_idx = len(op.mapping) op.mapping['bool'] = False map_bool = pd.DataFrame() map_bool['time_step'] = self.timegrid.restricted.I @@ -1341,133 +1473,345 @@ def setup_optim_problem(self, prices: dict, timegrid: Timegrid = None, # extend A for on variables (not relevant in exist. restrictions) op.A = sp.hstack((op.A, sp.lil_matrix((op.A.shape[0], len(map_bool))))) - # Add start variables - if include_start_variables: - map_bool['var_name'] = 'bool_start' - op.mapping = pd.concat([op.mapping, map_bool]) + # set lower and upper bounds: + op.l = np.hstack((op.l, np.zeros(self.timegrid.restricted.T))) + op.u = np.hstack((op.u, np.ones(self.timegrid.restricted.T))) - # extend A for start variables (not relevant in exist. restrictions) - op.A = sp.hstack((op.A, sp.lil_matrix((op.A.shape[0], len(map_bool))))) + # Add start variables + if include_start_variables: + self.start_idx = len(op.mapping) + map_bool['var_name'] = 'bool_start' + op.mapping = pd.concat([op.mapping, map_bool]) + # extend A for start variables (not relevant in exist. restrictions) + op.A = sp.hstack((op.A, sp.lil_matrix((op.A.shape[0], len(map_bool))))) + + # set lower and upper bounds: + op.l = np.hstack((op.l, np.zeros(self.timegrid.restricted.T))) + op.u = np.hstack((op.u, np.ones(self.timegrid.restricted.T))) + + # Add shutdown variables + if include_shutdown_variables: + self.shutdown_idx = len(op.mapping) + map_bool['var_name'] = 'bool_shutdown' + op.mapping = pd.concat([op.mapping, map_bool]) + + # extend A for shutdown variables (not relevant in exist. restrictions) + op.A = sp.hstack((op.A, sp.lil_matrix((op.A.shape[0], len(map_bool))))) + + # set lower and upper bounds: + op.l = np.hstack((op.l, np.zeros(self.timegrid.restricted.T))) + op.u = np.hstack((op.u, np.ones(self.timegrid.restricted.T))) + + return op + + def _add_constraints_for_min_and_max_cap(self, op, min_cap, max_cap, time_already_running, + conversion_factor_power_heat, include_on_variables, start_ramp_time, + start_ramp_lower_bounds, start_ramp_upper_bounds, shutdown_ramp_time, + shutdown_ramp_lower_bounds, shutdown_ramp_upper_bounds): + """ Add the constraints for the minimum and maximum capacity to op. + + These ensure that the virtual dispatch + (power + conversion_factor_power_heat * heat) is 0 when the asset is "off", + it is bounded by the start or shutdown specifications during the start and shutdown ramp, + and otherwise it is between minimum and maximum capacity""" # Minimum and maximum capacity: - A_lower_bounds = sp.lil_matrix((n, op.A.shape[1])) - A_upper_bounds = sp.lil_matrix((n, op.A.shape[1])) - for i in range(n): + start = max(0, start_ramp_time - time_already_running) if time_already_running > 0 else 0 + A_lower_bounds = sp.lil_matrix((self.n, op.A.shape[1])) + A_upper_bounds = sp.lil_matrix((self.n, op.A.shape[1])) + for i in range(start, self.n): var = op.mapping.iloc[i] - on_variable = np.where((op.mapping["asset"] == var["asset"]) - & (op.mapping["var_name"] == "bool_on") - & (op.mapping["time_step"] == var["time_step"])) A_lower_bounds[i, i] = 1 - A_lower_bounds[i, n + i] = conversion_factor_power_heat[i] - A_lower_bounds[i, on_variable] = - op.l[i] # has no effect if no on variables found + A_lower_bounds[i, self.heat_idx + i] = conversion_factor_power_heat[i] + if include_on_variables: + A_lower_bounds[i, self.on_idx + var["time_step"]] = - min_cap[i] A_upper_bounds[i, i] = 1 - A_upper_bounds[i, n + i] = conversion_factor_power_heat[i] - A_upper_bounds[i, on_variable] = - op.u[i] # has no effect if no on variables found - op.A = sp.vstack((op.A, A_lower_bounds)) - op.cType += 'L' * n - op.b = np.hstack((op.b, np.zeros(n))) - - op.A = sp.vstack((op.A, A_upper_bounds)) - op.cType += 'U' * n + A_upper_bounds[i, self.heat_idx + i] = conversion_factor_power_heat[i] + if include_on_variables: + A_upper_bounds[i, self.on_idx + var["time_step"]] = - max_cap[i] + + for j in range(start_ramp_time): + if i - j < 0: + continue + A_lower_bounds[i, self.start_idx + i - j] = min_cap[i] - start_ramp_lower_bounds[j] + A_upper_bounds[i, self.start_idx + i - j] = max_cap[i] - start_ramp_upper_bounds[j] + + for j in range(shutdown_ramp_time): + if i + j + 1 >= self.timegrid.restricted.T: + break + A_lower_bounds[i, self.shutdown_idx + i + j + 1] = min_cap[i] - shutdown_ramp_lower_bounds[j] + A_upper_bounds[i, self.shutdown_idx + i + j + 1] = max_cap[i] - shutdown_ramp_upper_bounds[j] + + op.A = sp.vstack((op.A, A_lower_bounds[start:])) + op.cType += 'L' * (self.n - start) + op.b = np.hstack((op.b, np.zeros(self.n - start))) + + op.A = sp.vstack((op.A, A_upper_bounds[start:])) + op.cType += 'U' * (self.n - start) if include_on_variables: - op.b = np.hstack((op.b, np.zeros(n))) + op.b = np.hstack((op.b, np.zeros(self.n - start))) else: - op.b = np.hstack((op.b, op.u)) + op.b = np.hstack((op.b, max_cap[start:])) - # Start constraints: - if include_start_variables: - myA = sp.lil_matrix((self.timegrid.restricted.T-1, op.A.shape[1])) - for i in range(self.timegrid.restricted.T-1): - myA[i, 2 * n + i + 1] = 1 - myA[i, 2 * n + i] = - 1 - myA[i, 2 * n + self.timegrid.restricted.T + i + 1] = -1 - op.A = sp.vstack((op.A, myA)) - op.cType += 'U' * (self.timegrid.restricted.T - 1) - op.b = np.hstack((op.b, np.zeros(self.timegrid.restricted.T-1))) + # Enforce start_ramp if asset is in the starting process at time 0 + if time_already_running > 0 and time_already_running < start_ramp_time: + for i in range(start_ramp_time - time_already_running): + # Upper Bound: + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, i] = 1 + a[0, self.heat_idx + i] = conversion_factor_power_heat[i] + op.A = sp.vstack((op.A, a)) + op.cType += 'U' + op.b = np.hstack((op.b, start_ramp_upper_bounds[time_already_running + i])) - if time_already_running==0: + # Lower Bound: a = sp.lil_matrix((1, op.A.shape[1])) - a[0, 2*n] = 1 - a[0, 2*n + self.timegrid.restricted.T] = -1 + a[0, i] = 1 + a[0, self.heat_idx + i] = conversion_factor_power_heat[i] op.A = sp.vstack((op.A, a)) + op.cType += 'L' + op.b = np.hstack((op.b, start_ramp_lower_bounds[time_already_running + i])) + + return op + + def _add_constraints_for_ramp(self, op: OptimProblem, ramp, conversion_factor_power_heat, time_already_running, include_on_variables, max_cap, start_ramp_time, shutdown_ramp_time, last_dispatch): + """ Add ramp constraints to the OptimProblem op. + + These ensure that the increase/decrease of the virtual dispatch (power + conversion_factor_power_heat * heat) + is bounded by ramp, except during timesteps that belong to the start or shutdown ramp""" + # Ramp constraints: + if ramp is not None: + for t in range(1, self.timegrid.restricted.T): + # Lower Bound + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, t] = 1 + a[0, self.heat_idx + t] = conversion_factor_power_heat[t] + a[0, t - 1] = -1 + a[0, self.heat_idx + t - 1] = -conversion_factor_power_heat[t] + if include_on_variables: + a[0, self.on_idx + t - 1] = ramp + for i in range(shutdown_ramp_time): + if t + i >= self.timegrid.restricted.T: + break + a[0, self.shutdown_idx + t + i] = max_cap[t - 1] - ramp + op.A = sp.vstack([op.A, a]) + op.cType += 'L' + if include_on_variables: + op.b = np.hstack([op.b, 0]) + else: + op.b = np.hstack([op.b, -ramp]) + + # Upper Bound + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, t] = 1 + a[0, self.heat_idx + t] = conversion_factor_power_heat[t] + a[0, t - 1] = -1 + a[0, self.heat_idx + t - 1] = -conversion_factor_power_heat[t] + if include_on_variables: + a[0, self.on_idx + t] = -ramp + b_value = 0 + else: + b_value = ramp + for i in range(start_ramp_time): + if t - i < 0: + if time_already_running > 0 and time_already_running - t + i == 0: + b_value += max_cap[t] - ramp + break + continue + a[0, self.start_idx + t - i] = ramp - max_cap[t] + op.A = sp.vstack([op.A, a]) op.cType += 'U' - op.b = np.hstack((op.b, 0)) + op.b = np.hstack([op.b, b_value]) + + # Initial ramp constraint + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, 0] = 1 + a[0, self.heat_idx] = conversion_factor_power_heat[0] + for i in range(shutdown_ramp_time): + a[0, self.shutdown_idx + i] = last_dispatch - ramp + op.A = sp.vstack([op.A, a]) + op.cType += 'L' + if time_already_running == 0: + op.b = np.hstack([op.b, last_dispatch]) + else: + op.b = np.hstack([op.b, -ramp + last_dispatch]) - # Minimum runtime: + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, 0] = 1 + a[0, self.heat_idx] = conversion_factor_power_heat[0] + if include_on_variables: + a[0, self.on_idx] = -ramp + op.A = sp.vstack([op.A, a]) + op.cType += 'U' + if not include_on_variables: + op.b = np.hstack([op.b, last_dispatch + ramp]) + elif time_already_running > 0 and time_already_running > start_ramp_time: + op.b = np.hstack([op.b, last_dispatch + max_cap[0] - ramp]) + else: + op.b = np.hstack([op.b, last_dispatch]) + return op + + def _add_constrains_for_start_and_shutdown(self, op: OptimProblem, time_already_running, include_start_variables, include_shutdown_variables): + """ Add constraints that ensure that the 'start' and 'shutdown' variables are correct """ + if include_start_variables: + if not include_shutdown_variables: + # Define just start constraints + myA = sp.lil_matrix((self.timegrid.restricted.T - 1, op.A.shape[1])) + for i in range(self.timegrid.restricted.T - 1): + myA[i, self.on_idx + i + 1] = 1 + myA[i, self.on_idx + i] = - 1 + myA[i, self.start_idx + i + 1] = -1 + op.A = sp.vstack((op.A, myA)) + op.cType += 'U' * (self.timegrid.restricted.T - 1) + op.b = np.hstack((op.b, np.zeros(self.timegrid.restricted.T - 1))) + + if time_already_running == 0: + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, self.on_idx] = 1 + a[0, self.start_idx] = -1 + op.A = sp.vstack((op.A, a)) + op.cType += 'S' + op.b = np.hstack((op.b, 0)) + else: + # Simultaneous definition of start- and shutdown constraints + myA = sp.lil_matrix((self.timegrid.restricted.T - 1, op.A.shape[1])) + for t in range(self.timegrid.restricted.T - 1): + myA[t, self.on_idx + t + 1] = 1 + myA[t, self.on_idx + t] = - 1 + myA[t, self.start_idx + t + 1] = -1 + myA[t, self.shutdown_idx + t + 1] = 1 + op.A = sp.vstack((op.A, myA)) + op.cType += 'S' * (self.timegrid.restricted.T - 1) + op.b = np.hstack((op.b, np.zeros(self.timegrid.restricted.T - 1))) + + if time_already_running == 0: + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, self.on_idx] = 1 + a[0, self.start_idx] = -1 + op.A = sp.vstack((op.A, a)) + op.cType += 'S' + op.b = np.hstack((op.b, 0)) + else: + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, self.on_idx] = 1 + a[0, self.shutdown_idx] = 1 + op.A = sp.vstack((op.A, a)) + op.cType += 'S' + op.b = np.hstack((op.b, 1)) + + # Ensure that shutdown and start process do not overlap + myA = sp.lil_matrix((self.timegrid.restricted.T - 1, op.A.shape[1])) + for t in range(self.timegrid.restricted.T - 1): + myA[t, self.start_idx + t] = 1 + myA[t, self.shutdown_idx + t] = 1 + op.A = sp.vstack((op.A, myA)) + op.cType += 'U' * (self.timegrid.restricted.T - 1) + op.b = np.hstack((op.b, np.ones(self.timegrid.restricted.T - 1))) + + # Ensure that shutdown and start at timestep 0 are correct: + if time_already_running == 0: + op.u[self.shutdown_idx] = 0 + else: + op.u[self.start_idx] = 0 + + return op + + def _add_constraints_for_min_runtime(self, op: OptimProblem, min_runtime, include_start_variables, time_already_running): + """ Add constraints to the OptimProblem op that ensure that every time the asset is turned on it remains on + for at least the minimum runtime. """ + if include_start_variables and min_runtime > 1: for t in range(self.timegrid.restricted.T): for i in range(1, min_runtime): if i > t: continue a = sp.lil_matrix((1, op.A.shape[1])) - a[0, 2 * n + t] = 1 - a[0, 2 * n + self.timegrid.restricted.T + t - i] = -1 + a[0, self.on_idx + t] = 1 + a[0, self.start_idx + t - i] = -1 op.A = sp.vstack((op.A, a)) op.cType += 'L' op.b = np.hstack((op.b, 0)) + # Enforce minimum runtime if asset already on + if time_already_running > 0 and min_runtime - time_already_running > 0: + op.l[self.on_idx:self.on_idx + min_runtime - time_already_running] = 1 + return op + + def _add_constraints_for_min_downtime(self, op: OptimProblem, min_downtime, time_already_off): + """ Add constraints to the OptimProblem op that ensure that every time the asset is turned off it remains off + for at least the minimum downtime. """ + if min_downtime > 1: + for t in range(self.timegrid.restricted.T): + for i in range(1, min_downtime): + if i > t: + continue + a = sp.lil_matrix((1, op.A.shape[1])) + a[0, self.on_idx + t] = 1 + a[0, self.on_idx + t - i] = -1 + if t > i: + a[0, self.on_idx + t - i - 1] = 1 + op.A = sp.vstack((op.A, a)) + op.cType += 'U' + if not t > i and time_already_off == 0: + op.b = np.hstack((op.b, 0)) + else: + op.b = np.hstack((op.b, 1)) + # Enforce minimum downtime if asset already off + if time_already_off > 0 and min_downtime - time_already_off > 0: + op.u[self.on_idx:self.on_idx + min_downtime - time_already_off] = 0 + return op + + def _add_constraints_for_heat(self, op: OptimProblem, max_share_heat): + """ Add constraints to the OptimProblem op to bound the heat variable by max_share_heat * power. """ # Boundaries for the heat variable: if max_share_heat is not None: - myA = sp.lil_matrix((n, op.A.shape[1])) - for i in range(n): - myA[i, n + i] = 1 + myA = sp.lil_matrix((self.n, op.A.shape[1])) + for i in range(self.n): + myA[i, self.heat_idx + i] = 1 myA[i, i] = - max_share_heat[i] op.A = sp.vstack((op.A, myA)) - op.cType += 'U' * n - op.b = np.hstack((op.b, np.zeros(n))) - - # Set lower and upper bounds for all variables - op.l = np.zeros(op.A.shape[1]) - if max_share_heat is not None: - u_heat = max_share_heat * op.u - else: - u_heat = op.u / conversion_factor_power_heat - op.u = np.hstack((op.u, u_heat, np.ones(op.A.shape[1] - op.u.shape[0] * 2))) - - # Enforce minimum runtime if asset already on - if time_already_running > 0 and min_runtime - time_already_running>0: - op.l[2*n:2*n+ min_runtime - time_already_running] = 1 + op.cType += 'U' * self.n + op.b = np.hstack((op.b, np.zeros(self.n))) + return op - # Reset mapping index: - op.mapping.reset_index(inplace=True, drop=True) # need to reset index (which enumerates variables) + def _add_fuel_consumption(self, op: OptimProblem, fuel_efficiency, consumption_if_on, start_fuel, conversion_factor_power_heat, include_on_variables, include_start_variables): + """ In case there is an explicit node for fuel, extend the mapping. + + Idea: fuel consumption is power disp + conversion_factor_power_heat * heat disp. + To realise this, the mapping in the same way as in the simpler asset type 'MultiCommodityContract'.""" + # disp_factor determines the factor with which fuel is consumed + if 'disp_factor' not in op.mapping: op.mapping['disp_factor'] = np.nan + new_map = op.mapping.copy() + for i in [0, 1]: # nodes power and heat + initial_map = op.mapping[ + (op.mapping['var_name'] == 'disp') & (op.mapping['node'] == self.node_names[i])].copy() + initial_map['node'] = self.node_names[2] # fuel node + if i == 0: + initial_map['disp_factor'] = -1. / fuel_efficiency + elif i == 1: + initial_map['disp_factor'] = -conversion_factor_power_heat / fuel_efficiency + new_map = pd.concat([new_map, initial_map.copy()]) + # consumption if on + if include_on_variables: + initial_map = op.mapping[op.mapping['var_name'] == 'bool_on'].copy() + initial_map['node'] = self.node_names[2] # fuel node + # initial_map['var_name'] = 'fuel_if_on' + initial_map['type'] = 'd' + initial_map['disp_factor'] = -consumption_if_on + new_map = pd.concat([new_map, initial_map.copy()]) + # consumption on start + if include_start_variables: + initial_map = op.mapping[op.mapping['var_name'] == 'bool_start'].copy() + initial_map['node'] = self.node_names[2] # fuel node + # initial_map['var_name'] = 'fuel_start' + initial_map['type'] = 'd' + initial_map['disp_factor'] = -start_fuel + new_map = pd.concat([new_map, initial_map.copy()]) - # in case there is an explicit node for fuel, extend mapping - # idea: fuel consumption is power disp + conversion_factor_power_heat * heat disp - # mapping extention equivalent to simpler asset type "MultiCommodityContract" - if len(self.nodes) >= 3: - # disp_factor determines the factor with which fuel is consumed - if 'disp_factor' not in op.mapping: op.mapping['disp_factor'] = np.nan - new_map = op.mapping.copy() - for i in [0,1]: # nodes power and heat - initial_map = op.mapping[(op.mapping['var_name']=='disp') & (op.mapping['node']== self.node_names[i])].copy() - initial_map['node'] = self.node_names[2] # fuel node - if i == 0: - initial_map['disp_factor'] = -1./fuel_efficiency - elif i == 1: - initial_map['disp_factor'] = -conversion_factor_power_heat / fuel_efficiency - new_map = pd.concat([new_map, initial_map.copy()]) - # consumption if on - if include_on_variables: - initial_map = op.mapping[op.mapping['var_name']=='bool_on'].copy() - initial_map['node'] = self.node_names[2] # fuel node - #initial_map['var_name'] = 'fuel_if_on' - initial_map['type'] = 'd' - initial_map['disp_factor'] = -consumption_if_on - new_map = pd.concat([new_map, initial_map.copy()]) - # consumption on start - if include_start_variables: - initial_map = op.mapping[op.mapping['var_name']=='bool_start'].copy() - initial_map['node'] = self.node_names[2] # fuel node - #initial_map['var_name'] = 'fuel_start' - initial_map['type'] = 'd' - initial_map['disp_factor'] = -start_fuel - new_map = pd.concat([new_map, initial_map.copy()]) - - op.mapping = new_map + op.mapping = new_map return op - class MultiCommodityContract(Contract): """ Multi commodity contract class - implements a Contract that generates two or more commoditites at a time. The main idea is to implement a CHP generating unit that would generate power and heat at the same time. diff --git a/eaopack/serialization.py b/eaopack/serialization.py index 4c1161c..8826793 100644 --- a/eaopack/serialization.py +++ b/eaopack/serialization.py @@ -49,6 +49,8 @@ def json_serialize_objects(obj) -> dict: elif isinstance(obj, Asset): res = obj.__dict__.copy() res.pop('asset_names',None) + res.pop('start_ramp_time', None) # only relevant for class CHPAsset + res.pop('shutdown_ramp_time', None) # only relevant for class CHPAsset # res.pop('timegrid', None) # not to be serialized res['__class__'] = 'Asset' # super class Asset res['asset_type'] = obj.__class__.__name__ # store child class diff --git a/setup.cfg b/setup.cfg index 921adfe..24c45bd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = eaopack -version = 1.2.1 +version = 1.2.2 author = The EAO development Team description = A Framework for Optimizing Decentralized Portfolios and Green Supply long_description = file: README.md
New feature: Specific starting ramp for CHP Idea for a new feature: Specific start up ramping curve. Background: Due to heating. a start up may require a very specific start up curve (below minimum power) We could try with the restrictions as in following paper: https://www.researchgate.net/publication/3267153_Modeling_of_Start-Up_and_Shut-Down_Power_Trajectories_of_Thermal_Units ![IMG-0556](https://user-images.githubusercontent.com/23403303/179460283-db0b6a30-581b-42d8-8652-3c54f5c2adca.jpg) Feature/eaopack bugfix -- > deserialization now converts stored ns dates back to numpy date64
die Versionnummer muss noch hoch gezählt werden.
2022-08-10T11:15:13
0.0
[]
[]
EnergyAssetOptimization/EAO
EnergyAssetOptimization__EAO-28
02599a153daa92aedce7421a34ce52060c9ff359
diff --git a/eaopack/assets.py b/eaopack/assets.py index 7610044..412ec67 100644 --- a/eaopack/assets.py +++ b/eaopack/assets.py @@ -506,6 +506,7 @@ def __init__(self, dict: dict['start'] = array dict['end'] = array dict['value'] = array + str: refers to column in "prices" data that provides time series to set up OptimProblem (as for "price" below) price (str): Name of price vector for buying / selling. Defaults to None extra_costs (float, optional): extra costs added to price vector (in or out). Defaults to 0. @@ -587,10 +588,18 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # Make vector of single min/max capacities. if isinstance(self.max_cap, (float, int, np.ndarray)): max_cap = self.max_cap*np.ones(T) + elif isinstance(self.max_cap, str): + assert (self.max_cap in prices), 'data for max_cap not found for asset '+self.name + max_cap = prices[self.max_cap].copy() + max_cap = max_cap[I] # only in asset time window else: # given in form of dict (start/end/values) max_cap = timegrid.restricted.values_to_grid(self.max_cap) if isinstance(self.min_cap, (float, int, np.ndarray)): min_cap = self.min_cap*np.ones(T) + elif isinstance(self.min_cap, str): + assert (self.min_cap in prices), 'data for min_cap not found for asset '+self.name + min_cap = prices[self.min_cap].copy() + min_cap = min_cap[I] # only in asset time window else: # given in form of dict (start/end/values) min_cap = timegrid.restricted.values_to_grid(self.min_cap) # check integrity diff --git a/eaopack/io.py b/eaopack/io.py index 4baee4b..6b47a86 100644 --- a/eaopack/io.py +++ b/eaopack/io.py @@ -95,7 +95,7 @@ def extract_output(portf: Portfolio, op: OptimProblem, res:Results, prices: dict # add given prices to duals in output (relevant reference) if not prices is None: for myc in prices: - duals['input price: '+myc] = prices[myc] + duals['input data: '+myc] = prices[myc] # In case the result comes from an SLP, we cannot sum up the dispatch across samples. # rather it should be the average. Therefore divide summed dispatch by number of samples
bring dev up to date
2022-06-26T13:21:18
0.0
[]
[]
EnergyAssetOptimization/EAO
EnergyAssetOptimization__EAO-27
7f5e544b5650807bd1835f2dac48726fb00a8fb8
diff --git a/.gitignore b/.gitignore index cf33ec6..a06e632 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ tests/htmlcov test_XXX.xlsx xxx.csv .~lock.test_XXX.xlsx# +*_stats.txt diff --git a/eaopack/assets.py b/eaopack/assets.py index 23ce3ea..7610044 100644 --- a/eaopack/assets.py +++ b/eaopack/assets.py @@ -7,29 +7,28 @@ from scipy.sparse.lil import lil_matrix from eaopack.basic_classes import Timegrid, Unit, Node -from eaopack.optimization import OptimProblem -from eaopack.optimization import Results +from eaopack.optimization import OptimProblem +from eaopack.optimization import Results class Asset: """ Asset parent class. Defines all basic methods and properties of an asset In particular 'setup_optim_problem' makes a particular asset such as storage or contract """ - - def __init__(self, - name: str = 'default_name', + + def __init__(self, + name: str = 'default_name', nodes: Union[Node, List[Node]] = Node(name = 'default_node'), start: dt.datetime = None, end: dt.datetime = None, wacc: float = 0, freq: str = None, - profile: pd.Series = None - ): + profile: pd.Series = None): """ The base class to define an asset. Args: name (str): Name of the asset. Must be unique in a portfolio nodes (Union[str, List[str]]): Nodes, in which the asset has a dispatch. Defaults to "default node" start (dt.datetime) : start of asset being active. defaults to none (-> timegrid start relevant) - end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) + end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) timegrid (Timegrid): Grid for discretization wacc (float, optional): WACC to discount the cash flows as the optimization target. Defaults to 0. freq (str, optional): Frequency for optimization - in case different from portfolio (defaults to None, using portfolio's freq) @@ -43,7 +42,7 @@ def __init__(self, self.nodes = [nodes] else: self.nodes = nodes - self.wacc = wacc + self.wacc = wacc self.start = start self.end = end @@ -54,7 +53,6 @@ def __init__(self, self.profile = profile if profile is not None: assert isinstance(profile, pd.Series), 'Profile must be np.Series. Asset:'+str(name) - def set_timegrid(self, timegrid: Timegrid): """ Set the timegrid for the asset Args: @@ -88,7 +86,7 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only OptimProblem: Optimization problem that may be used by optimizer """ pass - + def dcf(self, optim_problem:OptimProblem, results:Results) -> np.array: """ Calculate discounted cash flow for the asset given the optimization results @@ -108,9 +106,9 @@ def dcf(self, optim_problem:OptimProblem, results:Results) -> np.array: my_mapping = optim_problem.mapping.loc[optim_problem.mapping['asset']==self.name].copy() # drop duplicate index - since mapping may contain several rows per varaible (indexes enumerate variables) my_mapping = pd.DataFrame(my_mapping[~my_mapping.index.duplicated(keep = 'first')]) - + for i, r in my_mapping.iterrows(): - dcf[r['time_step']] += -optim_problem.c[i] * results.x[i] + dcf[r['time_step']] += -optim_problem.c[i] * results.x[i] return dcf @@ -122,7 +120,7 @@ def node_names(self): return nn def __extend_mapping_to_minor_grid__(self, mapping:pd.DataFrame): - """ Helper function, extending an OP to a more granular grid + """ Helper function, extending an OP to a more granular grid by creating an extra row in the mapping for each time step of the minor grid Args: @@ -148,23 +146,24 @@ def __extend_mapping_to_minor_grid__(self, mapping:pd.DataFrame): mapping = mapping.append(rr) mapping['time_step'] = mapping['time_step'].astype('int64') return mapping + ########################## class Storage(Asset): """ Storage Class in Python""" - def __init__(self, + def __init__(self, name : str, nodes : Node = Node(name = 'default_node'), start : dt.datetime = None, end : dt.datetime = None, wacc : float = 0., - size : float = None, - cap_in : float = None, - cap_out : float = None, + size : float = None, + cap_in : float = None, + cap_out : float = None, start_level: float = 0., - end_level : float = 0., - cost_out: float = 0., - cost_in : float = 0., + end_level : float = 0., + cost_out: float = 0., + cost_in : float = 0., cost_store : float = 0., block_size : str = None, eff_in : float = 1., @@ -173,7 +172,9 @@ def __init__(self, max_store_duration : float = None, price: str=None, freq: str = None, - profile: pd.Series = None ): + profile: pd.Series = None, + periodicity: str = None, + periodicity_duration: str = None ): """ Specific storage asset. A storage has the basic capability to (1) take in a commodity within a limited flow rate (capacity) (2) store a maximum volume of a commodity (size) @@ -200,13 +201,16 @@ def __init__(self, cost_store (float, optional): Cost for keeping in storage ($/volume/main time unit). Defaults to 0. Note: Cost for stored inflow is correctly optimized, but constant contribution not part of output NPV block_size (str, optional): Mainly to speed optimization, optimize the storage in time blocks. Defaults None (no blocks). - Using pandas type frequency strings (e.g. 'd' to have a block each day) + Using pandas type frequency strings (e.g. 'd' to have a block each day) eff_in (float, optional): Efficiency taking in the commodity. Means e.g. at 90%: 1MWh in --> 0,9 MWh in storage. Defaults to 1 (=100%). inflow (float, optional): Constant rate of inflow volumes (flow in each time step. E.g. water inflow in hydro storage). Defaults to 0. no_simult_in_out (boolean, optional): Enforce no simultaneous dispatch in/out in case of costs or efficiency!=1. Makes problem MIP. Defaults to False - max_store_duration (float, optional): Maximal duration in main time units that charged commodity can be held. Makes problem MIP. Defaults to none + max_store_duration (float, optional): Maximal duration in main time units that charged commodity can be held. Makes problem a MIP. Defaults to none + + periodicity (str, pd freq style): Makes assets behave periodicly with given frequency. Periods are repeated up to freq intervals (defaults to None) + periodicity_duration (str, pd freq style): Intervals in which periods repeat (e.g. repeat days ofer whole weeks) (defaults to None) """ - super(Storage, self).__init__(name=name, nodes=nodes, start=start, end=end, wacc=wacc, freq = freq, profile=profile) + super(Storage, self).__init__(name=name, nodes=nodes, start=start, end=end, wacc=wacc, freq = freq, profile=profile) assert size is not None, 'Storage --'+self.name+'--: size must be given' self.size = size self.start_level = start_level @@ -227,14 +231,18 @@ def __init__(self, self.block_size = block_size # defines the block size (as pandas frequency) assert len(self.nodes)<=2, 'for storage only one or two nodes valid' self.no_simult_in_out = no_simult_in_out - self.max_store_duration = max_store_duration + self.max_store_duration = max_store_duration + #### periodicity + assert not ((periodicity_duration is not None) and (periodicity is None)), 'Cannot have periodicity duration not none and periodicity none' + self.periodicity = periodicity + self.periodicity_duration = periodicity_duration def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only:bool = False) -> OptimProblem: """ Set up optimization problem for asset Args: prices (dict): Dictionary of price arrays needed by assets in portfolio - timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, + timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, in which case it must have been set previously costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False @@ -244,7 +252,7 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # set timegrid if given as optional argument if not timegrid is None: self.set_timegrid(timegrid) - # check: timegrid set? + # check: timegrid set? assert hasattr(self, 'timegrid'), 'Set timegrid of asset before creating optim problem. Asset: '+ self.name dt = self.timegrid.restricted.dt @@ -269,14 +277,14 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only myprice.append(price[myI].mean()) price = np.asarray(myprice) else: # simply restrict prices to asset time window - price = price[self.timegrid.restricted.I] + price = price[self.timegrid.restricted.I] # separation into in/out needed? Only one or two dispatch variables per time step # new separation reason: separate nodes in and out sep_needed = (self.eff_in != 1) or (self.cost_in !=0) or (self.cost_out !=0) or (len(self.nodes)==2) # cost_store -- costs for keeping quantity in storage # effectively, for each time step t we have: cost_store * sum_{i<t}(disp_i) - # and after summing ofer time steps t we get cost_store * sum_t(disp_t * N_t) + # and after summing ofer time steps t we get cost_store * sum_t(disp_t * N_t) # (discount needs to be accounted for as well) # where N_t is the number of time steps after (t) # convert to costs per main time unit @@ -290,12 +298,12 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only l = np.hstack((-cp, np.zeros(n,float))) c = np.ones((2,n), float) c[0,:] = -c[0,:]*self.cost_in - c[1,:] = c[1,:]*self.cost_out + c[1,:] = c[1,:]*self.cost_out if self.price is not None: c -= np.asarray(price) - c = c * (np.tile(discount, (2,1))) + c = c * (np.tile(discount, (2,1))) if self.cost_store != 0: - c -= (np.vstack((cost_store*self.eff_in, cost_store))) + c -= (np.vstack((cost_store*self.eff_in, cost_store))) else: u = ct l = -cp @@ -306,16 +314,16 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only c -= cost_store c = c.flatten('C') # make all one columns # switch to return costs only - if costs_only: - return c + if costs_only: + return c # Storage restriction -- cumulative sums must fit into reservoir if self.block_size is None: A = -sp.tril(np.ones((n,n),float)) # Maximum: max volume not exceeded b = (self.size-self.start_level)*np.ones(n) - inflow - b[-1] = self.end_level - self.start_level - inflow[-1] + b[-1] = self.end_level - self.start_level - inflow[-1] # Minimum: empty - b_min = -self.start_level*np.ones(n,float) - inflow + b_min = -self.start_level*np.ones(n,float) - inflow b_min[-1] = self.end_level - self.start_level - inflow[-1] else: A = sp.lil_matrix((n,n)) @@ -336,7 +344,7 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only if any(my_bool): aa.append(np.argwhere(my_bool)[-1,-1]) else: - aa.append(0) + aa.append(0) if all(my_bool): break # stop early aa = np.unique(np.asarray(aa)) if aa[-1]!=n: @@ -353,11 +361,11 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only parts_b_min[-1] = self.end_level - self.start_level - inflow[-1] b_min[a:a+diff] = parts_b_min if sep_needed: - A = sp.hstack((A*self.eff_in, A )) # for in and out + A = sp.hstack((A*self.eff_in, A )) # for in and out # join restrictions for in, out, full, empty - b = np.hstack((b, b_min)) - A = sp.vstack((A, A)) - cType = 'U'*n + 'L'*n + b = np.hstack((b, b_min)) + A = sp.vstack((A, A)) + cType = 'U'*n + 'L'*n mapping = pd.DataFrame() if sep_needed: mapping['time_step'] = np.hstack((self.timegrid.restricted.I, self.timegrid.restricted.I)) @@ -435,9 +443,9 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # extend A for binary variables (not relevant in exist. restrictions) (n_exist,m) = A.shape # (1) reformulate fill level restrictions and extend A with bool ("is filled") variables - # replace (Ax <= b) by (Ax)i - bool_i*b <= 0 + # replace (Ax <= b) by (Ax)i - bool_i*b <= 0 # n restrictions for max fill level - A = sp.hstack((A, sp.vstack((sp.diags(-b[0:n],0),sp.lil_matrix((n_exist-n,n)) )) )) + A = sp.hstack((A, sp.vstack((sp.diags(-b[0:n],0),sp.lil_matrix((n_exist-n,n)) )) )) b[0:n] = 0 # (2) create extra restrictions for booleans ("1 --> fill level non zero") - one for each time step # --> all windows of size max_duration (md) plus one, sum of vars is <= md @@ -453,23 +461,30 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # if we're using a less granular asset timegrid, add dispatch for every minor grid point # Effectively we concat the mapping for each minor point (one row each) if hasattr(self.timegrid.restricted, 'I_minor_in_major'): - mapping = self.__extend_mapping_to_minor_grid__(mapping) - return OptimProblem(c=c,l=l, u=u, A=A, b=b, cType=cType, mapping = mapping) + mapping = self.__extend_mapping_to_minor_grid__(mapping) + + return OptimProblem(c=c,l=l, u=u, A=A, b=b, cType=cType, mapping = mapping, + periodic_period_length = self.periodicity, + periodic_duration = self.periodicity_duration, + timegrid = self.timegrid) + class SimpleContract(Asset): """ Contract Class """ def __init__(self, - name: str = 'default_name_simple_contract', + name: str = 'default_name_simple_contract', nodes: Node = Node(name = 'default_node'), start: dt.datetime = None, end: dt.datetime = None, wacc: float = 0, - price:str = None, + price:str = None, extra_costs:float = 0., min_cap: Union[float, Dict] = 0., max_cap: Union[float, Dict] = 0., freq: str = None, - profile: pd.Series = None): + profile: pd.Series = None, + periodicity: str = None, + periodicity_duration: str = None): """ Simple contract: given price and limited capacity in/out. No other constraints A simple contract is able to buy or sell (consume/produce) at given prices plus extra costs up to given capacity limits @@ -477,15 +492,15 @@ def __init__(self, name (str): Unique name of the asset (asset parameter) node (Node): Node, the constract is located in (asset parameter) start (dt.datetime) : start of asset being active. defaults to none (-> timegrid start relevant) - end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) + end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) timegrid (Timegrid): Timegrid for discretization (asset parameter) wacc (float): Weighted average cost of capital to discount cash flows in target (asset parameter) freq (str, optional): Frequency for optimization - in case different from portfolio (defaults to None, using portfolio's freq) The more granular frequency of portf & asset is used profile (pd.Series, optional): If freq(asset) > freq(portf) assuming this profile for granular dispatch (e.g. scaling hourly profile to week). - Defaults to None, only relevant if freq is not none + Defaults to None, only relevant if freq is not none - min_cap (float, dict) : Minimum flow/capacity for buying (negative) + min_cap (float, dict) : Minimum flow/capacity for buying (negative) max_cap (float, dict) : Maximum flow/capacity for selling (positive) float: constant value dict: dict['start'] = array @@ -493,8 +508,17 @@ def __init__(self, dict['value'] = array price (str): Name of price vector for buying / selling. Defaults to None extra_costs (float, optional): extra costs added to price vector (in or out). Defaults to 0. + + periodicity (str, pd freq style): Makes assets behave periodicly with given frequency. Periods are repeated up to freq intervals (defaults to None) + periodicity_duration (str, pd freq style): Intervals in which periods repeat (e.g. repeat days ofer whole weeks) (defaults to None) """ - super(SimpleContract, self).__init__(name=name, nodes=nodes, start=start, end=end, wacc=wacc, freq = freq, profile = profile) + super(SimpleContract, self).__init__(name=name, + nodes=nodes, + start=start, + end=end, + wacc=wacc, + freq = freq, + profile = profile) if isinstance(min_cap, (float, int)) and isinstance(max_cap, (float, int)): if min_cap > max_cap: raise ValueError('Contract with min_cap > max_cap leads to ill-posed optimization problem') @@ -503,6 +527,12 @@ def __init__(self, self.extra_costs = extra_costs self.price = price + #### periodicity + assert not ((periodicity_duration is not None) and (periodicity is None)), 'Cannot have periodicity duration not none and periodicity none' + self.periodicity = periodicity + self.periodicity_duration = periodicity_duration + + @abc.abstractmethod def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only:bool = False) -> OptimProblem: @@ -510,9 +540,9 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only Args: prices (dict): Dictionary of price arrays needed by assets in portfolio - timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, + timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, in which case it must have been set previously - costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False + costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False Returns: OptimProblem: Optimization problem to be used by optimizer @@ -520,14 +550,16 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # set timegrid if given as optional argument if not timegrid is None: self.set_timegrid(timegrid) - # check: timegrid set? - if not hasattr(self, 'timegrid'): + else: + timegrid = self.timegrid + # check: timegrid set? + if not hasattr(self, 'timegrid'): raise ValueError('Set timegrid of asset before creating optim problem. Asset: '+ self.name) if not self.price is None: assert (isinstance(self.price, str)), 'Error in asset '+self.name+' --> price must be given as string' assert (self.price in prices) price = prices[self.price].copy() - else: + else: price = np.zeros(timegrid.T) if not (len(price)== self.timegrid.T): # price vector must have right size for discretization @@ -546,19 +578,19 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only myprice.append(price[myI].mean()) price = np.asarray(myprice) else: # simply restrict prices to asset time window - price = price[I] + price = price[I] ##### important distinction: ## if extra costs are given, we need dispatch IN and OUT ## if it's zero, one variable is enough - # Make vector of single min/max capacities. + # Make vector of single min/max capacities. if isinstance(self.max_cap, (float, int, np.ndarray)): - max_cap = self.max_cap*np.ones(T) + max_cap = self.max_cap*np.ones(T) else: # given in form of dict (start/end/values) max_cap = timegrid.restricted.values_to_grid(self.max_cap) if isinstance(self.min_cap, (float, int, np.ndarray)): - min_cap = self.min_cap*np.ones(T) + min_cap = self.min_cap*np.ones(T) else: # given in form of dict (start/end/values) min_cap = timegrid.restricted.values_to_grid(self.min_cap) # check integrity @@ -577,7 +609,7 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only if (all(max_cap<=0.)): # dispatch always negative price = price - self.extra_costs if (all(min_cap>=0.)): # dispatch always negative - price = price + self.extra_costs + price = price + self.extra_costs c = price * discount_factors # set price and discount mapping['time_step'] = I mapping['var_name'] = 'disp' # name variables for use e.g. in RI @@ -594,15 +626,15 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only c = c * (np.tile(discount_factors, (2,1))) c = c.flatten('C') # mapping to be able to extract information later on - # infos: 'asset', 'node', 'type' + # infos: 'asset', 'node', 'type' mapping['time_step'] = np.hstack((I, I)) mapping['var_name'] = np.nan # name variables for use e.g. in RI mapping['var_name'].iloc[0:T] = 'disp_in' mapping['var_name'].iloc[T:] = 'disp_out' # shortcut if only costs required - if costs_only: - return c + if costs_only: + return c ## other information (at the very end, as this way we have the right length) mapping['asset'] = self.name mapping['node'] = self.nodes[0].name @@ -611,23 +643,36 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # Effectively we concat the mapping for each minor point (one row each) if hasattr(self.timegrid.restricted, 'I_minor_in_major'): mapping = self.__extend_mapping_to_minor_grid__(mapping) - return OptimProblem(c = c, l = l, u = u, mapping = mapping) + # distinction: if not the parent class, ensure periodicity here + # else take care in child class + if type(self).__name__ == 'SimpleContract': + return OptimProblem(c = c, l = l, u = u, + mapping = mapping, + periodic_period_length = self.periodicity, + periodic_duration = self.periodicity_duration, + timegrid = self.timegrid) + else: + return OptimProblem(c = c, l = l, u = u, + mapping = mapping) + class Transport(Asset): """ Contract Class """ def __init__(self, - name: str = 'default_name_transport', + name: str = 'default_name_transport', nodes: List[Node] = [Node(name = 'default_node_from'), Node(name = 'default_node_to')], start: dt.datetime = None, end: dt.datetime = None, wacc: float = 0, costs_const:float = 0., - costs_time_series:str = None, + costs_time_series:str = None, min_cap:float = 0., max_cap:float = 0., efficiency: float = 1., freq: str = None, - profile: pd.Series = None): + profile: pd.Series = None, + periodicity: str = None, + periodicity_duration: str = None): """ Transport: Link two nodes, transporting the commodity at given efficiency and costs Args: @@ -635,20 +680,23 @@ def __init__(self, nodes (list of nodes): 2 nodes, the transport links (asset parameter) timegrid (Timegrid): Timegrid for discretization (asset parameter) start (dt.datetime) : start of asset being active. defaults to none (-> timegrid start relevant) - end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) + end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) wacc (float): Weighted average cost of capital to discount cash flows in target (asset parameter) freq (str, optional): Frequency for optimization - in case different from portfolio (defaults to None, using portfolio's freq) The more granular frequency of portf & asset is used profile (pd.Series, optional): If freq(asset) > freq(portf) assuming this profile for granular dispatch (e.g. scaling hourly profile to week). - Defaults to None, only relevant if freq is not none + Defaults to None, only relevant if freq is not none min_cap (float) : Minimum flow/capacity for transporting (from node 1 to node 2) max_cap (float) : Minimum flow/capacity for transporting (from node 1 to node 2) efficiency (float): efficiency of transport. May be any positive float. Defaults to 1. costs_time_series (str): Name of cost vector for transporting. Defaults to None costs_const (float, optional): extra costs added to price vector (in or out). Defaults to 0. + + periodicity (str, pd freq style): Makes assets behave periodicly with given frequency. Periods are repeated up to freq intervals (defaults to None) + periodicity_duration (str, pd freq style): Intervals in which periods repeat (e.g. repeat days ofer whole weeks) (defaults to None) """ - super(Transport, self).__init__(name=name, nodes=nodes, start=start, end=end, wacc=wacc, freq = freq, profile = profile) + super(Transport, self).__init__(name=name, nodes=nodes, start=start, end=end, wacc=wacc, freq = freq, profile = profile) assert len(self.nodes) ==2, 'Transport asset mus link exactly 2 nodes. Asset name: '+name assert min_cap <= max_cap, 'Transport with min_cap >= max_cap leads to ill-posed optimization problem. Asset name: '+name self.min_cap = min_cap @@ -657,6 +705,10 @@ def __init__(self, self.costs_time_series = costs_time_series assert efficiency > 0., 'efficiency of transport must be chosen to be positive ('+name+')' self.efficiency = efficiency + #### periodicity + assert not ((periodicity_duration is not None) and (periodicity is None)), 'Cannot have periodicity duration not none and periodicity none' + self.periodicity = periodicity + self.periodicity_duration = periodicity_duration @abc.abstractmethod @@ -665,17 +717,17 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only Args: prices (dict): Dictionary of price arrays needed by assets in portfolio - timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, + timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, in which case it must have been set previously - costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False + costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False Returns: OptimProblem: Optimization problem to be used by optimizer """ # set timegrid if given as optional argument if not timegrid is None: self.set_timegrid(timegrid) - # check: timegrid set? - if not hasattr(self, 'timegrid'): + # check: timegrid set? + if not hasattr(self, 'timegrid'): raise ValueError('Set timegrid of asset before creating optim problem. Asset: '+ self.name) if self.costs_time_series is None: @@ -701,14 +753,14 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only myprice.append(costs_time_series[myI].mean()) costs_time_series = np.asarray(myprice) else: # simply restrict prices to asset time window - costs_time_series = costs_time_series[I] - # Make vector of single min/max capacities. + costs_time_series = costs_time_series[I] + # Make vector of single min/max capacities. if isinstance(self.max_cap, (float, int)): - max_cap = self.max_cap*np.ones(T) + max_cap = self.max_cap*np.ones(T) else: # given in form of dict (start/end/values) max_cap = timegrid.restricted.values_to_grid(self.max_cap) if isinstance(self.min_cap, (float, int)): - min_cap = self.min_cap*np.ones(T) + min_cap = self.min_cap*np.ones(T) else: # given in form of dict (start/end/values) min_cap = timegrid.restricted.values_to_grid(self.min_cap) # need to scale to discretization step since: flow * dT = volume in time step @@ -717,8 +769,8 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only mapping = pd.DataFrame() ## mapping of variables for use in portfolio - - if (all(max_cap<=0.)) or (all(min_cap>=0.)): + c = costs_time_series + self.costs_const + if ((all(max_cap<=0.)) or (all(min_cap>=0.))) or (all(c == 0)): # in this case one variable per time step and node needed # upper / lower bound for dispatch Node1 / Node2 ###### --> if implemented with two variables per time step @@ -729,14 +781,14 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # costs always act on abs(dispatch) if (all(max_cap<=0.)): # dispatch always negative - costs = - costs_time_series - self.costs_const - if (all(min_cap>=0.)): # dispatch always positive - costs = costs_time_series + self.costs_const - c = costs * discount_factors # set costs and discount + c = -c + # if (all(min_cap>=0.)): # dispatch always positive + # c = c + c = c * discount_factors # set costs and discount ###### --> if implemented with two variables per time step # c = np.hstack( (np.zeros(T),c) ) # linking two nodes, assigning costs only to receiving node - if costs_only: - return c + if costs_only: + return c ###### --> if implemented with two variables per time step # restriction: in and efficiency*out must add to zero # A = sp.hstack(( self.efficiency*sp.identity(T), sp.identity(T) )) @@ -763,9 +815,19 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # if we're using a less granular asset timegrid, add dispatch for every minor grid point # Effectively we concat the mapping for each minor point (one row each) if hasattr(self.timegrid.restricted, 'I_minor_in_major'): - mapping = self.__extend_mapping_to_minor_grid__(mapping) + mapping = self.__extend_mapping_to_minor_grid__(mapping) #### return OptimProblem(c = c, l = l, u = u, A = A, b = b, cType = cType, mapping = mapping) - return OptimProblem(c = c, l = l, u = u, mapping = mapping) + # distinction: if not the parent class, ensure periodicity here + # else take care in child class + if type(self).__name__ == 'Transport': + return OptimProblem(c = c, l = l, u = u, + mapping = mapping, + periodic_period_length = self.periodicity, + periodic_duration = self.periodicity_duration, + timegrid = self.timegrid) + else: + return OptimProblem(c = c, l = l, u = u, + mapping = mapping) ########## SimpleContract and Transport extended with minTake and maxTake restrictions @@ -773,7 +835,7 @@ def define_restr(my_take, my_type, my_n, map, timegrid, node = None): """ encapsulates the generation of restriction from given min/max take or similar """ my_take = timegrid.prep_date_dict(my_take) # starting empty, adding rows - my_A = sp.lil_matrix((0, my_n)) + my_A = sp.lil_matrix((0, my_n)) my_b = np.empty(shape=(0)) my_cType = '' @@ -810,19 +872,21 @@ def define_restr(my_take, my_type, my_n, map, timegrid, node = None): class Contract(SimpleContract): """ Contract Class, as an extension of the SimpleContract """ def __init__(self, - name: str = 'default_name_contract', + name: str = 'default_name_contract', nodes: Node = Node(name = 'default_node_contract'), start: dt.datetime = None, end: dt.datetime = None, wacc: float = 0, - price:str = None, + price:str = None, extra_costs:float = 0., min_cap: Union[float, Dict] = 0., - max_cap: Union[float, Dict] = 0., + max_cap: Union[float, Dict] = 0., min_take:Union[float, List[float], Dict] = None, max_take:Union[float, List[float], Dict] = None, freq: str = None, - profile: pd.Series = None ): + profile: pd.Series = None, + periodicity: str = None, + periodicity_duration: str = None): """ Contract: buy or sell (consume/produce) given price and limited capacity in/out Restrictions - time dependent capacity restrictions @@ -834,13 +898,13 @@ def __init__(self, name (str): Unique name of the asset (asset parameter) node (Node): Node, the constract is located in (asset parameter) start (dt.datetime) : start of asset being active. defaults to none (-> timegrid start relevant) - end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) + end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) timegrid (Timegrid): Timegrid for discretization (asset parameter) wacc (float): Weighted average cost of capital to discount cash flows in target (asset parameter) freq (str, optional): Frequency for optimization - in case different from portfolio (defaults to None, using portfolio's freq) The more granular frequency of portf & asset is used profile (pd.Series, optional): If freq(asset) > freq(portf) assuming this profile for granular dispatch (e.g. scaling hourly profile to week). - Defaults to None, only relevant if freq is not none + Defaults to None, only relevant if freq is not none min_cap (float) : Minimum flow/capacity for buying (negative) or selling (positive). Defaults to 0 max_cap (float) : Maximum flow/capacity for selling (positive). Defaults to 0 @@ -852,18 +916,24 @@ def __init__(self, dict['value'] = np.array price (str): Name of price vector for buying / selling extra_costs (float, optional): extra costs added to price vector (in or out). Defaults to 0. + + periodicity (str, pd freq style): Makes assets behave periodicly with given frequency. Periods are repeated up to freq intervals (defaults to None) + periodicity_duration (str, pd freq style): Intervals in which periods repeat (e.g. repeat days ofer whole weeks) (defaults to None) + """ - super(Contract, self).__init__(name=name, - nodes=nodes, - start=start, - end=end, + super(Contract, self).__init__(name=name, + nodes=nodes, + start=start, + end=end, wacc=wacc, freq = freq, profile = profile, - price = price, + price = price, extra_costs = extra_costs, min_cap = min_cap, - max_cap = max_cap) + max_cap = max_cap, + periodicity= periodicity, + periodicity_duration=periodicity_duration) if not min_take is None: assert 'values' in min_take, 'min_take must be of dict type with start, end & values (values missing)' assert 'start' in min_take, 'min_take must be of dict type with start, end & values (start missing)' @@ -879,7 +949,7 @@ def __init__(self, if isinstance(max_take['values'], (float, int)): max_take['values'] = [max_take['values']] max_take['start'] = [max_take['start']] - max_take['end'] = [max_take['end']] + max_take['end'] = [max_take['end']] self.min_take = min_take self.max_take = max_take @@ -889,9 +959,9 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only Args: prices (dict): Dictionary of price arrays needed by assets in portfolio - timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, + timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, in which case it must have been set previously - costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False + costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False Returns: OptimProblem: Optimization problem to be used by optimizer @@ -899,15 +969,15 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # set up SimpleContract optimProblem op = super().setup_optim_problem(prices= prices, timegrid=timegrid, costs_only = costs_only) - if costs_only: - return op + if costs_only: + return op # add restrictions min/max take min_take = self.min_take max_take = self.max_take n = len(op.l) # number of variables - A = sp.lil_matrix((0, n)) + A = sp.lil_matrix((0, n)) b = np.empty(shape=(0)) - cType = '' + cType = '' if not max_take is None: # assert right sizes assert ( (len(max_take['start'])== (len(max_take['end']))) and (len(max_take['start'])== (len(max_take['values']))) ) @@ -918,10 +988,10 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only if not min_take is None: # assert right sizes assert ( (len(min_take['start'])== (len(min_take['end']))) and (len(min_take['start'])== (len(min_take['values']))) ) - A1, b1, c1 = define_restr(min_take, 'L', n, op.mapping, timegrid) + A1, b1, c1 = define_restr(min_take, 'L', n, op.mapping, timegrid) A = sp.vstack((A, A1)) b = np.hstack((b, b1)) - cType = cType+c1 + cType = cType+c1 if len(cType)>0: if op.A is None: # no restrictions yet op.A = A @@ -931,8 +1001,11 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only op.A = sp.vstack((op.A, A)) op.b = np.hstack((op.b, b)) op.cType = op.cType+cType + if self.periodicity is not None: + op.__make_periodic__(freq_period = self.periodicity, freq_duration = self.periodicity_duration, timegrid = timegrid) return op + class MultiCommodityContract(Contract): """ Multi commodity contract class - implements a Contract that generates two or more commoditites at a time. The main idea is to implement a CHP generating unit that would generate power and heat at the same time. @@ -940,20 +1013,22 @@ class MultiCommodityContract(Contract): The simplest way of defining the asset is to think of the main commodity as the main variable. In this case define the first factor == 1 and add the other factors as "free side products" with the respective factor """ def __init__(self, - name: str = 'default_name_multi_commodity', + name: str = 'default_name_multi_commodity', nodes: Union[Node, List[Node]] = [Node(name = 'default_node_1'), Node(name = 'default_node_2')], start: dt.datetime = None, end: dt.datetime = None, wacc: float = 0, - price:str = None, + price:str = None, extra_costs:float = 0., min_cap: Union[float, Dict] = 0., - max_cap: Union[float, Dict] = 0., + max_cap: Union[float, Dict] = 0., min_take:Union[float, List[float], Dict] = None, - max_take:Union[float, List[float], Dict] = None, + max_take:Union[float, List[float], Dict] = None, factors_commodities: list = [1,1], freq: str = None, - profile: pd.Series = None ): + profile: pd.Series = None, + periodicity: str = None, + periodicity_duration: str = None): """ Contract: buy or sell (consume/produce) given price and limited capacity in/out Restrictions - time dependent capacity restrictions @@ -964,13 +1039,13 @@ def __init__(self, Args: name (str): Unique name of the asset (asset parameter) start (dt.datetime) : start of asset being active. defaults to none (-> timegrid start relevant) - end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) + end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) timegrid (Timegrid): Timegrid for discretization (asset parameter) wacc (float): Weighted average cost of capital to discount cash flows in target (asset parameter) freq (str, optional): Frequency for optimization - in case different from portfolio (defaults to None, using portfolio's freq) The more granular frequency of portf & asset is used profile (pd.Series, optional): If freq(asset) > freq(portf) assuming this profile for granular dispatch (e.g. scaling hourly profile to week). - Defaults to None, only relevant if freq is not none + Defaults to None, only relevant if freq is not none min_cap (float) : Minimum flow/capacity for buying (negative) or selling (positive). Defaults to 0 max_cap (float) : Maximum flow/capacity for selling (positive). Defaults to 0 @@ -983,39 +1058,49 @@ def __init__(self, price (str): Name of price vector for buying / selling extra_costs (float, optional): extra costs added to price vector (in or out). Defaults to 0. + periodicity (str, pd freq style): Makes assets behave periodicly with given frequency. Periods are repeated up to freq intervals (defaults to None) + periodicity_duration (str, pd freq style): Intervals in which periods repeat (e.g. repeat days ofer whole weeks) (defaults to None) + New in comparison to contract: nodes (Node): different nodes the contract delivers to (one node per commodity) - factors_commodities: list of floats - One factor for each commodity/node. + factors_commodities: list of floats - One factor for each commodity/node. There is only one dispatch variable, factor[i]*var is the dispatch per commodity """ - super(MultiCommodityContract, self).__init__(name=name, - nodes=nodes, - start=start, - end=end, + super(MultiCommodityContract, self).__init__(name=name, + nodes=nodes, + start=start, + end=end, wacc=wacc, freq = freq, - profile = profile, - price = price, + profile = profile, + price = price, extra_costs = extra_costs, min_cap = min_cap, max_cap = max_cap, min_take = min_take, - max_take = max_take) + max_take = max_take, + periodicity= periodicity, + periodicity_duration=periodicity_duration) if not factors_commodities is None: assert isinstance(factors_commodities, (list, np.array)), 'factors_commodities must be given as list' assert len(factors_commodities) == len(self.nodes), 'number of factors_commodities must equal number of nodes' self.factors_commodities = factors_commodities + # #### periodicity + # assert not ((periodicity_duration is not None) and (periodicity is None)), 'Cannot have periodicity duration not none and periodicity none' + # self.periodicity = periodicity + # self.periodicity_duration = periodicity_duration + @abc.abstractmethod def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only:bool = False) -> OptimProblem: """ Set up optimization problem for asset Args: prices (dict): Dictionary of price arrays needed by assets in portfolio - timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, + timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, in which case it must have been set previously - costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False + costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False Returns: OptimProblem: Optimization problem to be used by optimizer @@ -1026,10 +1111,11 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # the optimization problem remains basically the same # only the mapping needs to be amended ##### adjusting the mapping - # (1) the contract mapping is the starting point + # the contract mapping is the starting point + # create a copy of the dispatching variables part for each commodity new_map = pd.DataFrame() for i, mynode in enumerate(self.nodes): - initial_map = op.mapping.copy() + initial_map = op.mapping[op.mapping['type']=='d'].copy() if 'disp_factor' in initial_map.columns: initial_map['disp_factor'] *= self.factors_commodities[i] else: @@ -1037,37 +1123,43 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only initial_map['node'] = mynode.name new_map = pd.concat([new_map, initial_map.copy()]) op.mapping = new_map + ### periodicity already taken care of by parent Contract + # if self.periodicity is not None: + # op.__make_periodic__(freq_period = self.periodicity, freq_duration = self.periodicity_duration, timegrid = timegrid) + return op class ExtendedTransport(Transport): """ Extended Transport Class, as an extension of Transport """ def __init__(self, - name: str = 'default_name_ext_transport', + name: str = 'default_name_ext_transport', nodes: List[Node] = [Node(name = 'default_node_from'), Node(name = 'default_node_to')], start: dt.datetime = None, end: dt.datetime = None, wacc: float = 0, costs_const:float = 0., - costs_time_series:str = None, + costs_time_series:str = None, min_cap:float = 0., max_cap:float = 0., - efficiency: float = 1., + efficiency: float = 1., min_take:Union[float, List[float], Dict] = None, max_take:Union[float, List[float], Dict] = None, freq: str = None, - profile: pd.Series = None ): + profile: pd.Series = None, + periodicity:str=None, + periodicity_duration:str=None): """ Transport: name (str): Unique name of the asset (asset parameter) nodes (Node): 2 nodes, the transport links (asset parameter) timegrid (Timegrid): Timegrid for discretization (asset parameter) start (dt.datetime) : start of asset being active. defaults to none (-> timegrid start relevant) - end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) + end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) wacc (float): Weighted average cost of capital to discount cash flows in target (asset parameter) freq (str, optional): Frequency for optimization - in case different from portfolio (defaults to None, using portfolio's freq) The more granular frequency of portf & asset is used profile (pd.Series, optional): If freq(asset) > freq(portf) assuming this profile for granular dispatch (e.g. scaling hourly profile to week). - Defaults to None, only relevant if freq is not none + Defaults to None, only relevant if freq is not none min_cap (float) : Minimum flow/capacity for transporting (from node 1 to node 2) max_cap (float) : Minimum flow/capacity for transporting (from node 1 to node 2) @@ -1075,10 +1167,13 @@ def __init__(self, costs_time_series (str): Name of cost vector for transporting. Defaults to None costs_const (float, optional): extra costs added to price vector (in or out). Defaults to 0. + periodicity (str, pd freq style): Makes assets behave periodicly with given frequency. Periods are repeated up to freq intervals (defaults to None) + periodicity_duration (str, pd freq style): Intervals in which periods repeat (e.g. repeat days ofer whole weeks) (defaults to None) + Extension of transport with more complex restrictions: - + - time dependent capacity restrictions - - MinTake & MaxTake for a list of periods. With efficiency, min/maxTake refer to the quantity delivered FROM node 1 + - MinTake & MaxTake for a list of periods. With efficiency, min/maxTake refer to the quantity delivered FROM node 1 Examples - with min_cap = max_cap and a detailed time series @@ -1093,18 +1188,21 @@ def __init__(self, dict['end'] = np.array dict['value'] = np.array """ - super(ExtendedTransport, self).__init__(name=name, - nodes=nodes, - start=start, - end=end, + super(ExtendedTransport, self).__init__(name=name, + nodes=nodes, + start=start, + end=end, wacc=wacc, freq = freq, - profile = profile, + profile = profile, costs_const = costs_const, - costs_time_series = costs_time_series, + costs_time_series = costs_time_series, min_cap = min_cap, max_cap = max_cap, - efficiency = efficiency) + efficiency = efficiency, + periodicity= periodicity, + periodicity_duration=periodicity_duration + ) if not min_take is None: if isinstance(min_take['values'], (float, int)): min_take['values'] = [min_take['values']] @@ -1114,7 +1212,7 @@ def __init__(self, if isinstance(max_take['values'], (float, int)): max_take['values'] = [max_take['values']] max_take['start'] = [max_take['start']] - max_take['end'] = [max_take['end']] + max_take['end'] = [max_take['end']] self.min_take = min_take self.max_take = max_take @@ -1124,9 +1222,9 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only Args: prices (dict): Dictionary of price arrays needed by assets in portfolio - timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, + timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, in which case it must have been set previously - costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False + costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False Returns: OptimProblem: Optimization problem to be used by optimizer @@ -1134,19 +1232,19 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # set up SimpleContract optimProblem op = super().setup_optim_problem(prices= prices, timegrid=timegrid, costs_only=costs_only) - if costs_only: - return op + if costs_only: + return op # add restrictions min/max take min_take = self.min_take max_take = self.max_take n = len(op.l) # number of variables - A = sp.lil_matrix((0, n)) + A = sp.lil_matrix((0, n)) b = np.empty(shape=(0)) - cType = '' + cType = '' if not max_take is None: # assert right sizes assert ( (len(max_take['start'])== (len(max_take['end']))) and (len(max_take['start'])== (len(max_take['values']))) ) - # restricting only output node. + # restricting only output node. ## lower bound, since we have a different sign (transporting FROM node 0) my_take = max_take.copy() # need to alter my_take['values'] = -np.asarray(my_take['values']) @@ -1161,10 +1259,10 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only ## lower bound, since we have a different sign (transporting FROM node 0) my_take = min_take.copy() # need to alter my_take['values'] = -np.asarray(my_take['values']) - A1, b1, c1 = define_restr(my_take, 'U', n, op.mapping, timegrid, node = self.node_names[0]) + A1, b1, c1 = define_restr(my_take, 'U', n, op.mapping, timegrid, node = self.node_names[0]) A = sp.vstack((A, A1)) b = np.hstack((b, b1)) - cType = cType+c1 + cType = cType+c1 if len(cType)>0: if op.A is None: # no restrictions yet op.A = A @@ -1174,6 +1272,8 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only op.A = sp.vstack((op.A, A)) op.b = np.hstack((op.b, b)) op.cType = op.cType+cType + if self.periodicity is not None: + op.__make_periodic__(freq_period = self.periodicity, freq_duration = self.periodicity_duration, timegrid = timegrid) return op class ScaledAsset(Asset): @@ -1198,23 +1298,23 @@ def __init__(self, name (str): Name of the asset. Must be unique in a portfolio nodes (Union[str, List[str]]): Nodes, in which the asset has a dispatch start (dt.datetime) : start of asset being active. defaults to none (-> timegrid start relevant) - end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) + end (dt.datetime) : end of asset being active. defaults to none (-> timegrid start relevant) timegrid (Timegrid): Grid for discretization wacc (float, optional): WACC to discount the cash flows as the optimization target. Defaults to 0. base_asset (Asset): Any asset, that should be scaled min_scale (float, optional): Minimum scale. Defaults to 0. max_scale (float, optional): Maximum scale. Defaults to 1. - norm_scale (float, optional): Normalization (i.e. size of base_asset is divided by norm_scale). + norm_scale (float, optional): Normalization (i.e. size of base_asset is divided by norm_scale). Defaults to 1. - fix_costs (float, optional): Costs in currency per norm scale and per main_time_unit (in timegrid). + fix_costs (float, optional): Costs in currency per norm scale and per main_time_unit (in timegrid). Defaults to 0. """ - super(ScaledAsset, self).__init__(name=name, - nodes = base_asset.nodes, - start=start, - end=end, - wacc=wacc) + super(ScaledAsset, self).__init__(name=name, + nodes = base_asset.nodes, + start=start, + end=end, + wacc=wacc) self.base_asset = base_asset assert min_scale <= max_scale, 'Problem not well defined. min_scale must be <= max_scale' self.min_scale = min_scale @@ -1230,9 +1330,9 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only Args: prices (dict): Dictionary of price arrays needed by assets in portfolio - timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, + timegrid (Timegrid, optional): Discretization grid for asset. Defaults to None, in which case it must have been set previously - costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False + costs_only (bool): Only create costs vector (speed up e.g. for sampling prices). Defaults to False Returns: OptimProblem: Optimization problem to be used by optimizer @@ -1247,13 +1347,13 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only # scale variable: s # (1) scale base restrictions - # Ax < b ---> Ax - b*s/S < 0 + # Ax < b ---> Ax - b*s/S < 0 if op.A is None: op.A = sp.lil_matrix((0,0)) op.b = np.zeros(0) op.cType = '' else: - op.A = sp.hstack((op.A, np.reshape(-op.b.copy(), (len(op.b), 1))/self.norm_scale)) + op.A = sp.hstack((op.A, np.reshape(-op.b.copy(), (len(op.b), 1))/self.norm_scale)) op.b = 0. * op.b # (2) add scaling restriction. All DISPATCH variables scaled down ### difficulty here is the generic formulation, as there may be other internal variables @@ -1263,11 +1363,11 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only nD = len(Idisp) l = op.l.copy() # retain old value u = op.u.copy() # retain old value - # Bounds are obsolete in this case. However, in some solvers required and + # Bounds are obsolete in this case. However, in some solvers required and # in this implementation a bound for each variable is assumed ### attention - at scale zero can be zero. op.l[Idisp] = np.minimum(0.,op.l[Idisp]) * self.max_scale / self.norm_scale - op.u[Idisp] = np.maximum(0.,op.u[Idisp]) * self.max_scale / self.norm_scale + op.u[Idisp] = np.maximum(0.,op.u[Idisp]) * self.max_scale / self.norm_scale op.A = sp.vstack((op.A, sp.hstack((sp.eye(nD), np.reshape(-u[Idisp],(nD,1))/self.norm_scale)) )) op.b = np.hstack((op.b, np.zeros(nD))) @@ -1285,8 +1385,9 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only mymap = {'time_step': 0, ## assign fix costs to first time step 'node' : self.node_names[0], 'asset' : self.name, + 'var_name' : 'scale', 'type' : 'size'} op.mapping['asset'] = self.name # in case scaled asset has a different name than the base asset op.mapping = op.mapping.append(mymap, ignore_index = True) - + return op diff --git a/eaopack/optimization.py b/eaopack/optimization.py index feb5b5d..cd372b1 100644 --- a/eaopack/optimization.py +++ b/eaopack/optimization.py @@ -20,6 +20,7 @@ def __init__(self, value:float, x: np.array, duals: dict): self.duals = duals class OptimProblem: + def __init__(self, c: np.array, l:np.array, @@ -27,7 +28,11 @@ def __init__(self, A:np.array = None, b:np.array = None, cType:str = None , - mapping:pd.DataFrame = None): + mapping:pd.DataFrame = None, + timegrid:Timegrid = None, # needed if periodic + periodic_period_length:str = None, + periodic_duration:str = None + ): """ Formulated optimization problem. LP problem. Args: @@ -41,6 +46,11 @@ def __init__(self, sum of dispatch at node zero: N Optional. Defaults to None (no restrictions given) mapping (pd.DataFrame): Mapping of variables to 'asset', 'node', 'type' ('d' - dispatch and 'i' internal variable) and 'time_step' + + --- if periodic + timegrid (Timegrid) : timegrid underneath optim problem (defaults to None) + periodic_period_length (str) : pandas freq defining the period length (defaults to None) + periodic_duration (str) : pandas freq defining the duration of intervals in which periods are repeated (defaults to None - then duration is inf) """ self.c = c # cost vector self.l = l # lower bound @@ -55,6 +65,123 @@ def __init__(self, assert not np.isnan(u.sum()), 'nan value in optim problem. Check input data -- u' if not b is None: assert not np.isnan(b.sum()), 'nan value in optim problem. Check input data -- b' + # make periodic + if periodic_period_length is not None: + assert timegrid is not None, 'for periodic optim problem need timegrid' + self.__make_periodic__(freq_period = periodic_period_length , freq_duration = periodic_duration, timegrid = timegrid) + + def __make_periodic__(self, freq_period:str, freq_duration:str, timegrid:Timegrid): + """ Make the optimization problem periodic main purpose is to save resources when optimizing + granular problems over a long time -- e.g. a year with hourly resolution -- where the + finer resolution shows periodic behaviour -- e.g. typical load profiles over the day + + The routine is typically called during init of optim problem + + Args: + freq_period (str): [description] + freq_duration (str): [description] + """ + + # (1) create mapping of timegrid to periodicity intervals ################################# + # We create a numbering 0, 1, ... for each period + # and identify duration intervals. In case there's an overlap between periods and durations + # periods are leading. However - best choice are frequencies that don't create this problem + + # disp factor column needed to assign same dispatch to all related time steps + if 'disp_factor' not in self.mapping.columns: self.mapping['disp_factor'] = 1. + self.mapping['disp_factor'].fillna(1., inplace = True) # ensure there's a one where not assigned yet + tp = timegrid.timepoints + T = timegrid.T + try: periods = pd.date_range(tp[0]-pd.Timedelta(1, freq_period), tp[-1]+pd.Timedelta(1, freq_period), freq = freq_period, tz = timegrid.tz) + except: periods = pd.date_range(tp[0]-pd.Timedelta(freq_period), tp[-1]+pd.Timedelta(freq_period), freq = freq_period, tz = timegrid.tz) + if freq_duration is None: + durations = [tp[0], tp[-1]+(tp[-1]-tp[0])] # whole interval - generously extending end + else: + try: durations = pd.date_range(tp[0]-pd.Timedelta(1, freq_duration), tp[-1]+pd.Timedelta(1, freq_duration), freq = freq_duration, tz = timegrid.tz) + except: durations = pd.date_range(tp[0]-pd.Timedelta(freq_duration), tp[-1]+pd.Timedelta(freq_duration), freq = freq_duration, tz = timegrid.tz) + # gave a bit space in case date ranges do not have the same start - deleting now superfluous (early) start + if periods[1] <= tp[0]: periods = periods.drop(periods[0]) + if durations[1] <= tp[0]: durations = durations.drop(durations[0]) + # assertions - ensure that all periods are of same length + d = periods[1:]-periods[0:-1] + assert all(d==d[0]), 'Error. All periods must have same length. Not given for chosen frequency '+periods + ### create df that assigns periods and duration intervals to all tp's + df = pd.DataFrame(index = timegrid.I) + df['dur'] = np.nan + df['per'] = np.nan + df['sub_per'] = np.nan + i_dur = 0 + i_per = 0 + i_sub_per = 0 + df['dur'].iloc[0] = 0 + df['per'].iloc[0] = 0 + for i in range(0,T): + if tp[i] >= durations[i_dur]: + i_dur +=1 + df['dur'].iloc[i] = int(i_dur) + if tp[i] >= periods[i_per]: + i_per +=1 + df['per'].iloc[i] = int(i_per) + i_sub_per = 0 + df['sub_per'].iloc[i] = int(i_sub_per) + i_sub_per += 1 + + df.ffill(inplace = True) + df['per'] = df['per'].astype(int) + df['dur'] = df['dur'].astype(int) + df['sub_per'] = df['sub_per'].astype(int) + + self.mapping = pd.merge(self.mapping, df, left_on = 'time_step', right_index = True, how = 'left') + self.mapping['new_idx'] = self.mapping.index + idx = np.asarray(self.mapping.index).copy() # get mapping index to change it later on + # (2) loop through each variable-group and group together all ################################# + # elements that belong to the same period item + all_out = [] # collect all vars to remove + for myasset in self.mapping['asset'].unique(): + for mynode in self.mapping['node'].unique(): + for mytype in self.mapping['type'].unique(): + for myvar in list(self.mapping['var_name'].unique()): + I = (self.mapping['asset'] == myasset)&(self.mapping['node'] == mynode)&(self.mapping['var_name'] == myvar)&(self.mapping['type'] == mytype) + # loop through durations + for dur in self.mapping.loc[I].dur.unique(): + # loop through period steps + for sub_per in self.mapping.loc[I & (self.mapping['dur'] == dur)].sub_per.unique(): + II = I & (self.mapping['dur'] == dur) & (self.mapping['sub_per'] == sub_per) + if II.sum() <= 1: + pass ## Nothing to do. There is only one variable + else: + vars = self.mapping.index[II] # variables to be joined + leading = vars[0] # this one to remain + out = vars[1:] + all_out +=out.to_list() + # shrink optimization problem + #### u, l, c + # bounds should ideally be equal anyhow. here choose average + self.l[leading] = self.l[vars].mean() + self.u[leading] = self.u[vars].mean() + # leading variable takes joint role - thus summing up costs + self.c[leading] = self.c[vars].sum() + #### if given, A (b and cType refer to restrictions) + # need to add up A elements for vars to be deleted in A elements for leading var + if self.A is not None: + self.A = self.A.tolil() + self.A[:,leading] += self.A[:,out].sum(axis = 1) + # Adjust mapping. + assert all(self.mapping.loc[II, 'disp_factor'] == self.mapping.loc[II, 'disp_factor'].iloc[0]), 'periodicity cannot be imposed where disp factors are not identical' + idx[out] = leading + self.mapping.loc[out, 'new_idx'] = leading + + self.l = np.delete(self.l,all_out) + self.u = np.delete(self.u,all_out) + self.c = np.delete(self.c,all_out) + if self.A is not None: + my_idx = self.mapping.index.unique() # full index + my_idx = np.delete(my_idx, all_out) + self.A = self.A[:,my_idx] + self.mapping.drop(columns = ['dur','per','sub_per'], inplace = True) + self.mapping.set_index('new_idx', inplace = True) + + def optimize(self, target = 'value', samples = None, interface:str = 'cvxpy', @@ -176,8 +303,8 @@ def optimize(self, target = 'value', prob.solve() # no rel_tol parameter here else: prob.solve(solver = getattr(CVX, solver)) -# if isMIP: solver = 'GLPK_MI' -# else: solver = 'ECOS' + # if isMIP: solver = 'GLPK_MI' + # else: solver = 'ECOS' if prob.status == 'optimal': @@ -206,4 +333,6 @@ def optimize(self, target = 'value', else: raise NotImplementedError('Solver - '+str(solver)+ ' -not implemented') - return results \ No newline at end of file + return results + + diff --git a/eaopack/portfolio.py b/eaopack/portfolio.py index 114b59b..2b9dbe4 100644 --- a/eaopack/portfolio.py +++ b/eaopack/portfolio.py @@ -3,7 +3,6 @@ import datetime as dt import abc import scipy.sparse as sp - from typing import Union, List, Dict from eaopack.assets import Node, Asset, Timegrid from eaopack.optimization import OptimProblem @@ -97,20 +96,18 @@ def setup_optim_problem(self, prices: dict = None, n_nodes = len(self.nodes) # number of nodes T = self.timegrid.T # number of time steps # new index refers to portfolio + mapping.index.name = None mapping.reset_index(inplace = True) mapping.rename(columns={'index':'index_assets'}, inplace=True) - #### version WITH ability to handle same variable in two rows - ## ensure in index that it refers to variables - ## go through assets and their index, count through - mapping['new_ind'] = np.zeros(len(mapping))*np.nan - counter = 0 - for all_vars in zip(mapping['index_assets'], mapping['asset']): - I = (mapping['index_assets']==all_vars[0]) & (mapping['asset'] == all_vars[1]) - if any(np.isnan(mapping['new_ind'][I])): # not covered yet - mapping.loc[I, 'new_ind'] = counter - counter += 1 - mapping['new_ind'] = mapping['new_ind'].astype(int) - mapping.set_index('new_ind', inplace = True) + #### mapping may come with several rows per variable + ## ensure index refers to variables: go through assets and their index, make unique + mapping['keys'] = mapping['index_assets'].astype(str) +mapping['asset'].astype(str) + idx = pd.DataFrame() + idx['keys'] = mapping['keys'].unique() + idx.reset_index(inplace = True) + mapping = pd.merge(mapping, idx, left_on = 'keys', right_on = 'keys', how = 'left') + mapping.drop(columns = ['keys'], inplace = True) + mapping.set_index('index', inplace = True) ################################################## put together asset restrictions A = sp.lil_matrix((0, n_vars)) # sparse format to incrementally change b = np.zeros(0) @@ -132,25 +129,71 @@ def setup_optim_problem(self, prices: dict = None, if 'disp_factor' not in mapping.columns: mapping['disp_factor'] = 1. mapping['disp_factor'].fillna(1., inplace = True) - n_restr = len(b) # so many restr so far mapping['nodal_restr'] = None - # mapping['index_restr'] = None # index of the nodal restriction in the op (rows of A & b) # Note: Not needed and probably not well defined - n_nodal_restr = 0 # counter - for i_node, n in enumerate(self.nodes): - if not n in skip_nodes: - for t in self.timegrid.I: - # identify variables belonging to this node n and time step t - I = (mapping['type']=='d') & \ - (mapping['node']==n) & \ - (mapping['time_step'] == t).values - if any(I): # only then restriction needed - myA = sp.lil_matrix((1, n_vars)) # one row only - #### myA[0, I] = 1 # all filtered variables contribute - myA[0, mapping.index[I]] = mapping.loc[I, 'disp_factor'].values ## extended with disp_factor logic - mapping.loc[I, 'nodal_restr'] = n_nodal_restr - # mapping.loc[I, 'index_restr'] = n_nodal_restr+n_restr # Note: Not needed and probably not well defined - n_nodal_restr +=1 - A = sp.vstack((A, myA)) + + def create_nodal_restr(nodes, map_nodes, map_types, map_idx, map_dispf, map_times, timegrid_I, skip_nodes, n_vars): + """ Specific function creating nodal restrictions """ + map_nodal_restr = np.zeros(map_idx.shape[0]) + n_nodal_restr = 0 + cols = np.zeros(0) + rows = np.zeros(0) + vals = np.zeros(0) + for n in nodes: + if (skip_nodes is None) or (not n in skip_nodes): + Inode = (map_types=='d') & (map_nodes==n) + for t in timegrid_I: + # identify variables belonging to this node n and time step t + I = (map_times[Inode] == t) + if I.sum()>0: # only then restriction needed + # myA = sp.lil_matrix((1, n_vars)) # one row only + # myA[0, map_idx[Inode][I]] = map_dispf[Inode][I] + newcols = map_idx[Inode][I] + cols = np.append(cols,newcols) + rows = np.append(rows, n_nodal_restr*np.ones(len(newcols))) + vals = np.append(vals, map_dispf[Inode][I]) + Itemp = Inode.copy() + Itemp[Itemp] = I + map_nodal_restr[Itemp] = n_nodal_restr + n_nodal_restr +=1 + # A = sp.vstack((A, myA)) + return cols, rows, vals, map_nodal_restr, n_nodal_restr + + # # easily readable version - loop + # perf = time.perf_counter() + # n_nodal_restr = 0 + # for n in self.nodes: + # if not n in skip_nodes: + # for t in self.timegrid.I: + # # identify variables belonging to this node n and time step t + # I = (mapping['type']=='d') & \ + # (mapping['node']==n) & \ + # (mapping['time_step'] == t).values + # if any(I): # only then restriction needed + # myA = sp.lil_matrix((1, n_vars)) # one row only + # myA[0, mapping.index[I]] = mapping.loc[I, 'disp_factor'].values ## extended with disp_factor logic + # mapping.loc[I, 'nodal_restr'] = n_nodal_restr + # n_nodal_restr +=1 + # A = sp.vstack((A, myA)) + # print('loop 1 duration '+'{:0.1f}'.format(time.perf_counter()-perf)+'s') + ### start cryptic but much faster version, all in numpy + map_nodes = mapping['node'].values + map_types = mapping['type'].values + map_idx = mapping.index.values + map_dispf = mapping['disp_factor'].values + map_times = mapping['time_step'].values + if len(skip_nodes) == 0: + my_skip_nodes = None + else: + my_skip_nodes = skip_nodes + cols, rows, vals, map_nodal_restr, n_nodal_restr = create_nodal_restr(list(self.nodes.keys()), + map_nodes, + map_types, map_idx, map_dispf, + map_times, self.timegrid.I,my_skip_nodes, + n_vars) + A = sp.vstack((A, sp.csr_matrix((vals, (rows.astype(np.int64), cols.astype(np.int64))), shape = (n_nodal_restr, n_vars)))) + mapping['nodal_restr'] = map_nodal_restr.astype(np.int64) + ### end cryptic version + b = np.hstack((b,np.zeros(n_nodal_restr))) # must add to zero cType = cType + ('N')*n_nodal_restr @@ -241,6 +284,9 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only op.mapping.rename(columns={'index_assets':'index_internal_assets_'+self.name}, inplace = True) # store original asset name op.mapping['internal_asset'] = op.mapping['asset'] + # record asset in variable name + if 'var_name' in op.mapping.columns: + op.mapping['var_name'] = op.mapping['var_name']+'__'+op.mapping['asset'] # assign all variables to the struct asset op.mapping['asset'] = self.name # connect asset nodes to the outside and mark internal variables diff --git a/setup.cfg b/setup.cfg index fd912d9..7f7d421 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = eaopack -version = 1.1.8 +version = 1.1.9 author = Tobias Pfingsten, Daniel Oeltz description = A Framework for Optimizing Decentralized Portfolios and Green Supply long_description = file: README.md
minor fix in import statement in notebook
2022-06-26T13:04:13
0.0
[]
[]
EnergyAssetOptimization/EAO
EnergyAssetOptimization__EAO-16
aab1c97ff4468c0674920bffcfb13614638eebf7
diff --git a/eaopack/assets.py b/eaopack/assets.py index f0b6a39..89d6813 100644 --- a/eaopack/assets.py +++ b/eaopack/assets.py @@ -5,6 +5,7 @@ import numpy as np import pandas as pd import scipy.sparse as sp +from scipy.sparse.lil import lil_matrix from eaopack.basic_classes import Timegrid, Unit, Node from eaopack.optimization import OptimProblem @@ -115,6 +116,7 @@ def __init__(self, eff_in : float = 1., inflow : float = 0., no_simult_in_out: bool = False, + max_store_duration : float = None, price: str=None): """ Specific storage asset. A storage has the basic capability to (1) take in a commodity within a limited flow rate (capacity) @@ -141,6 +143,7 @@ def __init__(self, eff_in (float, optional): Efficiency taking in the commodity. Means e.g. at 90%: 1MWh in --> 0,9 MWh in storage. Defaults to 1 (=100%). inflow (float, optional): Constant rate of inflow volumes (flow in each time step. E.g. water inflow in hydro storage). Defaults to 0. no_simult_in_out (boolean, optional): Enforce no simultaneous dispatch in/out in case of costs or efficiency!=1. Makes problem MIP. Defaults to False + max_store_duration (float, optional): Maximal duration in main time units that charged commodity can be held. Makes problem MIP. Defaults to none """ super(Storage, self).__init__(name=name, nodes=nodes, start=start, end=end, wacc=wacc) @@ -163,7 +166,8 @@ def __init__(self, if block_size is not None: self.block_size = block_size # defines the block size (as pandas frequency) assert len(self.nodes)<=2, 'for storage only one or two nodes valid' - self.no_simult_in_out = no_simult_in_out + self.no_simult_in_out = no_simult_in_out + self.max_store_duration = max_store_duration def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only:bool = False) -> OptimProblem: """ Set up optimization problem for asset @@ -329,7 +333,41 @@ def setup_optim_problem(self, prices: dict, timegrid:Timegrid = None, costs_only b = np.hstack((b, np.zeros(n))) cType += 'U'*n - + ### in case of max_store_duration - add binary variables and restrictions + if not self.max_store_duration is None: # without sep_needed no need for forcing + if 'bool' not in mapping: + mapping['bool'] = False + # n new binary variables ... indicating that fill level is not equal to zero + map_bool = pd.DataFrame() + map_bool['time_step'] = self.timegrid.restricted.I + map_bool['node'] = np.nan + map_bool['asset'] = self.name + map_bool['type'] = 'i' # internal + map_bool['bool'] = True + mapping = pd.concat([mapping, map_bool]) + mapping.reset_index(inplace=True, drop = True) # need to reset index (which enumerates variables) + # extend costs + c = np.hstack((c, np.zeros(n))) + l = np.hstack((l, np.zeros(n))) + u = np.hstack((u, np.ones(n))) + # extend A for binary variables (not relevant in exist. restrictions) + (n_exist,m) = A.shape + # (1) reformulate fill level restrictions and extend A with bool ("is filled") variables + # replace (Ax <= b) by (Ax)i - bool_i*b <= 0 + # n restrictions for max fill level + A = sp.hstack((A, sp.vstack((sp.diags(-b[0:n],0),sp.lil_matrix((n_exist-n,n)) )) )) + b[0:n] = 0 + # (2) create extra restrictions for booleans ("1 --> fill level non zero") - one for each time step + # --> all windows of size max_duration (md) plus one, sum of vars is <= md + for myi in range(0,n): + myI = (dt[myi:].cumsum()<=self.max_store_duration) # those fall into time window + if len(np.where(~myI)[0])!=0: # full interval left + myI[np.where(~myI)[0][0]] = True + myA = sp.lil_matrix((1,m + n)) + myA[0,np.where(myI)[0]+m+myi] = 1 + A = sp.vstack((A, myA)) + b = np.hstack((b,myA.sum()-1)) + cType += 'U' # at most md elements may be one == fill level not md+1 times non-zero) return OptimProblem(c=c,l=l, u=u, A=A, b=b, cType=cType, mapping = mapping) diff --git a/setup.cfg b/setup.cfg index 4d5ba73..686ec68 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = eaopack -version = 1.1.3 +version = 1.1.4 author = Tobias Pfingsten, Daniel Oeltz description = A Framework for Optimizing Decentralized Portfolios and Green Supply long_description = file: README.md
bring over bugfix to feature branch
2021-06-22T19:18:37
0.0
[]
[]
matze/pkgconfig
matze__pkgconfig-72
2142a419847d158d8c619b37d1bff40729a620f0
diff --git a/pkgconfig/__init__.py b/src/pkgconfig/__init__.py similarity index 100% rename from pkgconfig/__init__.py rename to src/pkgconfig/__init__.py diff --git a/pkgconfig/pkgconfig.py b/src/pkgconfig/pkgconfig.py similarity index 100% rename from pkgconfig/pkgconfig.py rename to src/pkgconfig/pkgconfig.py
use src/ project layout? for quite some reasons it is preferable not to have the main package directory in `./pkgconfig`, but rather in `src/pkgconfig`, e.g. making sure the actually installed code is tested and not accidentally the package that happens to be in `.`.
i could contribute this after next release, if wanted. @matze Any comment? Yeah, please go ahead with a PR, I have no objections! OK, will do after #70 is merged, so we have working CI first.
2024-08-11T23:11:02
0.0
[]
[]
Infomaniak/certbot-dns-infomaniak
Infomaniak__certbot-dns-infomaniak-10
4abf3dd5fef9427e2c084bf896f30a42be9bf184
diff --git a/certbot_dns_infomaniak/dns_infomaniak.py b/certbot_dns_infomaniak/dns_infomaniak.py index 5dacc82..5f6446f 100644 --- a/certbot_dns_infomaniak/dns_infomaniak.py +++ b/certbot_dns_infomaniak/dns_infomaniak.py @@ -8,7 +8,10 @@ from certbot import errors from certbot import interfaces from certbot.plugins import dns_common -import certbot.compat.os as os +try: + import certbot.compat.os as os +except ImportError: + import os logger = logging.getLogger(__name__) diff --git a/requirements.txt b/requirements.txt index 8abcfee..008fffa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -certbot>=0.34.0 +certbot>=0.31.0 setuptools requests mock diff --git a/setup.py b/setup.py index 633c2ff..0780d2e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ version = "0.0.0" install_requires = [ - "certbot>=0.34.0", + "certbot>=0.31.0", "setuptools", "requests", "mock",
Conflict with Debian distro package? After running in the same problems with installation as AisteruFire I managed to get certbot running on my Raspberry Pi with Raspian OS buster by - removing my distro package (which was cerbot 0.31) - installing python3 - installing certbot with 'pip install certbot' (certbot 1.11) Updating the current certificate for the server worked then and I also got a wildcard certificate using certbot-dns-infomaniak hook. But: Now the certbot service is gone which handled automatic renewal before. Also, on the Certbot web page (https://certbot.eff.org/docs/install.html#system-requirements) is a warning *to not install via pip install* and to use the distro packages instead. But using the distro package failed with the certbot-dns-infomaniak hook as this requires certbot >= 0.35. :( Any idea how to solve this?
Hello, I will try myself on a raspbian buster Ok the problem is with the old version of certbot shipped with buster. Installing certbot from the distro and a specific plugin via pip should not be an issue, but because of the required `>= 0.34` it installs certbot from pip over the distro one. I just made a fix that should make it work.
2021-01-25T08:24:20
0.0
[]
[]
netbox-community/netbox-bgp
netbox-community__netbox-bgp-85
7fec5dd9aea38c371e06a87a55f269b197510e05
diff --git a/netbox_bgp/__init__.py b/netbox_bgp/__init__.py index 47981bc..f6232f3 100644 --- a/netbox_bgp/__init__.py +++ b/netbox_bgp/__init__.py @@ -11,8 +11,8 @@ class BGPConfig(PluginConfig): author_email = '[email protected]' base_url = 'bgp' required_settings = [] - min_version = '3.1.0' - max_version = '3.1.99' + # min_version = '3.2.0' + # max_version = '3.2.99' default_settings = { 'device_ext_page': 'right', 'asdot': False diff --git a/netbox_bgp/api/serializers.py b/netbox_bgp/api/serializers.py index c8415a4..df20a98 100644 --- a/netbox_bgp/api/serializers.py +++ b/netbox_bgp/api/serializers.py @@ -98,7 +98,7 @@ class Meta: class NestedRoutingPolicySerializer(WritableNestedSerializer): - url = HyperlinkedIdentityField(view_name='plugins:netbox_bgp:routing_policy') + url = HyperlinkedIdentityField(view_name='plugins:netbox_bgp:routingpolicy') class Meta: model = RoutingPolicy @@ -127,7 +127,7 @@ class Meta: class NestedBGPPeerGroupSerializer(WritableNestedSerializer): - url = HyperlinkedIdentityField(view_name='plugins:netbox_bgp:peergroup') + url = HyperlinkedIdentityField(view_name='plugins:netbox_bgp:bgppeergroup') class Meta: model = BGPPeerGroup diff --git a/netbox_bgp/forms.py b/netbox_bgp/forms.py index f6edf91..e5dc4b3 100644 --- a/netbox_bgp/forms.py +++ b/netbox_bgp/forms.py @@ -15,9 +15,7 @@ DynamicModelMultipleChoiceField, StaticSelect, APISelect, APISelectMultiple, StaticSelectMultiple, TagFilterField ) -from extras.forms import ( - CustomFieldModelForm, CustomFieldBulkEditForm, CustomFieldModelFilterForm -) +from netbox.forms import NetBoxModelForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm from .models import ( ASN, ASNStatusChoices, Community, BGPSession, @@ -68,7 +66,7 @@ def render(self, name, value, attrs=None, renderer=None): return super().render(name, value, attrs, renderer) -class ASNFilterForm(CustomFieldModelFilterForm): +class ASNFilterForm(NetBoxModelFilterSetForm): model = ASN q = forms.CharField( required=False, @@ -91,7 +89,7 @@ class ASNFilterForm(CustomFieldModelFilterForm): tag = TagFilterField(model) -class ASNForm(CustomFieldModelForm): +class ASNForm(NetBoxModelForm): number = ASNField( widget=ASdotInput ) @@ -126,7 +124,7 @@ class Meta: ] -class ASNBulkEditForm(CustomFieldBulkEditForm): +class ASNBulkEditForm(NetBoxModelBulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=ASN.objects.all(), widget=forms.MultipleHiddenInput @@ -145,10 +143,13 @@ class ASNBulkEditForm(CustomFieldBulkEditForm): widget=StaticSelect() ) - class Meta: - nullable_fields = [ - 'tenant', 'description', - ] + model = ASN + fieldsets = ( + (None, ('tenant', 'description', 'status')), + ) + nullable_fields = ( + 'tenant', 'description', + ) class CommunityForm(BootstrapMixin, forms.ModelForm): @@ -219,7 +220,7 @@ class Meta: ] -class BGPSessionForm(CustomFieldModelForm): +class BGPSessionForm(NetBoxModelForm): name = forms.CharField( max_length=64, required=True @@ -325,7 +326,7 @@ def clean_remote_address(self): return self.cleaned_data['remote_address'] -class BGPSessionFilterForm(CustomFieldModelFilterForm): +class BGPSessionFilterForm(NetBoxModelFilterSetForm): model = BGPSession q = forms.CharField( required=False, @@ -394,7 +395,7 @@ class BGPSessionFilterForm(CustomFieldModelFilterForm): tag = TagFilterField(model) -class RoutingPolicyFilterForm(CustomFieldModelFilterForm): +class RoutingPolicyFilterForm(NetBoxModelFilterSetForm): model = RoutingPolicy q = forms.CharField( required=False, @@ -404,7 +405,7 @@ class RoutingPolicyFilterForm(CustomFieldModelFilterForm): tag = TagFilterField(model) -class RoutingPolicyForm(CustomFieldModelForm): +class RoutingPolicyForm(NetBoxModelForm): tags = DynamicModelMultipleChoiceField( queryset=Tag.objects.all(), required=False @@ -415,7 +416,7 @@ class Meta: fields = ['name', 'description'] -class BGPPeerGroupFilterForm(CustomFieldModelFilterForm): +class BGPPeerGroupFilterForm(NetBoxModelFilterSetForm): model = BGPPeerGroup q = forms.CharField( required=False, @@ -425,7 +426,7 @@ class BGPPeerGroupFilterForm(CustomFieldModelFilterForm): tag = TagFilterField(model) -class BGPPeerGroupForm(CustomFieldModelForm): +class BGPPeerGroupForm(NetBoxModelForm): import_policies = DynamicModelMultipleChoiceField( queryset=RoutingPolicy.objects.all(), required=False, diff --git a/netbox_bgp/migrations/0021_netbox32_support.py b/netbox_bgp/migrations/0021_netbox32_support.py new file mode 100644 index 0000000..b89454a --- /dev/null +++ b/netbox_bgp/migrations/0021_netbox32_support.py @@ -0,0 +1,95 @@ +# Generated by Django 4.0.2 on 2022-02-24 20:04 + +import django.core.serializers.json +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0153_created_datetimefield'), + ('netbox_bgp', '0020_netbox_bgp'), + ] + + operations = [ + migrations.AlterModelOptions( + name='asn', + options={'verbose_name': 'AS Number', 'verbose_name_plural': 'AS Numbers'}, + ), + migrations.AddField( + model_name='community', + name='custom_field_data', + field=models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder), + ), + migrations.AlterField( + model_name='asn', + name='created', + field=models.DateTimeField(auto_now_add=True, null=True), + ), + migrations.AlterField( + model_name='asn', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='asn', + name='site', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='%(class)s_related', to='dcim.site'), + ), + migrations.AlterField( + model_name='asngroup', + name='created', + field=models.DateTimeField(auto_now_add=True, null=True), + ), + migrations.AlterField( + model_name='asngroup', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='bgppeergroup', + name='created', + field=models.DateTimeField(auto_now_add=True, null=True), + ), + migrations.AlterField( + model_name='bgppeergroup', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='bgpsession', + name='created', + field=models.DateTimeField(auto_now_add=True, null=True), + ), + migrations.AlterField( + model_name='bgpsession', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='community', + name='created', + field=models.DateTimeField(auto_now_add=True, null=True), + ), + migrations.AlterField( + model_name='community', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='community', + name='site', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='%(class)s_related', to='dcim.site'), + ), + migrations.AlterField( + model_name='routingpolicy', + name='created', + field=models.DateTimeField(auto_now_add=True, null=True), + ), + migrations.AlterField( + model_name='routingpolicy', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False), + ), + ] diff --git a/netbox_bgp/models.py b/netbox_bgp/models.py index da7d528..af8429c 100644 --- a/netbox_bgp/models.py +++ b/netbox_bgp/models.py @@ -6,13 +6,8 @@ from taggit.managers import TaggableManager from utilities.choices import ChoiceSet -from utilities.querysets import RestrictedQuerySet -from netbox.models import ChangeLoggedModel - -from netbox.models import CustomFieldsMixin as CustomFieldModel - -from extras.models import TaggedItem -from extras.utils import extras_features +from netbox.models import NetBoxModel +from netbox.models.features import ChangeLoggingMixin class ASNStatusChoices(ChoiceSet): @@ -22,17 +17,11 @@ class ASNStatusChoices(ChoiceSet): STATUS_DEPRECATED = 'deprecated' CHOICES = ( - (STATUS_ACTIVE, 'Active'), - (STATUS_RESERVED, 'Reserved'), - (STATUS_DEPRECATED, 'Deprecated'), + (STATUS_ACTIVE, 'Active', 'blue'), + (STATUS_RESERVED, 'Reserved', 'cyan'), + (STATUS_DEPRECATED, 'Deprecated', 'red'), ) - CSS_CLASSES = { - STATUS_ACTIVE: 'primary', - STATUS_RESERVED: 'info', - STATUS_DEPRECATED: 'danger', - } - class SessionStatusChoices(ChoiceSet): @@ -42,21 +31,14 @@ class SessionStatusChoices(ChoiceSet): STATUS_FAILED = 'failed' CHOICES = ( - (STATUS_OFFLINE, 'Offline'), - (STATUS_ACTIVE, 'Active'), - (STATUS_PLANNED, 'Planned'), - (STATUS_FAILED, 'Failed'), + (STATUS_OFFLINE, 'Offline', 'orange'), + (STATUS_ACTIVE, 'Active', 'green'), + (STATUS_PLANNED, 'Planned', 'cyan'), + (STATUS_FAILED, 'Failed', 'red'), ) - CSS_CLASSES = { - STATUS_OFFLINE: 'warning', - STATUS_ACTIVE: 'success', - STATUS_PLANNED: 'info', - STATUS_FAILED: 'danger', - } - -class ASNGroup(ChangeLoggedModel): +class ASNGroup(ChangeLoggingMixin, models.Model): """ """ name = models.CharField( @@ -77,8 +59,7 @@ def __str__(self): return self.name -@extras_features('custom_fields', 'export_templates', 'webhooks') -class RoutingPolicy(ChangeLoggedModel, CustomFieldModel): +class RoutingPolicy(NetBoxModel): """ """ name = models.CharField( @@ -89,10 +70,6 @@ class RoutingPolicy(ChangeLoggedModel, CustomFieldModel): blank=True ) - tags = TaggableManager(through=TaggedItem) - - objects = RestrictedQuerySet.as_manager() - class Meta: verbose_name_plural = 'Routing Policies' unique_together = ['name', 'description'] @@ -101,11 +78,10 @@ def __str__(self): return self.name def get_absolute_url(self): - return reverse('plugins:netbox_bgp:routing_policy', args=[self.pk]) + return reverse('plugins:netbox_bgp:routingpolicy', args=[self.pk]) -@extras_features('custom_fields', 'export_templates', 'webhooks') -class BGPPeerGroup(ChangeLoggedModel, CustomFieldModel): +class BGPPeerGroup(NetBoxModel): """ """ name = models.CharField( @@ -126,10 +102,6 @@ class BGPPeerGroup(ChangeLoggedModel, CustomFieldModel): related_name='group_export_policies' ) - tags = TaggableManager(through=TaggedItem) - - objects = RestrictedQuerySet.as_manager() - class Meta: verbose_name_plural = 'Peer Groups' unique_together = ['name', 'description'] @@ -138,10 +110,10 @@ def __str__(self): return self.name def get_absolute_url(self): - return reverse('plugins:netbox_bgp:peergroup', args=[self.pk]) + return reverse('plugins:netbox_bgp:bgppeergroup', args=[self.pk]) -class BGPBase(ChangeLoggedModel): +class BGPBase(NetBoxModel): """ """ site = models.ForeignKey( @@ -172,16 +144,12 @@ class BGPBase(ChangeLoggedModel): max_length=200, blank=True ) - tags = TaggableManager(through=TaggedItem) - - objects = RestrictedQuerySet.as_manager() class Meta: abstract = True -@extras_features('custom_fields', 'export_templates', 'webhooks') -class ASN(BGPBase, CustomFieldModel): +class ASN(BGPBase): number = models.PositiveBigIntegerField( validators=[MinValueValidator(1), MaxValueValidator(4294967295)] @@ -194,11 +162,12 @@ class ASN(BGPBase, CustomFieldModel): null=True ) - tags = TaggableManager(through=TaggedItem, related_name='asn_tags') + tags = TaggableManager(through='extras.TaggedItem', related_name='asn_tags') clone_fields = ['description', 'status', 'tenant'] class Meta: + verbose_name = 'AS Number' verbose_name_plural = 'AS Numbers' constraints = [ models.UniqueConstraint( @@ -213,8 +182,8 @@ class Meta: ] # unique_together = ['number', 'site', 'tenant'] - def get_status_class(self): - return ASNStatusChoices.CSS_CLASSES.get(self.status) + def get_status_color(self): + return ASNStatusChoices.colors.get(self.status) def get_absolute_url(self): return reverse('plugins:netbox_bgp:asn', args=[self.pk]) @@ -233,7 +202,6 @@ def __str__(self): return str(self.number) -@extras_features('export_templates', 'webhooks') class Community(BGPBase): """ """ @@ -248,15 +216,14 @@ class Meta: def __str__(self): return self.value - def get_status_class(self): - return ASNStatusChoices.CSS_CLASSES.get(self.status) + def get_status_color(self): + return ASNStatusChoices.colors.get(self.status) def get_absolute_url(self): return reverse('plugins:netbox_bgp:community', args=[self.pk]) -@extras_features('custom_fields', 'export_templates', 'webhooks') -class BGPSession(ChangeLoggedModel, CustomFieldModel): +class BGPSession(NetBoxModel): name = models.CharField( max_length=64, blank=True, @@ -327,10 +294,6 @@ class BGPSession(ChangeLoggedModel, CustomFieldModel): afi_safi = None # for future use - tags = TaggableManager(through=TaggedItem) - - objects = RestrictedQuerySet.as_manager() - class Meta: verbose_name_plural = 'BGP Sessions' unique_together = ['device', 'local_address', 'local_as', 'remote_address', 'remote_as'] @@ -338,8 +301,8 @@ class Meta: def __str__(self): return f'{self.device}:{self.name}' - def get_status_class(self): - return SessionStatusChoices.CSS_CLASSES.get(self.status) + def get_status_color(self): + return SessionStatusChoices.colors.get(self.status) def get_absolute_url(self): - return reverse('plugins:netbox_bgp:session', args=[self.pk]) + return reverse('plugins:netbox_bgp:bgpsession', args=[self.pk]) diff --git a/netbox_bgp/navigation.py b/netbox_bgp/navigation.py index 4780f21..712e2bf 100644 --- a/netbox_bgp/navigation.py +++ b/netbox_bgp/navigation.py @@ -31,12 +31,12 @@ ), ), PluginMenuItem( - link='plugins:netbox_bgp:session_list', + link='plugins:netbox_bgp:bgpsession_list', link_text='Sessions', permissions=['netbox_bgp.view_bgpsession'], buttons=( PluginMenuButton( - link='plugins:netbox_bgp:session_add', + link='plugins:netbox_bgp:bgpsession_add', title='Sessions', icon_class='mdi mdi-plus-thick', color=ButtonColorChoices.GREEN, @@ -45,12 +45,12 @@ ), ), PluginMenuItem( - link='plugins:netbox_bgp:routing_policy_list', + link='plugins:netbox_bgp:routingpolicy_list', link_text='Routing Policies', permissions=['netbox_bgp.view_routingpolicy'], buttons=( PluginMenuButton( - link='plugins:netbox_bgp:routing_policy_add', + link='plugins:netbox_bgp:routingpolicy_add', title='Routing Policies', icon_class='mdi mdi-plus-thick', color=ButtonColorChoices.GREEN, @@ -59,12 +59,12 @@ ), ), PluginMenuItem( - link='plugins:netbox_bgp:peergroup_list', + link='plugins:netbox_bgp:bgppeergroup_list', link_text='Peer Groups', permissions=['netbox_bgp.view_bgppeergroup'], buttons=( PluginMenuButton( - link='plugins:netbox_bgp:peergroup_add', + link='plugins:netbox_bgp:bgppeergroup_add', title='Peer Groups', icon_class='mdi mdi-plus-thick', color=ButtonColorChoices.GREEN, diff --git a/netbox_bgp/tables.py b/netbox_bgp/tables.py index 4f031e7..3955b43 100644 --- a/netbox_bgp/tables.py +++ b/netbox_bgp/tables.py @@ -2,7 +2,8 @@ from django.utils.safestring import mark_safe from django_tables2.utils import A -from utilities.tables import BaseTable, ChoiceFieldColumn, ToggleColumn, TagColumn +from netbox.tables import NetBoxTable +from netbox.tables.columns import ChoiceFieldColumn, TagColumn from .models import ASN, Community, BGPSession, RoutingPolicy, BGPPeerGroup @@ -24,8 +25,7 @@ """ -class ASNTable(BaseTable): - pk = ToggleColumn() +class ASNTable(NetBoxTable): number = tables.LinkColumn(text=lambda record: record.__str__(), args=[A('pk')]) status = ChoiceFieldColumn( default=AVAILABLE_LABEL @@ -35,13 +35,12 @@ class ASNTable(BaseTable): template_code=COL_TENANT ) - class Meta(BaseTable.Meta): + class Meta(NetBoxTable.Meta): model = ASN - fields = ('pk', 'number', 'description', 'status') + fields = ('pk', 'number', 'description', 'status', 'tenant') -class CommunityTable(BaseTable): - pk = ToggleColumn() +class CommunityTable(NetBoxTable): value = tables.LinkColumn() status = ChoiceFieldColumn( default=AVAILABLE_LABEL @@ -53,16 +52,15 @@ class CommunityTable(BaseTable): url_name='plugins:netbox_bgp:community_list' ) - class Meta(BaseTable.Meta): + class Meta(NetBoxTable.Meta): model = Community - fields = ('pk', 'value', 'description', 'status', 'tags') + fields = ('pk', 'value', 'description', 'status', 'tenant', 'tags') default_columns = ( 'pk', 'value', 'description', 'status', 'tenant' ) -class BGPSessionTable(BaseTable): - pk = ToggleColumn() +class BGPSessionTable(NetBoxTable): name = tables.LinkColumn() device = tables.LinkColumn() local_address = tables.LinkColumn() @@ -78,12 +76,12 @@ class BGPSessionTable(BaseTable): template_code=COL_TENANT ) - class Meta(BaseTable.Meta): + class Meta(NetBoxTable.Meta): model = BGPSession fields = ( 'pk', 'name', 'device', 'local_address', 'local_as', 'remote_address', 'remote_as', 'description', 'peer_group', - 'site', 'status' + 'site', 'status', 'tenant' ) default_columns = ( 'pk', 'name', 'device', 'local_address', 'local_as', @@ -92,17 +90,15 @@ class Meta(BaseTable.Meta): ) -class RoutingPolicyTable(BaseTable): - pk = ToggleColumn() +class RoutingPolicyTable(NetBoxTable): name = tables.LinkColumn() - class Meta(BaseTable.Meta): + class Meta(NetBoxTable.Meta): model = RoutingPolicy fields = ('pk', 'name', 'description') -class BGPPeerGroupTable(BaseTable): - pk = ToggleColumn() +class BGPPeerGroupTable(NetBoxTable): name = tables.LinkColumn() import_policies = tables.TemplateColumn( template_code=POLICIES, @@ -116,7 +112,7 @@ class BGPPeerGroupTable(BaseTable): url_name='plugins:netbox_bgp:peer_group_list' ) - class Meta(BaseTable.Meta): + class Meta(NetBoxTable.Meta): model = BGPPeerGroup fields = ( 'pk', 'name', 'description', 'tags', diff --git a/netbox_bgp/templates/netbox_bgp/asn_list.html b/netbox_bgp/templates/netbox_bgp/asn_list.html deleted file mode 100644 index 4b1a158..0000000 --- a/netbox_bgp/templates/netbox_bgp/asn_list.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends 'generic/object_list.html' %} - -{% block extra_controls %} -{% if permissions.add %} -<a href="{% url 'plugins:netbox_bgp:asn_add' %}" class="btn btn-sm btn-success"> - <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add -</a> -{% endif %} -{% endblock %} -{% block bulk_buttons %} -{% if permissions.change %} -<button type="submit" name="_edit" formaction="{% url 'plugins:netbox_bgp:asn_bulk_edit' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm"> - <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit Selected -</button> -{% endif %} -{% if permissions.delete %} -<button type="submit" name="_delete" formaction="{% url 'plugins:netbox_bgp:asn_bulk_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm"> - <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected -</button> -{% endif %} -{% endblock %} \ No newline at end of file diff --git a/netbox_bgp/templates/netbox_bgp/bgppeergroup.html b/netbox_bgp/templates/netbox_bgp/bgppeergroup.html index e175045..faa801c 100644 --- a/netbox_bgp/templates/netbox_bgp/bgppeergroup.html +++ b/netbox_bgp/templates/netbox_bgp/bgppeergroup.html @@ -6,18 +6,18 @@ {% load render_table from django_tables2 %} {% block breadcrumbs %} -<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_bgp:peergroup_list' %}">Peer Groups</a></li> +<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_bgp:bgppeergroup_list' %}">Peer Groups</a></li> {% endblock %} {% block controls %} <div class="pull-right noprint"> {% if perms.netbox_bgp.change_peergroup %} - <a href="{% url 'plugins:netbox_bgp:peergroup_edit' pk=object.pk %}" class="btn btn-sm btn-warning"> + <a href="{% url 'plugins:netbox_bgp:bgppeergroup_edit' pk=object.pk %}" class="btn btn-sm btn-warning"> <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit </a> {% endif %} {% if perms.netbox_bgp.delete_peergroup %} - <a href="{% url 'plugins:netbox_bgp:peergroup_delete' pk=object.pk %}" class="btn btn-sm btn-danger"> + <a href="{% url 'plugins:netbox_bgp:bgppeergroup_delete' pk=object.pk %}" class="btn btn-sm btn-danger"> <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete </a> {% endif %} diff --git a/netbox_bgp/templates/netbox_bgp/bgppeergroup_list.html b/netbox_bgp/templates/netbox_bgp/bgppeergroup_list.html deleted file mode 100644 index dee1dd3..0000000 --- a/netbox_bgp/templates/netbox_bgp/bgppeergroup_list.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'generic/object_list.html' %} - -{% block extra_controls %} -{% if permissions.add %} -<a href="{% url 'plugins:netbox_bgp:peergroup_add' %}" class="btn btn-sm btn-success"> - <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add -</a> -{% endif %} -{% endblock %} -{% block bulk_buttons %} -{% if permissions.delete %} -<button type="submit" name="_delete" formaction="{% url 'plugins:netbox_bgp:peergroup_bulk_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm"> - <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected -</button> -{% endif %} -{% endblock %} \ No newline at end of file diff --git a/netbox_bgp/templates/netbox_bgp/bgpsession.html b/netbox_bgp/templates/netbox_bgp/bgpsession.html index 9579d73..5f9b296 100644 --- a/netbox_bgp/templates/netbox_bgp/bgpsession.html +++ b/netbox_bgp/templates/netbox_bgp/bgpsession.html @@ -6,17 +6,17 @@ {% load render_table from django_tables2 %} {% block breadcrumbs %} -<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_bgp:session_list' %}">BGP Sessions</a></li> +<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_bgp:bgpsession_list' %}">BGP Sessions</a></li> {% endblock %} {% block controls %} <div class="pull-right noprint"> {% if perms.netbox_bgp.change_session %} - <a href="{% url 'plugins:netbox_bgp:session_edit' pk=object.pk %}" class="btn btn-sm btn-warning"> + <a href="{% url 'plugins:netbox_bgp:bgpsession_edit' pk=object.pk %}" class="btn btn-sm btn-warning"> <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit </a> {% endif %} {% if perms.netbox_bgp.delete_session %} - <a href="{% url 'plugins:netbox_bgp:session_delete' pk=object.pk %}" class="btn btn-sm btn-danger"> + <a href="{% url 'plugins:netbox_bgp:bgpsession_delete' pk=object.pk %}" class="btn btn-sm btn-danger"> <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete </a> {% endif %} diff --git a/netbox_bgp/templates/netbox_bgp/bgpsession_list.html b/netbox_bgp/templates/netbox_bgp/bgpsession_list.html deleted file mode 100644 index 8dd51b7..0000000 --- a/netbox_bgp/templates/netbox_bgp/bgpsession_list.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'generic/object_list.html' %} - -{% block extra_controls %} -{% if permissions.add %} -<a href="{% url 'plugins:netbox_bgp:session_add' %}" class="btn btn-sm btn-success"> - <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add -</a> -{% endif %} -{% endblock %} -{% block bulk_buttons %} -{% if permissions.delete %} -<button type="submit" name="_delete" formaction="{% url 'plugins:netbox_bgp:session_bulk_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm"> - <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected -</button> -{% endif %} -{% endblock %} \ No newline at end of file diff --git a/netbox_bgp/templates/netbox_bgp/community_list.html b/netbox_bgp/templates/netbox_bgp/community_list.html deleted file mode 100644 index e1510af..0000000 --- a/netbox_bgp/templates/netbox_bgp/community_list.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends 'generic/object_list.html' %} - -{% block extra_controls %} -{% if permissions.add %} -<a href="{% url 'plugins:netbox_bgp:community_add' %}" class="btn btn-sm btn-success"> - <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add -</a> -{% endif %} -{% endblock %} -{% block bulk_buttons %} -{% if permissions.change %} -<button type="submit" name="_edit" formaction="{% url 'plugins:netbox_bgp:community_bulk_edit' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm"> - <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit Selected -</button> -{% endif %} -{% if permissions.delete %} -<button type="submit" name="_delete" formaction="{% url 'plugins:netbox_bgp:community_bulk_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm"> - <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected -</button> -{% endif %} -{% endblock %} \ No newline at end of file diff --git a/netbox_bgp/templates/netbox_bgp/routingpolicy.html b/netbox_bgp/templates/netbox_bgp/routingpolicy.html index 73ed92c..824a340 100644 --- a/netbox_bgp/templates/netbox_bgp/routingpolicy.html +++ b/netbox_bgp/templates/netbox_bgp/routingpolicy.html @@ -6,17 +6,17 @@ {% load render_table from django_tables2 %} {% block breadcrumbs %} -<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_bgp:routing_policy_list' %}">Routing Policies</a></li> +<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_bgp:routingpolicy_list' %}">Routing Policies</a></li> {% endblock %} {% block controls %} <div class="pull-right noprint"> {% if perms.netbox_bgp.change_policy %} - <a href="{% url 'plugins:netbox_bgp:routing_policy_edit' pk=object.pk %}" class="btn btn-warning"> + <a href="{% url 'plugins:netbox_bgp:routingpolicy_edit' pk=object.pk %}" class="btn btn-warning"> <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit </a> {% endif %} {% if perms.netbox_bgp.delete_policy %} - <a href="{% url 'plugins:netbox_bgp:routing_policy_delete' pk=object.pk %}" class="btn btn-danger"> + <a href="{% url 'plugins:netbox_bgp:routingpolicy_delete' pk=object.pk %}" class="btn btn-danger"> <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete </a> {% endif %} @@ -31,7 +31,7 @@ {% endblock tab_items %} {% if perms.extras.view_objectchange %} <li role="presentation" class="nav-item"> - <a href="{% url 'plugins:netbox_bgp:routing_policy_changelog' pk=object.pk %}" class="nav-link{% if active_tab == 'changelog'%} active{% endif %}">Change Log</a> + <a href="{% url 'plugins:netbox_bgp:routingpolicy_changelog' pk=object.pk %}" class="nav-link{% if active_tab == 'changelog'%} active{% endif %}">Change Log</a> </li> {% endif %} </ul> diff --git a/netbox_bgp/templates/netbox_bgp/routingpolicy_list.html b/netbox_bgp/templates/netbox_bgp/routingpolicy_list.html deleted file mode 100644 index 9b5b1b7..0000000 --- a/netbox_bgp/templates/netbox_bgp/routingpolicy_list.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'generic/object_list.html' %} - -{% block extra_controls %} -{% if permissions.add %} -<a href="{% url 'plugins:netbox_bgp:routing_policy_add' %}" class="btn btn-sm btn-success"> - <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add -</a> -{% endif %} -{% endblock %} -{% block bulk_buttons %} -{% if permissions.delete %} -<button type="submit" name="_delete" formaction="{% url 'plugins:netbox_bgp:routing_policy_bulk_delete' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm"> - <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected -</button> -{% endif %} -{% endblock %} \ No newline at end of file diff --git a/netbox_bgp/urls.py b/netbox_bgp/urls.py index 07fb972..96d0119 100644 --- a/netbox_bgp/urls.py +++ b/netbox_bgp/urls.py @@ -1,5 +1,5 @@ from django.urls import path -from extras.views import ObjectChangeLogView +from netbox.views.generic import ObjectChangeLogView from .models import ASN, BGPSession, Community, RoutingPolicy, BGPPeerGroup from .views import ( @@ -33,27 +33,27 @@ path('community/<int:pk>/delete/', CommunityDeleteView.as_view(), name='community_delete'), path('community/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='community_changelog', kwargs={'model': Community}), # Sessions - path('session/', BGPSessionListView.as_view(), name='session_list'), - path('session/add/', BGPSessionAddView.as_view(), name='session_add'), - path('session/delete/', BGPSessionBulkDeleteView.as_view(), name='session_bulk_delete'), - path('session/<int:pk>/', BGPSessionView.as_view(), name='session'), - path('session/<int:pk>/edit/', BGPSessionEditView.as_view(), name='session_edit'), - path('session/<int:pk>/delete/', BGPSessionDeleteView.as_view(), name='session_delete'), - path('session/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='session_changelog', kwargs={'model': BGPSession}), + path('session/', BGPSessionListView.as_view(), name='bgpsession_list'), + path('session/add/', BGPSessionAddView.as_view(), name='bgpsession_add'), + path('session/delete/', BGPSessionBulkDeleteView.as_view(), name='bgpsession_bulk_delete'), + path('session/<int:pk>/', BGPSessionView.as_view(), name='bgpsession'), + path('session/<int:pk>/edit/', BGPSessionEditView.as_view(), name='bgpsession_edit'), + path('session/<int:pk>/delete/', BGPSessionDeleteView.as_view(), name='bgpsession_delete'), + path('session/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='bgpsession_changelog', kwargs={'model': BGPSession}), # Routing Policies - path('routing-policy/<int:pk>/', RoutingPolicyView.as_view(), name='routing_policy'), - path('routing-policy/', RoutingPolicyListView.as_view(), name='routing_policy_list'), - path('routing-policy/add/', RoutingPolicyEditView.as_view(), name='routing_policy_add'), - path('routing-policy/<int:pk>/edit/', RoutingPolicyEditView.as_view(), name='routing_policy_edit'), - path('routing-policy/delete/', RoutingPolicyBulkDeleteView.as_view(), name='routing_policy_bulk_delete'), - path('routing-policy/<int:pk>/delete/', RoutingPolicyDeleteView.as_view(), name='routing_policy_delete'), - path('routing-policy/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='routing_policy_changelog', kwargs={'model': RoutingPolicy}), + path('routing-policy/<int:pk>/', RoutingPolicyView.as_view(), name='routingpolicy'), + path('routing-policy/', RoutingPolicyListView.as_view(), name='routingpolicy_list'), + path('routing-policy/add/', RoutingPolicyEditView.as_view(), name='routingpolicy_add'), + path('routing-policy/<int:pk>/edit/', RoutingPolicyEditView.as_view(), name='routingpolicy_edit'), + path('routing-policy/delete/', RoutingPolicyBulkDeleteView.as_view(), name='routingpolicy_bulk_delete'), + path('routing-policy/<int:pk>/delete/', RoutingPolicyDeleteView.as_view(), name='routingpolicy_delete'), + path('routing-policy/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='routingpolicy_changelog', kwargs={'model': RoutingPolicy}), # Peer Groups - path('peer-group/', BGPPeerGroupListView.as_view(), name='peergroup_list'), - path('peer-group/add/', BGPPeerGroupEditView.as_view(), name='peergroup_add'), - path('peer-group/delete/', BGPPeerGroupBulkDeleteView.as_view(), name='peergroup_bulk_delete'), - path('peer-group/<int:pk>/', BGPPeerGroupView.as_view(), name='peergroup'), - path('peer-group/<int:pk>/edit/', BGPPeerGroupEditView.as_view(), name='peergroup_edit'), - path('peer-group/<int:pk>/delete/', BGPPeerGroupDeleteView.as_view(), name='peergroup_delete'), - path('peer-group/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='peergroup_changelog', kwargs={'model': BGPPeerGroup}), + path('peer-group/', BGPPeerGroupListView.as_view(), name='bgppeergroup_list'), + path('peer-group/add/', BGPPeerGroupEditView.as_view(), name='bgppeergroup_add'), + path('peer-group/delete/', BGPPeerGroupBulkDeleteView.as_view(), name='bgppeergroup_bulk_delete'), + path('peer-group/<int:pk>/', BGPPeerGroupView.as_view(), name='bgppeergroup'), + path('peer-group/<int:pk>/edit/', BGPPeerGroupEditView.as_view(), name='bgppeergroup_edit'), + path('peer-group/<int:pk>/delete/', BGPPeerGroupDeleteView.as_view(), name='bgppeergroup_delete'), + path('peer-group/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='bgppeergroup_changelog', kwargs={'model': BGPPeerGroup}), ] diff --git a/netbox_bgp/views.py b/netbox_bgp/views.py index 27805f1..b9cf52e 100644 --- a/netbox_bgp/views.py +++ b/netbox_bgp/views.py @@ -21,8 +21,7 @@ class ASNListView(generic.ObjectListView): filterset = ASNFilterSet filterset_form = ASNFilterForm table = ASNTable - action_buttons = () - template_name = 'netbox_bgp/asn_list.html' + action_buttons = ('add',) class ASNView(generic.ObjectView): @@ -40,7 +39,6 @@ def get_extra_context(self, request, instance): class ASNEditView(generic.ObjectEditView): queryset = ASN.objects.all() model_form = ASNForm - default_return_url = 'plugins:netbox_bgp:asn_list' class ASNBulkDeleteView(generic.BulkDeleteView): @@ -64,8 +62,7 @@ class CommunityListView(generic.ObjectListView): filterset = CommunityFilterSet filterset_form = CommunityFilterForm table = CommunityTable - action_buttons = () - template_name = 'netbox_bgp/community_list.html' + action_buttons = ('add',) class CommunityView(generic.ObjectView): @@ -76,7 +73,6 @@ class CommunityView(generic.ObjectView): class CommunityEditView(generic.ObjectEditView): queryset = Community.objects.all() model_form = CommunityForm - default_return_url = 'plugins:netbox_bgp:community_list' class CommunityBulkDeleteView(generic.BulkDeleteView): @@ -100,20 +96,17 @@ class BGPSessionListView(generic.ObjectListView): filterset = BGPSessionFilterSet filterset_form = BGPSessionFilterForm table = BGPSessionTable - action_buttons = () - template_name = 'netbox_bgp/bgpsession_list.html' + action_buttons = ('add',) class BGPSessionEditView(generic.ObjectEditView): queryset = BGPSession.objects.all() model_form = BGPSessionForm - default_return_url = 'plugins:netbox_bgp:session_list' class BGPSessionAddView(generic.ObjectEditView): queryset = BGPSession.objects.all() model_form = BGPSessionAddForm - default_return_url = 'plugins:netbox_bgp:session_list' class BGPSessionBulkDeleteView(generic.BulkDeleteView): @@ -157,14 +150,12 @@ class RoutingPolicyListView(generic.ObjectListView): filterset = RoutingPolicyFilterSet filterset_form = RoutingPolicyFilterForm table = RoutingPolicyTable - action_buttons = () - template_name = 'netbox_bgp/routingpolicy_list.html' + action_buttons = ('add',) class RoutingPolicyEditView(generic.ObjectEditView): queryset = RoutingPolicy.objects.all() model_form = RoutingPolicyForm - default_return_url = 'plugins:netbox_bgp:routing_policy_list' class RoutingPolicyBulkDeleteView(generic.BulkDeleteView): @@ -199,14 +190,12 @@ class BGPPeerGroupListView(generic.ObjectListView): filterset = BGPPeerGroupFilterSet filterset_form = BGPPeerGroupFilterForm table = BGPPeerGroupTable - action_buttons = () - template_name = 'netbox_bgp/bgppeergroup_list.html' + action_buttons = ('add',) class BGPPeerGroupEditView(generic.ObjectEditView): queryset = BGPPeerGroup.objects.all() model_form = BGPPeerGroupForm - default_return_url = 'plugins:netbox_bgp:peergroup_list' class BGPPeerGroupBulkDeleteView(generic.BulkDeleteView):
NetBox v3.2 support Hey there! I'd like to volunteer to implement support for NetBox v3.2. The first beta was [recently released](https://github.com/netbox-community/netbox/releases/tag/v3.2-beta1), and it greatly extends the plugins framework. We should be able to ensure support for NetBox v3.2 while removing a substantial amount of boilerplate/unsupported code. I did this recently for the [netbox-dns plugin](https://github.com/auroraresearchlab/netbox-dns/pull/128) and it turned out very well. If this would be helpful to you, I'll get to work shortly on a PR to adapt the current code base to the new framework. Of course it's entirely up to you whether to adopt the whole thing or implement specific changes piecemeal, but it should at least serve as a reference to hopefully minimize the work needed. Please let me know what you think!
Hi @jeremystretch! Thank you very much for your attention to the NetBox plugin system and to this plugin in particular. And of course many thanks for your work on NetBox, it's a great project. I keep a close eye on the latest changes to the NetBox plugins framework. Unfortunately, I could not participate in [discussion](https://github.com/netbox-community/netbox/discussions/8338) due to lack of free time, but everything I needed was already voiced there. I saw the pull request you made for the [dns plugin](https://github.com/auroraresearchlab/netbox-dns/pull/128). I have already made a new plugin based on the 3.2 version. It's really easy to create and maintain plugins now. This is what I've been waiting for a long time. As for the changes for this plugin, it would be great if you could contribute, but to be honest, I think you already have a lot of work. I think there is huge value in @jeremystretch helping in that he will get better views on if the approach he took to introduce features or fixes from the plugin discussion truly helped or added any additional burden/complexity. If @jeremystretch & @k01ek do not collaborate on this plugin update, I think a collaboration on [k01ek/netbox-plugin-skeleton](https://github.com/k01ek/netbox-plugin-skeleton) might be a good idea to lower the barrier for new plugin creators, set an example for existing maintainers (who many already use this template), and standardize the overall workflow of development. Like Ryan said, I benefit from this work too: Working through the migration process firsthand helps highlight tweaks that might still be needed to the plugins framework itself. We've already made a few resulting from the work I did on the DNS plugin. I think it'll really come into focus once I've gone through the same process with a few other plugins as well. The plugin skeleton is also very cool! Interested to hear how you'd prefer to handle that for the new v3.2 framework. Okay, make the necessary changes. Let me know if you need any help or have questions.
2022-02-24T20:36:23
0.0
[]
[]