singnet · kiruxaspb · Apr 26, 2024 · Apr 25, 2024 · Apr 25, 2024 · Apr 25, 2024
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,14 @@
-env/
-venv/
 .env
 .venv
+env/
+venv/
 .idea/
 __pycache__
 blockchain/node_modules
 snet.egg-info/
-*.pyi
+snet.cli.egg-info/
+snet/cli/resources/node_modules
+snet/cli/resources/proto/*.py
+build/
+dist/
+*.pyi
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,7 @@
+include snet/cli/resources/proto/*
+include snet/cli/resources/package.json
+
+recursive-exclude * .git
+recursive-exclude * node_modules
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
diff --git a/README.md b/README.md
@@ -1,29 +1,22 @@
-# snet-python-monorepo
+# snet-cli
 
 [![CircleCI](https://circleci.com/gh/singnet/snet-cli.svg?style=svg)](https://circleci.com/gh/singnet/snet-cli)
 
-SingularityNET Python Monorepo
+SingularityNET CLI
+
+## Package
+
+The package is published in PyPI at the following link:
 
-## Packages  
-This repository is a monorepo that includes several packages that we publish to PyPI from a shared codebase, specifically:
-
 |Package                                       |Description                                                          |
 |----------------------------------------------|---------------------------------------------------------------------|
-|[snet-cli](https://pypi.org/project/snet-cli/)|Command line interface to interact with the SingularityNET platform  |
-|[snet-sdk](https://pypi.org/project/snet.sdk/)|Integrate SingularityNET services seamlessly into Python applications|
+|[snet-cli](https://pypi.org/project/snet.cli/)|Command line interface to interact with the SingularityNET platform  |
 
 ## License  
 
 This project is licensed under the MIT License - see the
 [LICENSE](https://github.com/singnet/snet-cli/blob/master/LICENSE) file for details.
 
-
-# snet-cli
-
-[![CircleCI](https://circleci.com/gh/singnet/snet-cli.svg?style=svg)](https://circleci.com/gh/singnet/snet-cli)
-
-SingularityNET CLI
-
 ## Getting Started  
 
 The instruction down below describes the installation of the SingularityNET CLI.
@@ -47,7 +40,7 @@ sudo apt-get install libudev-dev libusb-1.0-0-dev
 ### Install snet-cli using pip
 
 ```bash
-$ pip3 install snet.snet-cli
+$ pip3 install snet.cli
 ```
 
 
@@ -58,22 +51,22 @@ If you want to enable the autocompletion of commands, you should install the
 On ubuntu (or any Linux distribution with APT support), you could run the following
 
 ```bash
-sudo apt install python-argcomplete
+sudo apt install python3-argcomplete
 ```
 After the package is installed, activate autocomplete 
 
 ##### for all python commands (which includes snet commands as well) 
 
 ```bash
-sudo activate-global-python-argcomplete
+sudo activate-global-python-argcomplete3
 ```
 Note: Changes will not take effect until shell is restarted.
 
 ##### OR
 
 ##### only for snet commands, then you should run the following
 ```bash
-echo 'eval "$(register-python-argcomplete snet)"' >> ~/.bashrc
+echo 'eval "$(register-python-argcomplete3 snet)"' >> ~/.bashrc
 ```
 then
 ```bash
@@ -99,7 +92,7 @@ you can pass the private key directly:
 ```bash
 snet identity create --private-key "a7638fd785fdb5cf13df0a1d7b5584cc20d4e8526403f0df105eedf23728f538" test key
 ```
-You can also use other identity options. See [documentation](http://snet-cli-docs.singularitynet.io/identity.html).   
+You can also use other identity options. See [documentation](http://snet-cli-docs.singularitynet.io/identity.html).  
 You can check your balance using the 
 ```bash
 snet account balance
@@ -121,14 +114,13 @@ And now we can call the "Exampleservice" service:
 Press 'Y' to confirm and get service`s response:
 >value: 42
 
-
 ## Development
 
 ### Installation
 
 #### Prerequisites  
 
-* [Python 3.10.14](https://www.python.org/downloads/release/python-31014/)  
+* [Python 3.10](https://www.python.org/downloads/release/python-31012/)  
 
 Backward compatibility for other Python versions is not guaranteed.
 
@@ -175,123 +167,3 @@ We use [SemVer](http://semver.org/) for versioning. For the versions available,
 
 This project is licensed under the MIT License - see the
 [LICENSE](https://github.com/singnet/snet-cli/blob/master/snet_cli/LICENSE) file for details.
-
-# snet-sdk-python
-
-SingularityNET SDK for Python
-
-## Getting Started  
-
-The instruction below describes the installation of the SingularityNET SDK for Python.
-
-### Core concepts
-
-The SingularityNET SDK allows you to make calls to SingularityNET services programmatically from your application.  
-To communicate between clients and services, SingularityNET uses [gRPC](https://grpc.io/).  
-To handle payment of services, SingularityNET uses [Ethereum state channels](https://dev.singularitynet.io/docs/concepts/multi-party-escrow/).  
-The SingularityNET SDK abstracts and manages state channels with service providers on behalf of the user and handles authentication with the SingularityNET services.
-
-### Usage
-
-To call a SingularityNET service, the user must be able to deposit funds (AGIX tokens) to the [Multi-Party Escrow](https://dev.singularitynet.io/docs/concepts/multi-party-escrow/) Smart Contract.  
-To deposit these tokens or do any other transaction on the Ethereum blockchain, the user must possess an Ethereum identity with available Ether.
-
-
-To interact with the SingularityNET services, you must compile the appropriate client libraries for that service.   
-To generate the client libraries to use in your application, you`ll need the SingularityNET Command Line Interface, or CLI, which you can download from PyPi, see [here](#install-snet-cli-using-pip)
-
-Once you have the CLI installed, run the following command:
-```bash
-snet sdk generate-client-library python <org_id> <service_id>
-```
-
-Optionally, you can specify an output path; otherwise it's going to be `./client_libraries/python/<registry_address>/<org_id>/<service_id>`.  
-You should move or copy these generated files to the root of your project.
-
-Once you have installed the snet-sdk in your current environment and it's in your PYTHONPATH, you should import it and create an instance of the base sdk class:
-
-```python
-from snet import sdk
-from config import config
-snet_sdk = sdk.SnetSDK(config)
-```
-
-The `config` parameter must be a Python dictionary.  
-See [test_sdk_client.py.sample](https://github.com/singnet/snet-cli/blob/master/packages/sdk/testcases/functional_tests/test_sdk_client.py) for a sample configuration file.
-
- ##### Free call configuration
- If you want to use free call you need to add the below-mentioned attributes to the config file.
-```         
-"free_call_auth_token-bin":"f2548d27ffd319b9c05918eeac15ebab934e5cfcd68e1ec3db2b92765",
-"free-call-token-expiry-block":172800,
-"email":"[email protected]"  
-```
- You can download this config for a given service from [Dapp]([https://beta.singularitynet.io/)
-
-Now, the instance of the sdk can be used to create service client instances. To create a service client instance, it needs to be supplied with the client libraries that you have compiled before.  
-Specifically, it needs the `Stub` object of the service you want to use from the compiled `_pb2_grpc.py` file of the client library.  
-Here is an example using `example-service` from the `snet` organization:
-
-```python
-import example_service_pb2_grpc
-
-org_id = "snet"
-service_id = "example-service"
-group_name="default_group"
-
-service_client = snet_sdk.create_service_client(org_id, service_id,example_service_pb2_grpc.CalculatorStub,group_name)
-```
-
-The generated `service_client` instance can be used to call the methods exposed by the service.  
-To call these methods, a request object must be provided. Specifically, you should pick the appropriate request message type that is referenced in the stub object.  
-Continuing from the previous code this is an example using `example-service` from the `snet` organization:
-
-```python
-import example_service_pb2
-
-request = example_service_pb2.Numbers(a=20, b=3)
-
-result = service_client.service.mul(request)
-print("Performing 20 * 3: {}".format(result))   # Performing 20 * 3: value: 60.0
-```
-
-You can get this code example at [https://github.com/singnet/snet-code-examples/tree/python_client/python/client](https://github.com/singnet/snet-code-examples/tree/python_client/python/client)
-
-For more information about gRPC and how to use it with Python, please see:
-- [gRPC Basics - Python](https://grpc.io/docs/tutorials/basic/python.html)
-- [gRPC Python’s documentation](https://grpc.io/grpc/python/)
-
----
-
-## Development
-
-### Installation
-
-#### Prerequisites  
-
-* [Python 3.10.14](https://www.python.org/downloads/release/python-31014/)  
-
-Backward compatibility for other Python versions is not guaranteed.
-
----
-
-* Clone the git repository  
-```bash  
-$ git clone [email protected]:singnet/snet-cli.git
-$ cd snet-cli/packages/sdk
-```
-
-* Install the package in development/editable mode  
-```bash  
-$ pip install -e .
-```
-
-### Versioning  
-
-We use [SemVer](http://semver.org/) for versioning. For the versions available, see the
-[tags on this repository](https://github.com/singnet/snet-cli/tags).   
-
-## License  
-
-This project is licensed under the MIT License - see the
-[LICENSE](https://github.com/singnet/snet-cli/blob/master/snet_sdk/LICENSE) file for details.
diff --git a/packages/snet_cli/docs/Makefile → docs/Makefile b/packages/snet_cli/docs/Makefile → docs/Makefile
diff --git a/packages/snet_cli/docs/build-docs.sh → docs/build-docs.sh b/packages/snet_cli/docs/build-docs.sh → docs/build-docs.sh
diff --git a/packages/snet_cli/docs/source/conf.py → docs/source/conf.py b/packages/snet_cli/docs/source/conf.py → docs/source/conf.py
@@ -14,13 +14,13 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath('../../snet_cli'))
-print(os.path.abspath('../../snet_cli'))
+sys.path.insert(0, os.path.abspath('../../snet/cli'))
+print(os.path.abspath('../../snet/cli'))
 
 # -- Project information -----------------------------------------------------
 
 project = 'snet-cli'
-copyright = '2019, SingularityNet'
+copyright = '2024, SingularityNet'
 author = 'SingularityNet'
 
 # The short X.Y version

diff --git a/...ages/snet_cli/docs/source/generate_rst.py → docs/source/generate_rst.py b/...ages/snet_cli/docs/source/generate_rst.py → docs/source/generate_rst.py
@@ -2,9 +2,9 @@
 import sys
 import argparse
 
-sys.path.insert(0, os.path.abspath('../../snet_cli'))
+sys.path.insert(0, os.path.abspath('../../snet/cli'))
 
-from snet_cli import arguments
+from snet.cli import arguments
 
 
 def create_subcommand_rst(subcommand_contents, name):

diff --git a/...et_cli/docs/source/img/singularityNET.png → docs/source/img/singularityNET.png b/...et_cli/docs/source/img/singularityNET.png → docs/source/img/singularityNET.png
diff --git a/...s/snet_cli/docs/source/index_template.tpl → docs/source/index_template.tpl b/...s/snet_cli/docs/source/index_template.tpl → docs/source/index_template.tpl
@@ -3,7 +3,7 @@ Welcome to snet-cli's documentation!
 ====================================
 
 .. argparse::
-   :module: snet_cli.arguments 
+   :module: snet.cli.arguments 
    :func: get_parser 
    :prog: snet  
    :path:

diff --git a/...cli/docs/source/snet-cli-static/theme.css → docs/source/snet-cli-static/theme.css b/...cli/docs/source/snet-cli-static/theme.css → docs/source/snet-cli-static/theme.css
diff --git a/...t_cli/docs/source/subcommand_template.tpl → docs/source/subcommand_template.tpl b/...t_cli/docs/source/subcommand_template.tpl → docs/source/subcommand_template.tpl
@@ -2,7 +2,7 @@
 ***********************
 
 .. argparse::
-   :module: snet_cli.arguments 
+   :module: snet.cli.arguments 
    :func: get_parser 
    :prog: snet
    :path: <<PATH_PLACEHOLDER>>
diff --git a/packages/sdk/.gitignore b/packages/sdk/.gitignore
diff --git a/packages/sdk/LICENSE b/packages/sdk/LICENSE