holado 0.5.3__py3-none-any.whl → 0.6.1__py3-none-any.whl

{holado-0.5.3.dist-info → holado-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.5.3
+Version: 0.6.1
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues
@@ -20,6 +20,8 @@ Requires-Dist: psutil
 Requires-Dist: python-dateutil
 Provides-Extra: ais
 Requires-Dist: pyais; extra == 'ais'
+Provides-Extra: api-connexion
+Requires-Dist: connexion[flask,swagger-ui,uvicorn]; extra == 'api-connexion'
 Provides-Extra: db
 Requires-Dist: pypika; extra == 'db'
 Requires-Dist: sql-metadata; extra == 'db'

{holado-0.5.3.dist-info → holado-0.6.1.dist-info}/RECORD

@@ -155,7 +155,7 @@ holado_db/tests/behave/steps/tools/db/postgresql_client_steps.py,sha256=HtO-NSlT
 holado_db/tests/behave/steps/tools/db/sqlite_client_steps.py,sha256=6B8GGBJxxG6Z49cGCPykm8BP7nQQZWUrWpw0XgaYGaE,2930
 holado_db/tools/db/db_manager.py,sha256=0llXc6YhXfLr6oNfncPNjh4_ZInIm8XYywutQYvvLso,5400
 holado_db/tools/db/clients/base/db_audit.py,sha256=eJ1r_0YUhvq50JngpWAdyEeVHWjAD4YCvWCJsLc1zmc,4368
-holado_db/tools/db/clients/base/db_client.py,sha256=Boe_lsy9D-alK4FXzrFMTrzxq8EanWmUkcvAtkyAN9c,15265
+holado_db/tools/db/clients/base/db_client.py,sha256=sdMKDbnhO0zMCxq3n6vHcn5d5Asm6N5WhKDss89v_PU,15298
 holado_db/tools/db/clients/postgresql/postgresql_audit.py,sha256=yoy4-Yt4lZHJw7xAcuTj2Thg4aTDCYJBt-6HzQeEE80,3939
 holado_db/tools/db/clients/postgresql/postgresql_client.py,sha256=40UOniOJS-2Jrl-lxCSPTn32JGmblO-WqRFQYV40srk,4246
 holado_db/tools/db/clients/sqlite/sqlite_audit.py,sha256=cK7hBE7aKCFOX5xnT-QnYD_1loQPgPP9Gf6qTT1XuI4,3966
@@ -185,17 +185,29 @@ holado_django/server/django_projects/rest_api/rest_api/application/migrations/__
 holado_django/tests/behave/steps/__init__.py,sha256=1x7ID0w53eDe1P-n4Y5XOnLOTg_bta54gZE2YI0-IHo,1281
 holado_django/tests/behave/steps/django_server_steps.py,sha256=XAnKDUXJxsZ4L7-PYatjevh2BT3qdKIg5sXXG5Y3QFQ,3819
 holado_docker/__init__.py,sha256=CtGYR7aEkaCdAHPDAsu_ErjpVtYE0yz9wbgbfRUwS8s,1574
-holado_docker/sdk/docker/docker_client.py,sha256=bSJ66HkukTRDQxZuyUT_4CJctxYAO68kHZ6oxVmuqaI,10744
+holado_docker/sdk/docker/docker_client.py,sha256=SnNIcLM4Slec81uJqlCn6r5NhT2MLdj_-lYs2O-P1X0,13792
 holado_docker/sdk/docker/docker_service.py,sha256=SvMSIZ7XTCbC7q5rur03lJhJVSHL3uIq1dBQz9oDpkw,3767
-holado_docker/tests/behave/steps/__init__.py,sha256=5ozqOPsU8BKBESh6Xxcj9nfTmLHLAmI9xmQtrs0BNBE,1280
-holado_docker/tests/behave/steps/tools/docker_steps.py,sha256=U7zRFC7TWjIDy9PZXRfKVaJLMHNV6PbClI9fFQzuXe8,1700
-holado_docker/tools/docker_controler/__init__.py,sha256=QBkE1ydbCvARUimeSY2PvBkZ-Jp0bCv6k_l89a_8zNw,1551
-holado_docker/tools/docker_controler/docker_controler_client.py,sha256=8njfYpkZ9KlHOdBpquDXi8zzrn5xsOB1xgoM3H8-ax4,1701
-holado_docker/tools/docker_controler/docker_controler_server.py,sha256=TehDMUNh2GouU6gXNvnNxjuBLTFAYjuW8ZhjRWkXrP4,1525
-holado_docker/tools/docker_controler/proto/compile_proto.py,sha256=NjcStLaAO_zKcSprrcGscq3R_4anh55QeguXLq6SPjo,2191
-holado_docker/tools/docker_controler/proto/definitions/docker_controler.proto,sha256=n9bsXaQfnZX-R5HvfquCVt3QjpFtDJSH6p8gnTjm06k,1650
-holado_docker/tools/docker_controler/proto/generated/docker_controler_pb2.py,sha256=To_s6iI7FQZW9qx22CT-tj04AQAvQ1rq4pGjA4uM__c,3354
-holado_docker/tools/docker_controler/proto/generated/docker_controler_pb2_grpc.py,sha256=r56UidBcB4jjxGWEsTY08_71Iz0E6pI2b5LR46qvoPc,9295
+holado_docker/tests/behave/steps/__init__.py,sha256=lrP0btKLA3qQD2wp3zbOp0ug8RmgpaYWCrOAWehcPiI,1298
+holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py,sha256=hgns0Kyl38jJlZsVpMtEWlQKfga815BfJRFS_JhQvWc,4438
+holado_docker/tools/docker_controller/docker_controller_manager.py,sha256=BBWJQYZpi1o5N7dcfwBRLIkX1GcQwZkRtryOKLbF76w,2319
+holado_docker/tools/docker_controller/client/rest/docker_controller_client.py,sha256=dO_4xN30DHW5-Sre-DyG8Ls6EPW6goCzqvYqBnjBmUo,2445
+holado_docker/tools/docker_controller/server/Dockerfile,sha256=LbhPj2xyXuCrPfkz7oX07gNsI2Qhae8us3m2mMx82GA,1685
+holado_docker/tools/docker_controller/server/requirements.txt,sha256=CmvD0uEQrXrOqQycdI8kBqLHtI7cMGJJdqVGxxgwzwo,83
+holado_docker/tools/docker_controller/server/run_docker_controller_in_docker.sh,sha256=sX9z31yL41kht6jprFKgDk1fI3uo-lQSaHAtTiUAUa4,3222
+holado_docker/tools/docker_controller/server/grpc/README,sha256=cNOly0Lfsfz_qyhTqLGmELOXzAgZbByNUowuYrUnJa0,132
+holado_docker/tools/docker_controller/server/grpc/__init__.py,sha256=QBkE1ydbCvARUimeSY2PvBkZ-Jp0bCv6k_l89a_8zNw,1551
+holado_docker/tools/docker_controller/server/grpc/docker_controller_client.py,sha256=pVSTohQnm_DnSyKNuZpbOBHQ9NtSwd7t7yn2ZBNB-bU,1702
+holado_docker/tools/docker_controller/server/grpc/docker_controller_server.py,sha256=sCl0dUuatG9R-_EVaZBe6HSe6Ew8TqolfScrwQAn8Zo,1535
+holado_docker/tools/docker_controller/server/grpc/proto/compile_proto.py,sha256=NjcStLaAO_zKcSprrcGscq3R_4anh55QeguXLq6SPjo,2191
+holado_docker/tools/docker_controller/server/grpc/proto/definitions/docker_controler.proto,sha256=n9bsXaQfnZX-R5HvfquCVt3QjpFtDJSH6p8gnTjm06k,1650
+holado_docker/tools/docker_controller/server/grpc/proto/generated/docker_controler_pb2.py,sha256=To_s6iI7FQZW9qx22CT-tj04AQAvQ1rq4pGjA4uM__c,3354
+holado_docker/tools/docker_controller/server/grpc/proto/generated/docker_controler_pb2_grpc.py,sha256=r56UidBcB4jjxGWEsTY08_71Iz0E6pI2b5LR46qvoPc,9295
+holado_docker/tools/docker_controller/server/rest/initialize_holado.py,sha256=UxNphXyjs-xraorzMWjDe6-QYw_Q3mtykyY-ENYZB1o,3464
+holado_docker/tools/docker_controller/server/rest/openapi.yaml,sha256=q9c4em-bRvBBUjasrE5wJjVG4cgUStQcvc0nLn_l4SU,3347
+holado_docker/tools/docker_controller/server/rest/run.py,sha256=8w5Xl7uOnjsYW59cmuUMOUd71fcXQn30k2jVis7cVNs,1748
+holado_docker/tools/docker_controller/server/rest/api/__init__.py,sha256=Ge8OOw3BMpULc4R5BAoaOrJ4kaAhyJR0sLMtfJl4ebE,2218
+holado_docker/tools/docker_controller/server/rest/api/container.py,sha256=Y0iE3AqdJVbFUTcQNK90ymc2gwQeW0P3yBA5-RpMXvQ,2662
+holado_grpc/TODO,sha256=ESjES2-J6-3AJYdt6olcz_YGt4YTxw80CjIt-tjJ0z4,206
 holado_grpc/__init__.py,sha256=SaAz66iSTqMw7oIDrj94rGcO8W7BgS15B78p--OogHc,2266
 holado_grpc/api/rpc/TODO.txt,sha256=uWZT-WtrGuWbiOVU8-6xNiNyx_kKx-htM691zprLjh0,130
 holado_grpc/api/rpc/grpc_client.py,sha256=sCsNzwHY8QAXvcqMd-Wt-gXy3VKrsqVbB8ncBf_EcRA,8990
@@ -213,9 +225,9 @@ holado_helper/debug/README.txt,sha256=kpsK1Ii5-t5pJCL9ChcEbZYyYTKt34fjKdiMC5DGOj
 holado_helper/debug/memory/memory_profiler.py,sha256=Qu05N3uzntqm5S5XJMPdG9X0EFdagZS5poNQJPgZ-Iw,4659
 holado_helper/docker/init_user.sh,sha256=vac-OUgsbSTIuO7MK4mpbtRZNGqHbNJGNm3Hk3W3FWQ,913
 holado_helper/docker/logging.conf,sha256=PKFEwVhQriaaHZMnU3t5I9fGxuM1HFxUBRJ0NZVH-KE,1186
-holado_helper/docker/run_holado_test_nonreg_in_docker.sh,sha256=_ndFQXg4gBE3Zs6TbLmF15PM797i6onOK89OVENWORM,4696
-holado_helper/docker/run_terminal_in_docker-with_docker_control.sh,sha256=EIKqew9xOAeA8KCEbz4DDSDM8s27g3FAT1j3sr2uWlI,3525
-holado_helper/docker/run_terminal_in_docker.sh,sha256=GOOhbo9cEjw5Pp5BlhbzZm2U5XqZoqhHcVjlUwdV4WA,3397
+holado_helper/docker/run_holado_test_nonreg_in_docker.sh,sha256=Wwt1LJ87YgCAhaV7l6iATfhAfLH3awrYsxq71X7Ih68,4696
+holado_helper/docker/run_terminal_in_docker-with_docker_control.sh,sha256=0N-5sHaQuTiX7TadOjh6nktv-viNXeyZtnh0YixW9kM,3525
+holado_helper/docker/run_terminal_in_docker.sh,sha256=_2qqNArGKAyxh9gLg4Y-wkVS3bEzglm2KKNaIbqIImM,3397
 holado_helper/holado_module_template/__init__.py,sha256=KpbIi2cm1BYZgoWf0LuhE0ei3ZCE15UcUtjC1cSA55M,1653
 holado_helper/holado_module_template/tests/behave/steps/__init__.py,sha256=BHp8TYE_X4lWn4B8A51nXSYaJlczuiDVJLcKMy7p0Lw,1267
 holado_helper/holado_module_template/tests/behave/steps/private/__init__.py,sha256=BHp8TYE_X4lWn4B8A51nXSYaJlczuiDVJLcKMy7p0Lw,1267
@@ -305,8 +317,8 @@ holado_python/standard_library/ssl/resources/certificates/NOTES.txt,sha256=GlPGG
 holado_python/standard_library/ssl/resources/certificates/localhost.crt,sha256=iLmZpDuOQVawUlbZkb72g2-uv1c4SAmRJOrm4Th5anY,1123
 holado_python/standard_library/ssl/resources/certificates/localhost.key,sha256=lP2NCvB9mr2E5sk8whA8FyQRcyU6H7sdWkJeKz80Hyc,1704
 holado_python/standard_library/ssl/resources/certificates/rootCACert.pem,sha256=ECQDZ8OHRfqpZHCu6JRLMUjiONaPIhKZQF0-kidVrWQ,1424
-holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=erWTdXBZG0GrWy96lXxg6Dla6S13XdFPasAdUIYjz20,1237
-holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=iJAMTlmRPP9URH2Xb5qnv8m-ttE4IYYdRPT5xhZB4_k,1704
+holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=7EPyVjJZ1rQIK76bcRubh9OWCRQXK354d5__L3cP27Y,1237
+holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=nSbpEaanV4pvfhNhyx5kcSbRQWw-rEqRMSxz1ZkPICk,1704
 holado_python/tests/behave/steps/__init__.py,sha256=TWEk-kBTTDHi9I4nuu48nufmNMdZ9FHAhPZv0A_cWzc,1661
 holado_python/tests/behave/steps/convert_steps.py,sha256=bZqRvJVp_u6fSPpdu4ne9NwVyZmui7R-AVdO2-H-I1A,2728
 holado_python/tests/behave/steps/iterable_steps.py,sha256=f4vGIWBH8Qnjq69Q-ZBluYyctQ8SKauazTc41dsktZA,4041
@@ -351,14 +363,14 @@ holado_report/report/reports/feature_report.py,sha256=i0wpk3LQLArVjWDsP9UcNSJzAU
 holado_report/report/reports/scenario_report.py,sha256=eMyqw9EzaKMmX3pGFJN1rqAOQ5eqO2ISZdxAfK3XQR4,2945
 holado_rest/__init__.py,sha256=BOeE6t6ejeqRYd44SE4vYJVTNz01BwcVCIWfwRQ5axg,1526
 holado_rest/api/rest/TODO.txt,sha256=Oz8BYPkBEs9OAEgyYLLm7i5tJ1bRE5POBpT3SRFWTi4,29
-holado_rest/api/rest/rest_client.py,sha256=sa3xYJ2zts3cnRlHbxAIpN_B0stiaPrneOnqy2xzfgM,6531
-holado_rest/api/rest/rest_manager.py,sha256=nekokAwN73n7Dn3nLhwf22XaKDW1sYjy4-JLWdfGxBQ,3559
+holado_rest/api/rest/rest_client.py,sha256=I3-aQrivFSQAbPiTSJA3wwCWPdynu2z3FqNTobqjPQY,6626
+holado_rest/api/rest/rest_manager.py,sha256=lo8zUAXsi86Diw5dego-AOn3vUbwKj5xK7i0atIgwlA,4013
 holado_rest/tests/behave/steps/__init__.py,sha256=lEH5NYkKtpgDV2ZAO1qAGNN4ipwILWMpgvQgnamgYKk,1283
 holado_rest/tests/behave/steps/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_rest/tests/behave/steps/api/rest_client_steps.py,sha256=naN0YcRVQyM--RhV0jPhnlsjZS6luijwGvVC5lM0XCY,9749
 holado_rest/tests/behave/steps/private/__init__.py,sha256=TGsd7qLZpPQRxphFzgepFa22NhHSoZgxAWSIqwvA4L8,1276
 holado_rest/tests/behave/steps/private/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado_rest/tests/behave/steps/private/api/rest_steps.py,sha256=GT97p6BzX-fWDLMUIxZ7ingCP6pTwZgk_3QX7yEMhoE,3324
+holado_rest/tests/behave/steps/private/api/rest_steps.py,sha256=acQ2K676fB7tHycwYmCPzL7E8JcQkit_aBhNggZZVgw,3264
 holado_s3/__init__.py,sha256=Gl285tg-QaPE-3etWwZql9sH26G7EnVoQn97B0NMvOI,1248
 holado_s3/tests/behave/steps/__init__.py,sha256=q64qGCCey5QivEezEXq9LjABSBnjavTpq03PpaMSLkY,1320
 holado_s3/tests/behave/steps/private/__init__.py,sha256=JmVFxoOewwdE3uAgX4u2Y3tLWL_GdYW3h2ZawNdpn38,1276
@@ -414,7 +426,7 @@ holado_sftp/tools/sftp/sftp_client.py,sha256=ExpIQoImZt9KpHuGLuZmxZetvuzK426-DQ6
 holado_sftp/tools/sftp/sftp_server.py,sha256=N_Ym3Rm8w_QS6E0id543LZXfQ7G38DeKjVwCRH2irKA,1969
 holado_swagger/__init__.py,sha256=VSOq3mr1SaTEnceP_4kwYBYAMTuyVE9_61wOdKKasis,1664
 holado_swagger/swagger_hub/mockserver/mockserver_client.py,sha256=L7P8aNi5Zuh2xRURbTLkMKeS3XcMENdgvb5BbOb3La0,4067
-holado_swagger/swagger_hub/mockserver/mockserver_manager.py,sha256=5ubBMgtNNaoXcgDjPNM0BcJ0N_QaE_hvmy4i05Pq53w,1646
+holado_swagger/swagger_hub/mockserver/mockserver_manager.py,sha256=eN843He06PLrEvT6M6UoT4xX_4Ks9GEd_3i-xJrGblw,1631
 holado_swagger/tests/behave/steps/__init__.py,sha256=joCT_nKaotXBBMNTXxOBcmr98gjmjDkY1Zbu5lCL8B4,1290
 holado_swagger/tests/behave/steps/swagger_hub/mockserver_steps.py,sha256=_M5WyF35qBjvDnXbohhMA9kV3D1H1aRnTBQ1iOtmxHA,3749
 holado_system/system/global_system.py,sha256=ZuC7Hbs3EMm2QQ6CRLYKMOS7ACcpi1N9vRuDhQT2jS8,8253
@@ -445,7 +457,7 @@ holado_test/scenario/step_tools.py,sha256=eovzeSDmkfyrRjGga-bVW9VcoLRCdGjN1z8xlB
 holado_test/scenario/tester_tools.py,sha256=Tv035FyXPjQ46Ep8KuPOjOvzJFvxnbv9EsrSihUzAwg,2479
 holado_test/tests/behave/steps/__init__.py,sha256=rdqrp-UN7vRplIqORx4sXyKwMUkptRizyLWudsmYehM,1362
 holado_test/tests/behave/steps/scenario/exception_steps.py,sha256=ZIE92Dz7a6O_c0jAP_0dj6Hc0tnW6YRgNKd4_aBpeR0,4054
-holado_test/tests/behave/steps/scenario/scenario_steps.py,sha256=fhEpdue6cYsMw0zc62AQyDrGtDZy5SCUbRyOTjObIKI,3997
+holado_test/tests/behave/steps/scenario/scenario_steps.py,sha256=RfM5Lh4sduKeYSD1NzUxtQ8705O7nausoz_gnpAJQB0,4616
 holado_test/tests/behave/steps/scenario/tester_steps.py,sha256=zEm36-su8jrqe0uv8ai4xN97j3_p2jmcPv_-jRRu688,2997
 holado_value/__init__.py,sha256=60VyLyWux76dFwn03uH4Fz3R6itf6fqKu0pQUdvwblU,1561
 holado_value/common/tables/value_table.py,sha256=fJgb-HWdlMwHOAx5CS38sPiVrjGelEiQBbG9HuHqe-A,1726
@@ -542,6 +554,8 @@ test_holado/features/NonReg/tools/sFTP.feature,sha256=LWhkOSlvCGN90qx3zXSlZrgWZs
 test_holado/features/NonReg/tools/S3/boto3_client.feature,sha256=mAGMcyQRSy3VSAzkGUKIGM00F_OD8hfXZv1JYWztpqU,3384
 test_holado/features/NonReg/tools/S3/minio_client.feature,sha256=c2i36-ehegxQbBBKR57Y5TTmdJK6fV4tGI6ksvHtyA8,3778
 test_holado/features/Test/logger.feature,sha256=Ptiq79z3P2aMNJYRSRuMvhArc_4P3Ey6Rv1RolGRIBw,531
+test_holado/features/Test/test_docker_controller.feature,sha256=OSD_ttaeoe9tyxQmQtadFlF6wjImsnfNukSx_dhuLaI,348
+test_holado/features/Test/test_parameter.feature,sha256=Yu5RycNfqUWN2O7F5u52lGEydhALeG5NmSZnyifGbK4,378
 test_holado/resources/proto/definitions/protobuf/custom_types/field_types.proto,sha256=d2QU_j-qKB6pdvUKQCGv-gSgBOPW6QcBaKrQMqZ_kNM,398
 test_holado/resources/proto/definitions/protobuf/protobuf.dev/tutorial/addressbook.proto,sha256=rxzTe354X-R2UeKi6i7mjcTavPvQctLRPPrWYYsWZBU,1362
 test_holado/resources/proto/generated/protobuf/custom_types/field_types_pb2.py,sha256=IHOGkbVtdFHC2QsVh5Nmm56sOoGDRO7ILwT3jtY6bOw,1965
@@ -551,6 +565,8 @@ test_holado/resources/scripts/update_resources_proto_generated.py,sha256=iIei5g9
 test_holado/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test_holado/steps/private_steps.py,sha256=nhypmhPUbSAvOq-98kFOlc7uddKi5Qkoz_Mqxq4Djl0,1330
 test_holado/steps/public_steps.py,sha256=qKBNrNQNQqH6E3Y7L4yqs-6XEWbeTN-M4c1Lp5Nf3to,1324
+test_holado/tools/connexion/api_rest/openapi.yaml,sha256=J4xDXap6VZfn5arbnvToBGf5V-3eXDGPm2FXMCsEkrE,280
+test_holado/tools/connexion/api_rest/run.py,sha256=1r8h-niiJ69leYu9-yM_2QKzgDRpr0nJKxBgnvqn4U8,1350
 test_holado/tools/django/README.txt,sha256=yJhso4V-Sn0Ok6QTfn5I27g9KCXK6-dGkIQOy5kgo5U,74
 test_holado/tools/django/api_grpc/db.sqlite3,sha256=4k0iEt66XiVaWNgdAjqkq2lAnB6i4t7dcsN2UVV8n_I,131072
 test_holado/tools/django/api_grpc/manage.py,sha256=90Y2fhWHRk1_8vnRBv_t6_q_Dn3dTp9fUYoDp5fOHmc,980
@@ -589,7 +605,7 @@ test_holado/tools/django/api_rest/api_rest/api1/serializers.py,sha256=o_YxFr-tgC
 test_holado/tools/django/api_rest/api_rest/api1/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 test_holado/tools/django/api_rest/api_rest/api1/views.py,sha256=kOt2xT6bxO47_z__5yYR9kcYIWWv4qYzpX0K8Tqonik,758
 test_holado/tools/django/api_rest/api_rest/api1/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado-0.5.3.dist-info/METADATA,sha256=Klob_K45Y3pQv1kCJ6yaXe3GthrDYt5CEDzamdLxdG8,6059
-holado-0.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-holado-0.5.3.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
-holado-0.5.3.dist-info/RECORD,,
+holado-0.6.1.dist-info/METADATA,sha256=nl2iztCdJ0mOo7toB80StmBvh9zgy8SOSrfi17-7SS0,6166
+holado-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.6.1.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.6.1.dist-info/RECORD,,

holado_db/tools/db/clients/base/db_client.py

@@ -22,10 +22,7 @@ from holado_core.common.tools.tools import Tools
 from holado_core.common.tables.table import Table
 from holado_db.tools.db.query.base.query_builder import QueryBuilder
 from holado_data.data.generator.base import BaseGenerator
-from sql_metadata.keywords_lists import QueryType
-import sql_metadata
 from holado_python.standard_library.typing import Typing
-import pypika.queries
 
 logger = logging.getLogger(__name__)
 
@@ -223,6 +220,10 @@ class DBClient(object):
         return res
     
     def is_query_type(self, sql_or_query, query_type):
+        from sql_metadata.keywords_lists import QueryType
+        import sql_metadata
+        import pypika.queries
+        
         if isinstance(sql_or_query, pypika.queries.QueryBuilder):
             sql = self.query_builder.to_sql(sql_or_query)
         else:

holado_docker/sdk/docker/docker_client.py

@@ -43,39 +43,79 @@ class DockerClient(object):
     def client(self):
         return self.__client
     
-    def has_container(self, name, in_list = True):
+    def has_container(self, name, in_list=True, reset_if_removed=True):
         # Note: Even if name exists in __containers, it is possible that the container has been removed
         if in_list:
             c = self.__get_container_from_list(name)
             res = c is not None
+            
+            if reset_if_removed and not res and name in self.__containers:
+                del self.__containers[name]
         else:
             res = name in self.__containers
+            
+            if reset_if_removed and res:
+                if self.__containers[name].status == "removed":
+                    del self.__containers[name]
+                res = False
         return res
     
-    def get_container(self, name):
+    def get_container(self, name, reset_if_removed=True):
+        # Reset container if removed
+        if reset_if_removed and name in self.__containers:
+            if self.__containers[name].status == "removed":
+                del self.__containers[name]
+        
+        # Get container from list if needed
         if name not in self.__containers:
             c = self.__get_container_from_list(name)
             if c:
                 self.__containers[name] = DockerContainer(self, c)
+        
         return self.__containers.get(name)
     
+    def update_containers(self, reset_if_removed=True):
+        # Add new containers
+        updated_names = set()
+        for c in self.__client.containers.list(all=True, sparse=True, ignore_removed=True):
+            try:
+                c_name = c.name
+            except docker.errors.NotFound:
+                # Container 'c' doesn't exist anymore
+                continue
+            
+            if c_name not in self.__containers:
+                self.__containers[c_name] = DockerContainer(self, c)
+            updated_names.add(c_name)
+            
+        if reset_if_removed:
+            for name in set(self.__containers.keys()).difference(updated_names):
+                del self.__containers[name]
+    
     def get_all_container_names(self):
-        for _ in range(3):
+        res = []
+        for c in self.__client.containers.list(all=True, sparse=True, ignore_removed=True):
             try:
-                return [c.name for c in self.__client.containers.list(all=True)]
+                c_name = c.name
             except docker.errors.NotFound:
-                pass
+                # Container 'c' doesn't exist anymore
+                continue
+            
+            res.append(c_name)
+        return res
     
     def __get_container_from_list(self, name):
         res = None
-        for _ in range(3):
+        for c in self.__client.containers.list(all=True, ignore_removed=True):
             try:
-                for c in self.__client.containers.list(all=True):
-                    if c.name == name:
-                        res = c
-                        break
+                c_name = c.name
             except docker.errors.NotFound:
-                pass
+                # Container 'c' doesn't exist anymore
+                continue
+            
+            if c_name == name:
+                res = c
+                break
         return res
     
     def has_volume(self, name, in_list = False):
@@ -133,17 +173,35 @@ class DockerClient(object):
                 time.sleep(1)
                 if container.status == "running":
                     break
-        if container.status != "running":
-            raise TechnicalException("Failed to run container of name '{}' (status: {})".format(name, container.status))
-        else:
-            if Tools.do_log(logger, logging.DEBUG):
-                logger.debug(f"Run docker container '{name}' with image '{image}' and arguments {kwargs}{', and wait running status' if wait_running else ''}")
+            if container.status != "running":
+                raise TechnicalException("Failed to run container of name '{}' (status: {})".format(name, container.status))
+        if Tools.do_log(logger, logging.DEBUG):
+            logger.debug(f"Run docker container '{name}' with image '{image}' and arguments {kwargs}{', and wait running status' if wait_running else ''}")
             
         # Set properties
         container.auto_stop = auto_stop
         
         return container
     
+    def restart_container(self, name, wait_running=True, **kwargs):
+        if Tools.do_log(logger, logging.DEBUG):
+            logger.debug(f"Restarting docker container '{name}' with arguments {kwargs}{', and waiting running status' if wait_running else ''}")
+        container = self.get_container(name)
+        if not container:
+            raise FunctionalException("Container of name '{}' doesn't exist")
+        
+        container.restart(**kwargs)
+        
+        if wait_running:
+            for _ in range(120):
+                time.sleep(1)
+                if container.status == "running":
+                    break
+            if container.status != "running":
+                raise TechnicalException("Failed to restart container of name '{}' (status: {})".format(name, container.status))
+        if Tools.do_log(logger, logging.DEBUG):
+            logger.debug(f"Restarted docker container '{name}' with arguments {kwargs}{', and waited running status' if wait_running else ''}")
+    
     def start_container(self, name, wait_running=True, **kwargs):
         if Tools.do_log(logger, logging.DEBUG):
             logger.debug(f"Starting docker container '{name}' with arguments {kwargs}{', and waiting running status' if wait_running else ''}")
@@ -158,11 +216,10 @@ class DockerClient(object):
                 time.sleep(1)
                 if container.status == "running":
                     break
-        if container.status != "running":
-            raise TechnicalException("Failed to run container of name '{}' (status: {})".format(name, container.status))
-        else:
-            if Tools.do_log(logger, logging.DEBUG):
-                logger.debug(f"Started docker container '{name}' with arguments {kwargs}{', and waited running status' if wait_running else ''}")
+            if container.status != "running":
+                raise TechnicalException("Failed to start container of name '{}' (status: {})".format(name, container.status))
+        if Tools.do_log(logger, logging.DEBUG):
+            logger.debug(f"Started docker container '{name}' with arguments {kwargs}{', and waited running status' if wait_running else ''}")
         
     def stop_container(self, name):
         if Tools.do_log(logger, logging.DEBUG):
@@ -209,13 +266,21 @@ class DockerContainer(DeleteableObject):
         self.__auto_stop = False
         
     def _delete_object(self):
-        if self.auto_stop and self.__docker_client and self.__docker_client.has_container(self.name) \
-                and self.__docker_client.get_container(self.name).status == "running":
+        if self.auto_stop and self.status == "running" and self.__docker_client and self.__docker_client.has_container(self.name):
             self.__docker_client.stop_container(self.name)
         
     @property
     def container(self):
-        self.__container
+        return self.__container
+        
+    @property
+    def information(self):
+        try:
+            self.__container.reload()
+        except docker.errors.NotFound:
+            # Container doesn't exist anymore, use last known information
+            pass
+        return self.__container.attrs
         
     @property
     def status(self):
@@ -233,6 +298,16 @@ class DockerContainer(DeleteableObject):
     def auto_stop(self, auto_stop):
         self.__auto_stop = auto_stop
     
+    def reload(self, ignore_removed=True):
+        try:
+            self.__container.reload()
+        except docker.errors.NotFound:
+            if not ignore_removed:
+                raise
+        
+    def restart(self, **kwargs):
+        return self.__container.restart(**kwargs)
+    
     def start(self, **kwargs):
         return self.__container.start(**kwargs)
     

holado_docker/tests/behave/steps/__init__.py

@@ -13,4 +13,4 @@
 #################################################
 
 
-from .tools.docker_steps import *
+from .tools.docker_controller.client_steps import *

holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+
+from holado.common.context.session_context import SessionContext
+from holado_test.behave.behave import *  # @UnusedWildImport
+import logging
+from holado_test.scenario.step_tools import StepTools
+from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
+from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
+from holado_docker.tools.docker_controller.docker_controller_manager import DockerControllerManager
+
+logger = logging.getLogger(__name__)
+
+
+def __get_scenario_context():
+    return SessionContext.instance().get_scenario_context()
+
+def __get_variable_manager():
+    return __get_scenario_context().get_variable_manager()
+
+
+@Given(r"(?P<var_name>{Variable}) = new Docker Controller client")
+def step_impl(context, var_name):
+    var_name = StepTools.evaluate_variable_name(var_name)
+    table = BehaveStepTools.get_step_table(context)
+    if table is not None:
+        kwargs = ValueTableConverter.convert_name_value_table_2_dict(table)
+    else:
+        kwargs = {}
+    
+    res = DockerControllerManager.new_client(**kwargs)
+
+    __get_variable_manager().register_variable(var_name, res)
+
+@Step(r"(?P<var_name>{Variable}) = list containers \(Docker Controller client: (?P<var_client>{Variable})\)")
+def step_impl(context, var_name, var_client):
+    var_name = StepTools.evaluate_variable_name(var_name)
+    client = StepTools.evaluate_variable_value(var_client)
+    
+    res = client.get_containers_status()
+    
+    __get_variable_manager().register_variable(var_name, res)
+
+@Step(r"(?P<var_name>{Variable}) = get information on container (?P<name>{Str}) \(Docker Controller client: (?P<var_client>{Variable})\)")
+def step_impl(context, var_name, name, var_client):
+    var_name = StepTools.evaluate_variable_name(var_name)
+    name = StepTools.evaluate_scenario_parameter(name)
+    client = StepTools.evaluate_variable_value(var_client)
+    
+    res = client.get_container_info(name)
+    
+    __get_variable_manager().register_variable(var_name, res)
+
+@Step(r"restart container (?P<name>{Str}) \(Docker Controller client: (?P<var_client>{Variable})\)")
+def step_impl(context, name, var_client):
+    name = StepTools.evaluate_scenario_parameter(name)
+    client = StepTools.evaluate_variable_value(var_client)
+    
+    client.restart_container(name)
+
+@Step(r"start container (?P<name>{Str}) \(Docker Controller client: (?P<var_client>{Variable})\)")
+def step_impl(context, name, var_client):
+    name = StepTools.evaluate_scenario_parameter(name)
+    client = StepTools.evaluate_variable_value(var_client)
+    
+    client.start_container(name)
+
+@Step(r"stop container (?P<name>{Str}) \(Docker Controller client: (?P<var_client>{Variable})\)")
+def step_impl(context, name, var_client):
+    name = StepTools.evaluate_scenario_parameter(name)
+    client = StepTools.evaluate_variable_value(var_client)
+    
+    client.stop_container(name)
+
+@Step(r"wait container (?P<name>{Str}) \(Docker Controller client: (?P<var_client>{Variable})\)")
+def step_impl(context, name, var_client):
+    name = StepTools.evaluate_scenario_parameter(name)
+    client = StepTools.evaluate_variable_value(var_client)
+    
+    client.wait_container(name)
+
+

holado_docker/tools/docker_controller/client/rest/docker_controller_client.py

@@ -0,0 +1,48 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+import logging
+from holado_rest.api.rest.rest_client import RestClient
+
+logger = logging.getLogger(__name__)
+
+
+class DockerControllerClient(RestClient):
+    
+    def __init__(self, name, url, headers=None):
+        super().__init__(name, url, headers)
+    
+    def get_containers_status(self):
+        response = self.get("container")
+        return self.response_result(response, status_ok=[200,204])
+    
+    def get_container_info(self, name):
+        response = self.get(f"container/{name}")
+        return self.response_result(response, status_ok=[200,204])
+    
+    def restart_container(self, name):
+        response = self.put(f"container/{name}/restart")
+        return self.response_result(response, status_ok=[200,204])
+    
+    def start_container(self, name):
+        response = self.put(f"container/{name}/start")
+        return self.response_result(response, status_ok=[200,204])
+    
+    def stop_container(self, name):
+        response = self.put(f"container/{name}/stop")
+        return self.response_result(response, status_ok=[200,204])
+    
+    def wait_container(self, name):
+        response = self.put(f"container/{name}/wait")
+        return self.response_result(response, status_ok=[200,204])
+    

holado_docker/tools/docker_controller/docker_controller_manager.py

@@ -0,0 +1,44 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+import logging
+from holado_core.common.tools.converters.converter import Converter
+import os
+from holado_docker.tools.docker_controller.client.rest.docker_controller_client import DockerControllerClient
+from holado_rest.api.rest.rest_manager import RestManager
+
+logger = logging.getLogger(__name__)
+
+
+class DockerControllerManager(object):
+    
+    @classmethod
+    def new_client(cls, **kwargs):
+        if 'name' not in kwargs:
+            kwargs['name'] = None
+        if 'url' not in kwargs:
+            env_use = os.getenv("HOLADO_USE_LOCALHOST", False)
+            use_localhost = Converter.is_boolean(env_use) and Converter.to_boolean(env_use)
+            
+            host = "localhost" if use_localhost else os.getenv("HOLADO_DOCKER_CONTROLLER_NAME", "holado_docker_controller")
+            port = os.getenv("HOLADO_DOCKER_CONTROLLER_PORT", 8000)
+            kwargs['url'] = f"http://{host}:{port}"
+        
+        manager = RestManager(default_client_class=DockerControllerClient)
+        res = manager.new_client(**kwargs)
+        
+        return res
+        
+        
+        
+        

holado_docker/tools/docker_controller/server/Dockerfile

@@ -0,0 +1,68 @@
+### Build
+
+FROM python:3.12.9-alpine3.21 AS build
+
+# Install to build python requirements
+RUN apk update \
+    && apk --no-cache --update add build-base \
+    && apk --update add alpine-sdk \
+    && apk add libffi-dev \
+    && apk add postgresql-dev gcc python3-dev musl-dev \
+    && apk add protobuf-dev
+
+# Add tools
+RUN apk --no-cache add bash \
+    && apk --no-cache add nano \
+    && apk --no-cache add curl
+
+# Create user
+RUN addgroup appuser \
+    && adduser -G appuser -s /bin/bash -D appuser
+
+# Create /code folder
+RUN mkdir /code \
+    && chown -R appuser:appuser /code
+
+# Switch to user appuser
+USER appuser
+
+# Create python venv and install requirements
+COPY --chown=appuser ./requirements.txt /code/docker_controler/requirements.txt
+WORKDIR /code/docker_controler
+RUN python -m venv /code/env \
+    && source /code/env/bin/activate \
+    && pip install -r requirements.txt
+
+
+
+### Runtime
+
+FROM python:3.12.9-alpine3.21 AS runtime
+
+# Install for python requirements
+#RUN apk update \
+#    && apk --no-cache add libstdc++ \
+#    && apk --no-cache add postgresql-dev gcc python3-dev musl-dev
+
+# Add tools
+RUN apk --no-cache add bash \
+    && apk --no-cache add nano \
+    && apk --no-cache add curl
+
+# Create and switch to user appuser as in build
+RUN addgroup appuser \
+    && adduser -G appuser -s /bin/bash -D appuser
+USER appuser
+
+# Copy /code from build
+COPY --chown=appuser --from=build /code /code
+
+# Copy docker controler sources
+COPY --chown=appuser ./rest /code/docker_controler
+
+# Activate permanently python venv
+ENV PATH=/code/env/bin:$PATH
+
+WORKDIR /code/docker_controler
+CMD ["sh", "-c", "uvicorn run:app --host 0.0.0.0 --port $HOLADO_DOCKER_CONTROLLER_PORT"]
+

holado_docker/tools/docker_controller/server/grpc/README

@@ -0,0 +1,2 @@
+WARNING: The content of this folder is not working yet
+         Use the REST version of Docker Controller that is in ../rest folder