Skip to content

Commit

Permalink
feat: uuid to gid and files renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
gg authored and cowan-macady committed Jan 3, 2023
1 parent e5034ba commit a4ffd9e
Show file tree
Hide file tree
Showing 175 changed files with 4,269 additions and 1,190 deletions.
42 changes: 21 additions & 21 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
omit =
setup.py
version.py
jarvis_sdk/api.py
jarvis_sdk/example.py
jarvis_sdk/indykite/*
jarvis_sdk/validate/*
jarvis_sdk/cmd/helper.py
jarvis_sdk/cmdconfig/helper.py
jarvis_sdk/model/unique_name_identifier.py
jarvis_sdk/model/email.py
jarvis_sdk/model/email_attachment.py
jarvis_sdk/model/sendgrid_email_provider.py
jarvis_sdk/model/email_message.py
jarvis_sdk/model/email_service_config.py
jarvis_sdk/model/email_template.py
jarvis_sdk/model/ingest_mapping_config.py
jarvis_sdk/model/oauth2_application.py
jarvis_sdk/model/oauth2_application_config.py
jarvis_sdk/model/oauth2_client_config.py
jarvis_sdk/model/oauth2_provider.py
jarvis_sdk/model/oauth2_provider_config.py
jarvis_sdk/model/auth_flow_config.py
jarvis_sdk/model/config_node.py
indykite_sdk/api.py
indykite_sdk/example.py
indykite_sdk/indykite/*
indykite_sdk/validate/*
indykite_sdk/identity/helper.py
indykite_sdk/config/helper.py
indykite_sdk/model/unique_name_identifier.py
indykite_sdk/model/email.py
indykite_sdk/model/email_attachment.py
indykite_sdk/model/sendgrid_email_provider.py
indykite_sdk/model/email_message.py
indykite_sdk/model/email_service_config.py
indykite_sdk/model/email_template.py
indykite_sdk/model/ingest_mapping_config.py
indykite_sdk/model/oauth2_application.py
indykite_sdk/model/oauth2_application_config.py
indykite_sdk/model/oauth2_client_config.py
indykite_sdk/model/oauth2_provider.py
indykite_sdk/model/oauth2_provider_config.py
indykite_sdk/model/auth_flow_config.py
indykite_sdk/model/config_node.py

tests/*

Expand Down
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ mock = "*"
grpcio = "*"
protobuf = "*"
jarvis-sdk = {editable = true, path = "."}
indykite-sdk = {editable = true, path = "."}
requests = "*"
pytest = "*"
pytest-cov = "*"
Expand Down
787 changes: 368 additions & 419 deletions Pipfile.lock

Large diffs are not rendered by default.

296 changes: 148 additions & 148 deletions README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/plugins/python:v3.19.3-1
out: jarvis_sdk
out: indykite_sdk
- remote: buf.build/grpc/plugins/python:v1.44.0-1
out: jarvis_sdk
out: indykite_sdk
# https://buf.build/protocolbuffers/plugins/python
# https://buf.build/grpc/plugins/python
42 changes: 21 additions & 21 deletions codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ coverage:
ignore:
- "setup.py"
- "version.py"
- "jarvis_sdk/api.py"
- "jarvis_sdk/example.py"
- "jarvis_sdk/indykite"
- "jarvis_sdk/validate"
- "jarvis_sdk/cmd/helper.py"
- "jarvis_sdk/cmdconfig/helper.py"
- "jarvis_sdk/model/unique_name_identifier.py"
- "jarvis_sdk/model/email.py"
- "jarvis_sdk/model/email_attachment.py"
- "jarvis_sdk/model/sendgrid_email_provider.py"
- "jarvis_sdk/model/email_message.py"
- "jarvis_sdk/model/email_service_config.py"
- "jarvis_sdk/model/email_template.py"
- "jarvis_sdk/model/ingest_mapping_config.py"
- "jarvis_sdk/model/oauth2_application.py"
- "jarvis_sdk/model/oauth2_application_config.py"
- "jarvis_sdk/model/oauth2_client_config.py"
- "jarvis_sdk/model/oauth2_provider.py"
- "jarvis_sdk/model/oauth2_provider_config.py"
- "jarvis_sdk/model/auth_flow_config.py"
- "jarvis_sdk/model/config_node.py"
- "indykite_sdk/api.py"
- "indykite_sdk/example.py"
- "indykite_sdk/indykite"
- "indykite_sdk/validate"
- "indykite_sdk/identity/helper.py"
- "indykite_sdk/config/helper.py"
- "indykite_sdk/model/unique_name_identifier.py"
- "indykite_sdk/model/email.py"
- "indykite_sdk/model/email_attachment.py"
- "indykite_sdk/model/sendgrid_email_provider.py"
- "indykite_sdk/model/email_message.py"
- "indykite_sdk/model/email_service_config.py"
- "indykite_sdk/model/email_template.py"
- "indykite_sdk/model/ingest_mapping_config.py"
- "indykite_sdk/model/oauth2_application.py"
- "indykite_sdk/model/oauth2_application_config.py"
- "indykite_sdk/model/oauth2_client_config.py"
- "indykite_sdk/model/oauth2_provider.py"
- "indykite_sdk/model/oauth2_provider_config.py"
- "indykite_sdk/model/auth_flow_config.py"
- "indykite_sdk/model/config_node.py"
- "tests"
4 changes: 2 additions & 2 deletions gen_proto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ packages=("indykite" "validate")

if [[ $OSTYPE == 'darwin'* ]]; then
for package in ${packages[@]}; do
find jarvis_sdk/indykite/. -name '*.py' -exec sed -i '' -e "s/from ${package}/from jarvis_sdk.${package}/g" {} \;
find indykite_sdk/indykite/. -name '*.py' -exec sed -i '' -e "s/from ${package}/from indykite_sdk.${package}/g" {} \;
done
else
for package in ${packages[@]}; do
find jarvis_sdk/indykite/. -name '*.py' -exec sed -i -e "s/from ${package}/from jarvis_sdk.${package}/g" {} \;
find indykite_sdk/indykite/. -name '*.py' -exec sed -i -e "s/from ${package}/from indykite_sdk.${package}/g" {} \;
done
fi

Expand Down
2 changes: 1 addition & 1 deletion jarvis_sdk/README.md → indykite_sdk/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# JARVIS Proto SDK 🐍
# IndyKite Proto SDK 🐍

This project serves as a Software Development Kit for developers of Indykite applications.

Expand Down
File renamed without changes.
47 changes: 39 additions & 8 deletions jarvis_sdk/api.py → indykite_sdk/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@
from uuid import UUID
from google.protobuf.json_format import MessageToJson

from jarvis_sdk.cmd import IdentityClient
from jarvis_sdk.cmdconfig import ConfigClient
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import (SendGridProviderConfig, MailJetProviderConfig, AmazonSESProviderConfig, MailgunProviderConfig)
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import (EmailServiceConfig, AuthFlowConfig, OAuth2ClientConfig, IngestMappingConfig)
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import OAuth2ProviderConfig, OAuth2ApplicationConfig
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import EmailAttachment, Email, EmailMessage, EmailTemplate, EmailDefinition
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers

from indykite_sdk.identity import IdentityClient
from indykite_sdk.config import ConfigClient
from indykite_sdk.indykite.config.v1beta1.model_pb2 import (SendGridProviderConfig, MailJetProviderConfig, AmazonSESProviderConfig, MailgunProviderConfig)
from indykite_sdk.indykite.config.v1beta1.model_pb2 import (EmailServiceConfig, AuthFlowConfig, OAuth2ClientConfig, IngestMappingConfig)
from indykite_sdk.indykite.config.v1beta1.model_pb2 import OAuth2ProviderConfig, OAuth2ApplicationConfig
from indykite_sdk.indykite.identity.v1beta2.import_pb2 import ImportDigitalTwinsRequest, ImportDigitalTwin
from indykite_sdk.indykite.identity.v1beta2.import_pb2 import PasswordCredential, PasswordHash, Bcrypt
from indykite_sdk.indykite.config.v1beta1.model_pb2 import EmailAttachment, Email, EmailMessage, EmailTemplate, EmailDefinition
from indykite_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from indykite_sdk.indykite.identity.v1beta2.import_pb2 import Email as EmailIdentity

class ParseKwargs(argparse.Action):
def __call__(self, parser, namespace, values, option_string=None): # pragma: no cover
Expand Down Expand Up @@ -439,6 +441,9 @@ def main():
delete_oauth2_application_parser.add_argument("oauth2_application_id", help="OAuth2 application id (gid)")
delete_oauth2_application_parser.add_argument("etag", help="Etag")

# import_digital_twins
import_digital_twins_parser = subparsers.add_parser("import_digital_twins")

args = parser.parse_args()
local = args.local
client = IdentityClient(local)
Expand Down Expand Up @@ -1474,6 +1479,32 @@ def main():
else:
print("Invalid delete oauth2 application response")

elif command == "import_digital_twins":

entities = [ImportDigitalTwin(
tenant_id="696e6479-6b69-4465-8000-030f00000001",
kind="DIGITAL_TWIN_KIND_PERSON",
state="DIGITAL_TWIN_STATE_ACTIVE",
password=PasswordCredential(
email=EmailIdentity(
email="test2000@example.com",
verified=True
),
hash=PasswordHash(
password_hash=bytes("$2y$10$k64jP7oqwYfQpzmoqAN5OuhrtWI2wICn0wXUzYxMp.UA1PopI653G", "utf-8")
)
)
)]
hash_algorithm = Bcrypt()

import_digital_twins_config_response = client.import_digital_twins(
entities,hash_algorithm)
if import_digital_twins_config_response:
print_response(import_digital_twins_config_response)
else:
print("Invalid import digital twins response")
return import_digital_twins_config_response


def print_verify_info(digital_twin_info): # pragma: no cover
print("Digital twin info")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import grpc
import os

from jarvis_sdk.cmdconfig import helper
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2_grpc as config_pb2_grpc
from indykite_sdk.config import helper
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2_grpc as config_pb2_grpc


class ConfigClient(object):
Expand Down Expand Up @@ -49,19 +49,19 @@ def __init__(self, local=False):
self.credentials = credentials

# Imported methods
from ._customer import get_customer_by_id, get_customer_by_name
from ._service_account import get_service_account, get_service_account_by_name, create_service_account, update_service_account, delete_service_account
from ._app_space import get_app_space_by_id, get_app_space_by_name, create_app_space, update_app_space, list_app_spaces, delete_app_space
from ._tenant import get_tenant_by_id, get_tenant_by_name, create_tenant, update_tenant, list_tenants, delete_tenant
from ._application import get_application_by_id, get_application_by_name, create_application, update_application, list_applications, delete_application
from ._application_agent import get_application_agent_by_id, get_application_agent_by_name, create_application_agent, update_application_agent, \
from .customer import get_customer_by_id, get_customer_by_name
from .service_account import get_service_account, get_service_account_by_name, create_service_account, update_service_account, delete_service_account
from .app_space import get_app_space_by_id, get_app_space_by_name, create_app_space, update_app_space, list_app_spaces, delete_app_space
from .tenant import get_tenant_by_id, get_tenant_by_name, create_tenant, update_tenant, list_tenants, delete_tenant
from .application import get_application_by_id, get_application_by_name, create_application, update_application, list_applications, delete_application
from .application_agent import get_application_agent_by_id, get_application_agent_by_name, create_application_agent, update_application_agent, \
list_application_agents, delete_application_agent
from ._application_agent_credential import get_application_agent_credential, register_application_agent_credential_jwk, register_application_agent_credential_pem, delete_application_agent_credential
from ._service_account_credential import get_service_account_credential, register_service_account_credential_jwk, register_service_account_credential_pem, delete_service_account_credential
from ._config_node import create_email_service_config_node, read_config_node, update_email_service_config_node, delete_config_node, create_auth_flow_config_node, update_auth_flow_config_node, \
from .application_agent_credential import get_application_agent_credential, register_application_agent_credential_jwk, register_application_agent_credential_pem, delete_application_agent_credential
from .service_account_credential import get_service_account_credential, register_service_account_credential_jwk, register_service_account_credential_pem, delete_service_account_credential
from .config_node import create_email_service_config_node, read_config_node, update_email_service_config_node, delete_config_node, create_auth_flow_config_node, update_auth_flow_config_node, \
create_oauth2_client_config_node, update_oauth2_client_config_node, create_ingest_mapping_config_node, update_ingest_mapping_config_node
from ._oauth2_provider import create_oauth2_provider, read_oauth2_provider, update_oauth2_provider, delete_oauth2_provider
from ._oauth2_application import create_oauth2_application, read_oauth2_application, update_oauth2_application, \
from .oauth2_provider import create_oauth2_provider, read_oauth2_provider, update_oauth2_provider, delete_oauth2_provider
from .oauth2_application import create_oauth2_application, read_oauth2_application, update_oauth2_application, \
delete_oauth2_application


Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from jarvis_sdk.model.app_space import ApplicationSpace
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import UniqueNameIdentifier
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from jarvis_sdk.model.create_app_space import CreateApplicationSpace
from jarvis_sdk.model.update_app_space import UpdateApplicationSpace
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from indykite_sdk.model.app_space import ApplicationSpace
from indykite_sdk.indykite.config.v1beta1.model_pb2 import UniqueNameIdentifier
from indykite_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from indykite_sdk.model.create_app_space import CreateApplicationSpace
from indykite_sdk.model.update_app_space import UpdateApplicationSpace


def get_app_space_by_id(self, app_space_id):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from jarvis_sdk.model.application import Application
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import UniqueNameIdentifier
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from jarvis_sdk.model.create_application import CreateApplication
from jarvis_sdk.model.update_application import UpdateApplication
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from indykite_sdk.model.application import Application
from indykite_sdk.indykite.config.v1beta1.model_pb2 import UniqueNameIdentifier
from indykite_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from indykite_sdk.model.create_application import CreateApplication
from indykite_sdk.model.update_application import UpdateApplication


def get_application_by_id(self, application_id):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from jarvis_sdk.model.application_agent import ApplicationAgent
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import UniqueNameIdentifier
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from jarvis_sdk.model.create_application_agent import CreateApplicationAgent
from jarvis_sdk.model.update_application_agent import UpdateApplicationAgent
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from indykite_sdk.model.application_agent import ApplicationAgent
from indykite_sdk.indykite.config.v1beta1.model_pb2 import UniqueNameIdentifier
from indykite_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from indykite_sdk.model.create_application_agent import CreateApplicationAgent
from indykite_sdk.model.update_application_agent import UpdateApplicationAgent


def get_application_agent_by_id(self, application_agent_id):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from jarvis_sdk.model.application_agent_credential import ApplicationAgentCredential
from jarvis_sdk.model.register_application_agent_credential import RegisterApplicationAgentCredential
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from indykite_sdk.model.application_agent_credential import ApplicationAgentCredential
from indykite_sdk.model.register_application_agent_credential import RegisterApplicationAgentCredential
from google.protobuf.timestamp_pb2 import Timestamp


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from jarvis_sdk.model.create_config_node import CreateConfigNode
from jarvis_sdk.model.update_config_node import UpdateConfigNode
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from indykite_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from indykite_sdk.model.create_config_node import CreateConfigNode
from indykite_sdk.model.update_config_node import UpdateConfigNode


def create_email_service_config_node(self, location, name, display_name, description, email_service_config,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from jarvis_sdk.model.customer import Customer
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from indykite_sdk.model.customer import Customer


def get_customer_by_id(self, customer_id):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from authlib.jose import JsonWebKey, jwt
from datetime import datetime, timedelta, timezone

from jarvis_sdk.indykite.identity.v1beta1 import attributes_pb2 as attributes
from jarvis_sdk.indykite.objects.v1beta1 import struct_pb2 as objects
from indykite_sdk.indykite.identity.v1beta1 import attributes_pb2 as attributes
from indykite_sdk.indykite.objects.v1beta1 import struct_pb2 as objects


def load_credentials(path):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from jarvis_sdk.model.create_oauth2_application import CreateOAuth2Application
from jarvis_sdk.model.update_oauth2_application import UpdateOAuth2Application
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from indykite_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from indykite_sdk.model.create_oauth2_application import CreateOAuth2Application
from indykite_sdk.model.update_oauth2_application import UpdateOAuth2Application


def create_oauth2_application(self, oauth2_provider_id, name, display_name, description,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from jarvis_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from jarvis_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from jarvis_sdk.model.create_oauth2_provider import CreateOAuth2Provider
from jarvis_sdk.model.update_oauth2_provider import UpdateOAuth2Provider
from indykite_sdk.indykite.config.v1beta1 import config_management_api_pb2 as pb2
from indykite_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers
from indykite_sdk.model.create_oauth2_provider import CreateOAuth2Provider
from indykite_sdk.model.update_oauth2_provider import UpdateOAuth2Provider


def create_oauth2_provider(self, app_space_id, name, display_name, description, config,
Expand Down

0 comments on commit a4ffd9e

Please sign in to comment.