vantage6 4.7.0rc2__tar.gz → 4.7.1__tar.gz

{vantage6-4.7.0rc2 → vantage6-4.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.7.0rc2
+Version: 4.7.1
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -44,13 +44,24 @@ You can find more (user) documentation at [readthedocs (docs.vantage6.ai)](https
 
 ![Vantage6 architecture overview](docs/images/overview-infrastructure.png)
 
-_A High level overview of the vantage6 infrastructure. Vantage6 has both a client-server and peer-to-peer architecture. The client is used by the researcher to create (PET) computation requests. It is also used to manage users, organizations and collaborations. The server contains users, organizations, collaborations, tasks and their results. It provides a central access point for both the clients and nodes. The nodes have access to privacy sensitive data and handle computation requests retrieved from the server. Computation request are executed as separate containers on the node. These containers are connected to containers at other nodes by a VPN network._
+_A High level overview of the vantage6 infrastructure. Vantage6 has both a
+client-server and peer-to-peer architecture. The client is used by the researcher to
+create (PET) computation requests. It is also used to manage users, organizations and
+collaborations. The server contains users, organizations, collaborations, tasks and
+their results. It provides a central access point for both the clients and nodes. The
+nodes have access to privacy sensitive data and handle computation requests retrieved
+from the server. Computation request are executed as separate containers on the node.
+These containers are connected to containers at other nodes by a VPN network._
 
 ## :books: Quickstart
 
 ### Requirements
 
-The **vantage6** infrastructure is delivered in Docker images. To run these images, you need to have [Docker](https://docs.docker.com/get-docker/) installed. To install the latest version of the vantage6 CLI, you need to have [Python](https://www.python.org/downloads/), we recommend using an environment manager like [mini-conda](https://docs.conda.io/en/latest/miniconda.html).
+The **vantage6** infrastructure is delivered in Docker images. To run these images, you
+need to have [Docker](https://docs.docker.com/get-docker/) installed. To install the
+latest version of the vantage6 CLI, you need to have
+[Python](https://www.python.org/downloads/), we recommend using an environment manager
+like [mini-conda](https://docs.conda.io/en/latest/miniconda.html).
 
 Install the latest version of the vantage6 CLI by using:
 
@@ -86,7 +97,9 @@ v6 node attach
 v6 server attach
 ```
 
-From here you can use the [vantage6-client](https://pypi.org/project/vantage6-client) to interact with the server. The demo network has a pre-configured organization with the following credentials:
+From here you can use the [vantage6-client](https://pypi.org/project/vantage6-client)
+to interact with the server. The demo network has a pre-configured organization with
+the following credentials:
 
 - Username: `dev_admin`
 - Password: `password`
@@ -96,7 +109,7 @@ For example, you can create a new organization by running:
 ```python
 from vantage6.client import Client
 
-client = Client('http://127.0.0.1', 5000, '/api', log_level='debug')
+client = Client('http://127.0.0.1', 7601, '/api', log_level='debug')
 client.authenticate('dev_admin', 'password')
 client.setup_encryption(None)
 
@@ -110,7 +123,8 @@ client.organization.create(
 )
 ```
 
-You can find more (user) documentation at [readthedocs (docs.vantage6.ai)](https://docs.vantage6.ai)
+You can find more (user) documentation at
+[readthedocs (docs.vantage6.ai)](https://docs.vantage6.ai)
 
 ## Project structure
 
@@ -135,14 +149,16 @@ easily.
 
 ### Docker images
 
-The vantage6 infrastructure is delivered in Docker images. All Docker images are stored in our private [Harbor](https://goharbor.io/) registry. The most important images are:
+The vantage6 infrastructure is delivered in Docker images. All Docker images are stored
+in our private [Harbor](https://goharbor.io/) registry. The most important images are:
 
 - `harbor2.vantage6.ai/infrastructure/node:VERSION` -> _Node application Docker image_
 - `harbor2.vantage6.ai/infrastructure/server:VERSION` -> _Server application Docker image_
 - `harbor2.vantage6.ai/infrastructure/ui:VERSION` -> _User interface Docker image_
 - `harbor2.vantage6.ai/infrastructure/algorithm-store:VERSION` -> _Algorithm store Docker image_
 
-with `VERSION` being the full semantic version of the vantage6 infrastructure, e.g. `4.0.0` or `4.1.0rc0`.
+with `VERSION` being the full semantic version of the vantage6 infrastructure, e.g.
+`4.0.0` or `4.1.0rc0`.
 
 Several other images are used to support the infrastructure:
 
@@ -160,7 +176,10 @@ And finally there are some images released for algorithm development:
 
 ## :gift_heart: Join the community!
 
-We hope to continue developing, improving, and supporting **vantage6** with the help of the federated learning community. If you are interested in contributing, first of all, thank you! Second, please take a look at our [contributing guidelines](https://docs.vantage6.ai/en/main/devops/contribute.html)
+We hope to continue developing, improving, and supporting **vantage6** with the help of
+the federated learning community. If you are interested in contributing, first of all,
+thank you! Second, please take a look at our
+[contributing guidelines](https://docs.vantage6.ai/en/main/devops/contribute.html)
 
 <a href="https://github.com/vantage6/vantage6/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=vantage6/vantage6" />

{vantage6-4.7.0rc2 → vantage6-4.7.1}/tests_cli/test_node_cli.py

@@ -9,6 +9,7 @@ from io import BytesIO, StringIO
 from click.testing import CliRunner
 from docker.errors import APIError
 
+from vantage6.common.globals import Ports
 from vantage6.cli.globals import APPNAME
 from vantage6.common import STRING_ENCODING
 from vantage6.cli.common.utils import print_log_worker
@@ -408,7 +409,11 @@ class NodeCLITest(unittest.TestCase):
     @patch("vantage6.cli.node.common.q")
     def test_client(self, q, client, error, debug, info):
         ctx = MagicMock(
-            config={"server_url": "localhost", "port": 5000, "api_path": ""}
+            config={
+                "server_url": "localhost",
+                "port": Ports.DEV_SERVER.value,
+                "api_path": "",
+            }
         )
 
         # should not trigger an exception

vantage6-4.7.1/vantage6/cli/__build__

@@ -0,0 +1 @@
+0

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/_version.py

@@ -7,7 +7,7 @@ with open(os.path.join(here, "__build__")) as fp:
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 7, 0, "candidate", __build__, 0)
+version_info = (4, 7, 1, "final", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/algostore/start.py

@@ -1,7 +1,12 @@
 import click
 
 from vantage6.common import info
-from vantage6.common.globals import APPNAME, DEFAULT_ALGO_STORE_IMAGE, InstanceType
+from vantage6.common.globals import (
+    APPNAME,
+    DEFAULT_ALGO_STORE_IMAGE,
+    InstanceType,
+    Ports,
+)
 from vantage6.cli.common.start import (
     attach_logs,
     check_for_start,
@@ -11,7 +16,6 @@ from vantage6.cli.common.start import (
     mount_source,
     pull_infra_image,
 )
-from vantage6.cli.globals import AlgoStoreGlobals
 from vantage6.cli.context.algorithm_store import AlgorithmStoreContext
 from vantage6.cli.common.decorator import click_insert_context
 
@@ -80,7 +84,7 @@ def cli_algo_store_start(
     info(cmd)
 
     info("Run Docker container")
-    port_ = str(port or ctx.config["port"] or AlgoStoreGlobals.PORT)
+    port_ = str(port or ctx.config["port"] or Ports.DEV_ALGO_STORE.value)
     container = docker_client.containers.run(
         image,
         command=cmd,

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/configuration_wizard.py

@@ -3,7 +3,7 @@ import questionary as q
 from pathlib import Path
 
 from vantage6.common import generate_apikey
-from vantage6.common.globals import DATABASE_TYPES, InstanceType, NodePolicy
+from vantage6.common.globals import DATABASE_TYPES, InstanceType, NodePolicy, Ports
 from vantage6.common.client.node_client import NodeClient
 from vantage6.common.context import AppContext
 from vantage6.common import error, warning, info
@@ -12,7 +12,6 @@ from vantage6.cli.configuration_manager import (
     NodeConfigurationManager,
     ServerConfigurationManager,
 )
-from vantage6.cli.globals import AlgoStoreGlobals, ServerGlobals
 
 
 def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
@@ -40,11 +39,25 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
                 "message": "The base-URL of the server:",
                 "default": "http://localhost",
             },
+        ]
+    )
+    # remove trailing slash from server_url if entered by user
+    config["server_url"] = config["server_url"].rstrip("/")
+
+    # set default port to the https port if server_url is https
+    default_port = (
+        str(Ports.HTTPS.value)
+        if config["server_url"].startswith("https")
+        else str(Ports.DEV_SERVER.value)
+    )
+
+    config = config | q.prompt(
+        [
             {
                 "type": "text",
                 "name": "port",
                 "message": "Enter port to which the server listens:",
-                "default": "5000",
+                "default": default_port,
             },
             {
                 "type": "text",
@@ -107,12 +120,12 @@ def node_configuration_questionaire(dirs: dict, instance_name: str) -> dict:
             "Do you want to enter a list of allowed algorithms?"
         ).ask()
         if ask_single_algorithms:
-            policies[NodePolicy.ALLOWED_ALGORITHMS] = _get_allowed_algorithms()
+            policies[NodePolicy.ALLOWED_ALGORITHMS.value] = _get_allowed_algorithms()
         ask_algorithm_stores = q.confirm(
             "Do you want to allow algorithms from specific algorithm stores?"
         ).ask()
         if ask_algorithm_stores:
-            policies[NodePolicy.ALLOWED_ALGORITHM_STORES] = (
+            policies[NodePolicy.ALLOWED_ALGORITHM_STORES.value] = (
                 _get_allowed_algorithm_stores()
             )
         if ask_single_algorithms and ask_algorithm_stores:
@@ -291,9 +304,9 @@ def _get_common_server_config(
                 "message": "Enter port to which the server listens:",
                 "default": (
                     # Note that .value is required in YAML to get proper str value
-                    ServerGlobals.PORT.value
+                    str(Ports.DEV_SERVER.value)
                     if instance_type == InstanceType.SERVER
-                    else AlgoStoreGlobals.PORT.value
+                    else str(Ports.DEV_ALGO_STORE.value)
                 ),
             },
         ]
@@ -489,7 +502,7 @@ def algo_store_configuration_questionaire(instance_name: str) -> dict:
         InstanceType.ALGORITHM_STORE, instance_name, include_api_path=False
     )
 
-    default_v6_server_uri = "http://localhost:5000/api"
+    default_v6_server_uri = f"http://localhost:{Ports.DEV_SERVER.value}/api"
     default_root_username = "root"
 
     v6_server_uri = q.text(

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/dev/create.py

@@ -7,7 +7,7 @@ import pandas as pd
 from jinja2 import Environment, FileSystemLoader
 from colorama import Fore, Style
 
-from vantage6.common.globals import APPNAME, InstanceType
+from vantage6.common.globals import APPNAME, InstanceType, Ports
 from vantage6.common import info, error, generate_apikey
 
 import vantage6.cli.dev.data as data_dir
@@ -479,20 +479,22 @@ def demo_network(
     "-p",
     "--server-port",
     type=int,
-    default=7601,
-    help="Port to run the server on. Default is 7601.",
+    default=Ports.DEV_SERVER.value,
+    help=f"Port to run the server on. Default is {Ports.DEV_SERVER.value}.",
 )
 @click.option(
     "--ui-port",
     type=int,
-    default=7600,
-    help="Port to run the UI on. Default is 7600.",
+    default=Ports.DEV_UI.value,
+    help=f"Port to run the UI on. Default is {Ports.DEV_UI.value}.",
 )
 @click.option(
     "--algorithm-store-port",
     type=int,
-    default=7602,
-    help="Port to run the algorithm store on. Default is 7602.",
+    default=Ports.DEV_ALGO_STORE.value,
+    help=(
+        f"Port to run the algorithm store on. Default is {Ports.DEV_ALGO_STORE.value}."
+    ),
 )
 @click.option(
     "-i",
@@ -580,7 +582,7 @@ def create_demo_network(
     )
     info(
         "Development network was set up successfully! You can now start the "
-        f"server and nodes with {Fore.GREEN}v6 server start-demo-network"
+        f"server and nodes with {Fore.GREEN}v6 dev start-demo-network"
         f"{Style.RESET_ALL}"
     )
     # find user credentials to print. Read from server import file

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/globals.py

@@ -33,9 +33,6 @@ DATA_FOLDER = PACKAGE_FOLDER / APPNAME / "_data"
 # Maximum time to start up RabbitMQ in seconds
 RABBIT_TIMEOUT = 300
 
-# Default port to start the UI on
-DEFAULT_UI_PORT = 5001
-
 # Location of repository to create new algorithm templates from
 ALGORITHM_TEMPLATE_REPO = "gh:vantage6/v6-algorithm-template.git"
 
@@ -58,7 +55,6 @@ class ServerGlobals(str, Enum):
 
     DB_URI_ENV_VAR = "VANTAGE6_DB_URI"
     CONFIG_NAME_ENV_VAR = "VANTAGE6_CONFIG_NAME"
-    PORT = "5000"
 
 
 class AlgoStoreGlobals(str, Enum):
@@ -66,4 +62,3 @@ class AlgoStoreGlobals(str, Enum):
 
     DB_URI_ENV_VAR = "VANTAGE6_ALGO_STORE_DB_URI"
     CONFIG_NAME_ENV_VAR = "VANTAGE6_ALGO_STORE_CONFIG_NAME"
-    PORT = "5002"  # 5001 is the default UI port

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/server/start.py

@@ -11,7 +11,7 @@ from vantage6.common.globals import (
     InstanceType,
 )
 
-from vantage6.cli.globals import DEFAULT_UI_PORT, ServerGlobals
+from vantage6.common.globals import Ports
 from vantage6.cli.context.server import ServerContext
 from vantage6.cli.rabbitmq.queue_manager import RabbitMQManager
 from vantage6.cli.server.common import stop_ui
@@ -151,7 +151,7 @@ def cli_server_start(
     info(cmd)
 
     info("Run Docker container")
-    port_ = str(port or ctx.config["port"] or ServerGlobals.PORT)
+    port_ = str(port or ctx.config["port"] or Ports.DEV_SERVER.value)
     container = docker_client.containers.run(
         image,
         command=cmd,
@@ -222,9 +222,9 @@ def _start_ui(client: DockerClient, ctx: ServerContext, ui_port: int) -> None:
     if not isinstance(ui_port, int) or not 0 < ui_port < 65536:
         warning(
             f"UI port '{ui_port}' is not valid! Using default port "
-            f"{DEFAULT_UI_PORT}"
+            f"{Ports.DEV_UI.value}"
         )
-        ui_port = DEFAULT_UI_PORT
+        ui_port = str(Ports.DEV_UI.value)
 
     # find image to use
     image = get_image(None, ctx, "ui", DEFAULT_UI_IMAGE)

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/template/server_config.j2

@@ -30,6 +30,6 @@ dev:
   host_uri: {{ host_uri }}
 server_url: http://localhost:{{ port }}/api
 ui:
-  enable: true
+  enabled: true
   port: {{ ui_port }}
 {{ user_provided_config }}

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/test/feature_tester.py

@@ -1,6 +1,7 @@
 import sys
 import click
 
+from vantage6.common.globals import Ports
 from vantage6.client import UserClient
 from vantage6.cli.utils import error
 from vantage6.cli.test.common.diagnostic_runner import DiagnosticRunner
@@ -8,7 +9,9 @@ from vantage6.cli.test.common.diagnostic_runner import DiagnosticRunner
 
 @click.command()
 @click.option("--host", type=str, default="http://localhost", help="URL of the server")
-@click.option("--port", type=int, default=5000, help="Port of the server")
+@click.option(
+    "--port", type=int, default=Ports.DEV_SERVER.value, help="Port of the server"
+)
 @click.option("--api-path", type=str, default="/api", help="API path of the server")
 @click.option(
     "--username",

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6/cli/test/integration_test.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 import click
 
+from vantage6.common.globals import Ports
 from vantage6.cli.utils import info
 from vantage6.cli.dev.create import create_demo_network
 from vantage6.cli.dev.start import start_demo_network
@@ -74,7 +75,7 @@ def cli_test_integration(
         name=name,
         num_nodes=3,
         server_url=server_url,
-        server_port=5000,
+        server_port=Ports.DEV_SERVER.value,
         image=image,
         extra_server_config=extra_server_config,
         extra_node_config=extra_node_config,
@@ -84,7 +85,6 @@ def cli_test_integration(
     click_ctx.invoke(
         start_demo_network,
         name=name,
-        system_folders=True,
         server_image=image,
         node_image=image,
     )
@@ -98,7 +98,7 @@ def cli_test_integration(
     diagnose_results = click_ctx.invoke(
         cli_test_features,
         host="http://localhost",
-        port=5000,
+        port=Ports.DEV_SERVER.value,
         api_path="/api",
         username="dev_admin",
         password="password",
@@ -110,12 +110,12 @@ def cli_test_integration(
     )
 
     # clean up the test resources
-    click_ctx.invoke(stop_demo_network, name=name, system_folders=True)
+    click_ctx.invoke(stop_demo_network, name=name)
     if not keep:
-        click_ctx.invoke(remove_demo_network, name=name, system_folders=True)
+        click_ctx.invoke(remove_demo_network, name=name)
     else:
         info(
-            "Keeping the demo network {name}. You can start it with `v6 dev "
+            f"Keeping the demo network {name}. You can start it with `v6 dev "
             "start-demo-network`"
         )
 

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.7.0rc2
+Version: 4.7.1
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -44,13 +44,24 @@ You can find more (user) documentation at [readthedocs (docs.vantage6.ai)](https
 
 ![Vantage6 architecture overview](docs/images/overview-infrastructure.png)
 
-_A High level overview of the vantage6 infrastructure. Vantage6 has both a client-server and peer-to-peer architecture. The client is used by the researcher to create (PET) computation requests. It is also used to manage users, organizations and collaborations. The server contains users, organizations, collaborations, tasks and their results. It provides a central access point for both the clients and nodes. The nodes have access to privacy sensitive data and handle computation requests retrieved from the server. Computation request are executed as separate containers on the node. These containers are connected to containers at other nodes by a VPN network._
+_A High level overview of the vantage6 infrastructure. Vantage6 has both a
+client-server and peer-to-peer architecture. The client is used by the researcher to
+create (PET) computation requests. It is also used to manage users, organizations and
+collaborations. The server contains users, organizations, collaborations, tasks and
+their results. It provides a central access point for both the clients and nodes. The
+nodes have access to privacy sensitive data and handle computation requests retrieved
+from the server. Computation request are executed as separate containers on the node.
+These containers are connected to containers at other nodes by a VPN network._
 
 ## :books: Quickstart
 
 ### Requirements
 
-The **vantage6** infrastructure is delivered in Docker images. To run these images, you need to have [Docker](https://docs.docker.com/get-docker/) installed. To install the latest version of the vantage6 CLI, you need to have [Python](https://www.python.org/downloads/), we recommend using an environment manager like [mini-conda](https://docs.conda.io/en/latest/miniconda.html).
+The **vantage6** infrastructure is delivered in Docker images. To run these images, you
+need to have [Docker](https://docs.docker.com/get-docker/) installed. To install the
+latest version of the vantage6 CLI, you need to have
+[Python](https://www.python.org/downloads/), we recommend using an environment manager
+like [mini-conda](https://docs.conda.io/en/latest/miniconda.html).
 
 Install the latest version of the vantage6 CLI by using:
 
@@ -86,7 +97,9 @@ v6 node attach
 v6 server attach
 ```
 
-From here you can use the [vantage6-client](https://pypi.org/project/vantage6-client) to interact with the server. The demo network has a pre-configured organization with the following credentials:
+From here you can use the [vantage6-client](https://pypi.org/project/vantage6-client)
+to interact with the server. The demo network has a pre-configured organization with
+the following credentials:
 
 - Username: `dev_admin`
 - Password: `password`
@@ -96,7 +109,7 @@ For example, you can create a new organization by running:
 ```python
 from vantage6.client import Client
 
-client = Client('http://127.0.0.1', 5000, '/api', log_level='debug')
+client = Client('http://127.0.0.1', 7601, '/api', log_level='debug')
 client.authenticate('dev_admin', 'password')
 client.setup_encryption(None)
 
@@ -110,7 +123,8 @@ client.organization.create(
 )
 ```
 
-You can find more (user) documentation at [readthedocs (docs.vantage6.ai)](https://docs.vantage6.ai)
+You can find more (user) documentation at
+[readthedocs (docs.vantage6.ai)](https://docs.vantage6.ai)
 
 ## Project structure
 
@@ -135,14 +149,16 @@ easily.
 
 ### Docker images
 
-The vantage6 infrastructure is delivered in Docker images. All Docker images are stored in our private [Harbor](https://goharbor.io/) registry. The most important images are:
+The vantage6 infrastructure is delivered in Docker images. All Docker images are stored
+in our private [Harbor](https://goharbor.io/) registry. The most important images are:
 
 - `harbor2.vantage6.ai/infrastructure/node:VERSION` -> _Node application Docker image_
 - `harbor2.vantage6.ai/infrastructure/server:VERSION` -> _Server application Docker image_
 - `harbor2.vantage6.ai/infrastructure/ui:VERSION` -> _User interface Docker image_
 - `harbor2.vantage6.ai/infrastructure/algorithm-store:VERSION` -> _Algorithm store Docker image_
 
-with `VERSION` being the full semantic version of the vantage6 infrastructure, e.g. `4.0.0` or `4.1.0rc0`.
+with `VERSION` being the full semantic version of the vantage6 infrastructure, e.g.
+`4.0.0` or `4.1.0rc0`.
 
 Several other images are used to support the infrastructure:
 
@@ -160,7 +176,10 @@ And finally there are some images released for algorithm development:
 
 ## :gift_heart: Join the community!
 
-We hope to continue developing, improving, and supporting **vantage6** with the help of the federated learning community. If you are interested in contributing, first of all, thank you! Second, please take a look at our [contributing guidelines](https://docs.vantage6.ai/en/main/devops/contribute.html)
+We hope to continue developing, improving, and supporting **vantage6** with the help of
+the federated learning community. If you are interested in contributing, first of all,
+thank you! Second, please take a look at our
+[contributing guidelines](https://docs.vantage6.ai/en/main/devops/contribute.html)
 
 <a href="https://github.com/vantage6/vantage6/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=vantage6/vantage6" />

{vantage6-4.7.0rc2 → vantage6-4.7.1}/vantage6.egg-info/requires.txt

@@ -9,8 +9,8 @@ questionary==1.10.0
 rich==13.5.2
 schema==0.7.5
 SQLAlchemy==1.4.46
-vantage6-common==4.7.0rc2
-vantage6-client==4.7.0rc2
+vantage6-common==4.7.1
+vantage6-client==4.7.1
 
 [dev]
 coverage==6.4.4

vantage6-4.7.0rc2/vantage6/cli/__build__

@@ -1 +0,0 @@
-2