From dfa125116eeaca60182a21c7d5c1318b388ffc45 Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 11 Sep 2024 11:31:10 +0300 Subject: [PATCH] Update readme --- README.md | 276 ++++++++++++++++++++++++++++++++---------------------- README.sh | 74 ++++++++++++--- 2 files changed, 227 insertions(+), 123 deletions(-) diff --git a/README.md b/README.md index 7c239dd..6bf1057 100644 --- a/README.md +++ b/README.md @@ -3,19 +3,71 @@ ## Install 1. Clone + + ``` + git clone https://github.com/ProzorroUKR/procedure_tools.git + ``` + 2. Navigate to cloned folder: -``` -cd procedure_tools -``` + + ``` + cd procedure_tools + ``` + 3. Install with pip -* vanilla: -``` -pip install -e . -``` -* colorized output: -``` -pip install -e .[color] -``` + + * vanilla: + + ``` + pip install -e . + ``` + + * colorized output: + + ``` + pip install -e .[color] + ``` + +## Update + +1. Pull + + ``` + git pull + ``` + + In case of conflicts: + + * Undo changes in project folder or reset with command + + ``` + git reset --hard + ``` + + * Pull again + + ``` + git pull + ``` + + * If this did not help, clean project folder + + ``` + git clean -fd + ``` + + * Pull again + + ``` + git pull + ``` + +2. Install + + ``` + pip install -e . + ``` + ## Usage ``` @@ -135,91 +187,91 @@ procedure https://lb-api-sandbox-2.prozorro.gov.ua broker_api_token https://uplo procedure https://lb-api-sandbox-2.prozorro.gov.ua broker_api_token https://upload-docs-sandbox-2.prozorro.gov.ua broker_ds_username broker_ds_password --acceleration=1000000 --path=/api/0/ --data=closeFrameworkAgreementUA --stop=bid_create_4.json ``` ``` -[12:22:32] Using seed 661011 +[11:30:32] Using seed 29142 -[12:22:32] Initializing tenders client +[11:30:32] Initializing tenders client -[12:22:32] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/spore -[12:22:32] Starting new HTTPS connection (1): lb-api-sandbox-2.prozorro.gov.ua:443 -[12:22:32] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/spore HTTP/11" 200 887419 -[12:22:33] Response status code: 200 +[11:30:32] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/spore +[11:30:32] Starting new HTTPS connection (1): lb-api-sandbox-2.prozorro.gov.ua:443 +[11:30:32] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/spore HTTP/11" 200 882086 +[11:30:32] Response status code: 200 -[12:22:33] Client time delta with server: -1937 milliseconds +[11:30:32] Client time delta with server: -960 milliseconds -[12:22:33] Initializing ds client +[11:30:32] Initializing ds client -[12:22:33] Creating plan... +[11:30:32] Creating plan... -[12:22:33] Processing data file: plan_create.json +[11:30:32] Processing data file: plan_create.json -[12:22:33] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans -[12:22:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/plans HTTP/11" 201 4202 -[12:22:34] Response status code: 201 +[11:30:32] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans +[11:30:33] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/plans HTTP/11" 201 4202 +[11:30:33] Response status code: 201 -[12:22:34] Plan created: - - id b39bacb963b0446fb3fac49977fde22a - - token 9e119a752c184f4cbf5be74ad2518fca - - transfer 5e26ffb531cc4225973a748bd22f9230 +[11:30:33] Plan created: + - id ba02034695c04b31911c8ab217431025 + - token 65b5492def0649cc90eec46984e9cfe2 + - transfer c2b92d51c9214fe0a9f17a5ac3ab97f7 - status draft -[12:22:34] Patching plan... +[11:30:33] Patching plan... -[12:22:34] Processing data file: plan_patch.json +[11:30:33] Processing data file: plan_patch.json -[12:22:34] [PATCH] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans/b39bacb963b0446fb3fac49977fde22a?acc_token=9e119a752c184f4cbf5be74ad2518fca -[12:22:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "PATCH /api/0/plans/b39bacb963b0446fb3fac49977fde22a?acc_token=9e119a752c184f4cbf5be74ad2518fca HTTP/11" 200 4101 -[12:22:34] Response status code: 200 +[11:30:33] [PATCH] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans/ba02034695c04b31911c8ab217431025?acc_token=65b5492def0649cc90eec46984e9cfe2 +[11:30:33] https://lb-api-sandbox-2.prozorro.gov.ua:443 "PATCH /api/0/plans/ba02034695c04b31911c8ab217431025?acc_token=65b5492def0649cc90eec46984e9cfe2 HTTP/11" 200 4101 +[11:30:33] Response status code: 200 -[12:22:34] Plan patched: - - id b39bacb963b0446fb3fac49977fde22a +[11:30:33] Plan patched: + - id ba02034695c04b31911c8ab217431025 - status scheduled -[12:22:34] Creating tender... +[11:30:33] Creating tender... -[12:22:34] Processing data file: tender_create.json +[11:30:33] Processing data file: tender_create.json -[12:22:34] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans/b39bacb963b0446fb3fac49977fde22a/tenders -[12:22:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/plans/b39bacb963b0446fb3fac49977fde22a/tenders HTTP/11" 201 7169 -[12:22:34] Response status code: 201 +[11:30:33] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/plans/ba02034695c04b31911c8ab217431025/tenders +[11:30:33] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/plans/ba02034695c04b31911c8ab217431025/tenders HTTP/11" 201 7427 +[11:30:33] Response status code: 201 -[12:22:34] Tender created: - - id 11325b8b6d8e4a45ae179fef7fd63aa9 - - token f606cab74ded47d6aab5ef2cc11cf975 - - transfer 39e38047e71c43d8bccbf01654dbfda7 +[11:30:33] Tender created: + - id c0860f1d60d84a68aa99c16281835122 + - token 8f1aeb99e2594962b89c959496685508 + - transfer 813a17cc81cc4f4a88e4b9b1de6816d7 - status draft - - tenderID UA-2024-08-14-000011-a + - tenderID UA-2024-09-11-000228-a - procurementMethodType closeFrameworkAgreementUA -[12:22:34] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9 -[12:22:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9 HTTP/11" 200 7064 -[12:22:34] Response status code: 200 +[11:30:33] [GET] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/c0860f1d60d84a68aa99c16281835122 +[11:30:33] https://lb-api-sandbox-2.prozorro.gov.ua:443 "GET /api/0/tenders/c0860f1d60d84a68aa99c16281835122 HTTP/11" 200 7322 +[11:30:33] Response status code: 200 -[12:22:34] Processing data file: tender_document_attach.json +[11:30:33] Processing data file: tender_document_attach.json -[12:22:34] Processing data file: tender_document_file.txt +[11:30:33] Processing data file: tender_document_file.txt -[12:22:34] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[12:22:34] Starting new HTTPS connection (1): upload-docs-sandbox-2.prozorro.gov.ua:443 -[12:22:35] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 584 -[12:22:35] Response status code: 200 +[11:30:33] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[11:30:33] Starting new HTTPS connection (1): upload-docs-sandbox-2.prozorro.gov.ua:443 +[11:30:33] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 592 +[11:30:33] Response status code: 200 -[12:22:35] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/documents?acc_token=f606cab74ded47d6aab5ef2cc11cf975 -[12:22:35] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/documents?acc_token=f606cab74ded47d6aab5ef2cc11cf975 HTTP/11" 201 555 -[12:22:35] Response status code: 201 +[11:30:33] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/c0860f1d60d84a68aa99c16281835122/documents?acc_token=8f1aeb99e2594962b89c959496685508 +[11:30:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/c0860f1d60d84a68aa99c16281835122/documents?acc_token=8f1aeb99e2594962b89c959496685508 HTTP/11" 201 549 +[11:30:34] Response status code: 201 -[12:22:35] Document attached: - - id 471786dd8061493b8fb286d647c913f3 - - url https://public-docs-sandbox-2.prozorro.gov.ua/get/1cd151b64da54751a0de5a3ceef2adc6?Signature=AKAMrq629XC5V5z2ULAprUzIrC6%2FIjuy%2BJ0f5jrgRPlX5lIv8oHClQYKo%2Fs7jSHe6DYrgQ5Wz9xQFOwbTc%2B%2FBQ%3D%3D&KeyID=1331dc52 +[11:30:34] Document attached: + - id 77741d5642ce4adf817b1b208c725c46 + - url https://public-docs-sandbox-2.prozorro.gov.ua/get/8829f12e179a4ed98df3124c29a4635a?Signature=cV22xdWtfJRGXYa8d2EYyd9fqYGYm9n%2BE0ebPK6TrXHi%2Bfkrdl549DKlHfZADg8QncT5wAXnKh2H4PKhMSPTCw%3D%3D&KeyID=1331dc52 -[12:22:35] Create tender criteria... +[11:30:34] Create tender criteria... -[12:22:35] Processing data file: criteria_create.json +[11:30:34] Processing data file: criteria_create.json -[12:22:35] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/criteria?acc_token=f606cab74ded47d6aab5ef2cc11cf975 -[12:22:35] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/criteria?acc_token=f606cab74ded47d6aab5ef2cc11cf975 HTTP/11" 201 53697 -[12:22:35] Response status code: 201 +[11:30:34] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/c0860f1d60d84a68aa99c16281835122/criteria?acc_token=8f1aeb99e2594962b89c959496685508 +[11:30:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/c0860f1d60d84a68aa99c16281835122/criteria?acc_token=8f1aeb99e2594962b89c959496685508 HTTP/11" 201 53697 +[11:30:34] Response status code: 201 -[12:22:35] Tender criteria created: +[11:30:34] Tender criteria created: - classification.id CRITERION.EXCLUSION.CONVICTIONS.PARTICIPATION_IN_CRIMINAL_ORGANISATION - classification.id CRITERION.EXCLUSION.CONVICTIONS.FRAUD - classification.id CRITERION.EXCLUSION.CONVICTIONS.CORRUPTION @@ -231,78 +283,78 @@ procedure https://lb-api-sandbox-2.prozorro.gov.ua broker_api_token https://uplo - classification.id CRITERION.EXCLUSION.NATIONAL.OTHER - classification.id CRITERION.OTHER.BID.LANGUAGE -[12:22:35] Processing data file: tender_notice_attach.json +[11:30:34] Processing data file: tender_notice_attach.json -[12:22:35] Processing data file: tender_notice_file.p7s +[11:30:34] Processing data file: tender_notice_file.p7s -[12:22:35] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[12:22:36] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 590 -[12:22:36] Response status code: 200 +[11:30:34] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[11:30:34] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 576 +[11:30:34] Response status code: 200 -[12:22:36] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/documents?acc_token=f606cab74ded47d6aab5ef2cc11cf975 -[12:22:36] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/documents?acc_token=f606cab74ded47d6aab5ef2cc11cf975 HTTP/11" 201 575 -[12:22:36] Response status code: 201 +[11:30:34] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/c0860f1d60d84a68aa99c16281835122/documents?acc_token=8f1aeb99e2594962b89c959496685508 +[11:30:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/c0860f1d60d84a68aa99c16281835122/documents?acc_token=8f1aeb99e2594962b89c959496685508 HTTP/11" 201 571 +[11:30:34] Response status code: 201 -[12:22:36] Document attached: - - id 010530c74b054c339d79ef8ac6c9662e - - url https://public-docs-sandbox-2.prozorro.gov.ua/get/772632aab56047d2832924e891723ac3?Signature=SAmD69JXYid2eNbB7smQBZPBaeqjksJgvBkCf4kzt8qePfT%2FWV6BFx8A7k2Hmw4%2FlotCsZko1%2BcUNsXziotWCA%3D%3D&KeyID=1331dc52 +[11:30:34] Document attached: + - id ee7fb70d9e364e3b913a30690e1614f6 + - url https://public-docs-sandbox-2.prozorro.gov.ua/get/46b4d4a6b4cd4b5f86bced67ef6e770c?Signature=tbDxevxhhlxrWTUplcSyAlaP3p20mD6i7F5touEGIIlf2PT4o3q3GSXwlfJFZdaBTXyFQgfpjcfTET%2FKlxTaDA%3D%3D&KeyID=1331dc52 - documentType notice -[12:22:36] Patching tender... +[11:30:34] Patching tender... -[12:22:36] Processing data file: tender_patch.json +[11:30:34] Processing data file: tender_patch.json -[12:22:36] [PATCH] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9?acc_token=f606cab74ded47d6aab5ef2cc11cf975 -[12:22:36] https://lb-api-sandbox-2.prozorro.gov.ua:443 "PATCH /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9?acc_token=f606cab74ded47d6aab5ef2cc11cf975 HTTP/11" 200 61943 -[12:22:36] Response status code: 200 +[11:30:34] [PATCH] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/c0860f1d60d84a68aa99c16281835122?acc_token=8f1aeb99e2594962b89c959496685508 +[11:30:34] https://lb-api-sandbox-2.prozorro.gov.ua:443 "PATCH /api/0/tenders/c0860f1d60d84a68aa99c16281835122?acc_token=8f1aeb99e2594962b89c959496685508 HTTP/11" 200 62201 +[11:30:34] Response status code: 200 -[12:22:36] Tender patched: - - id 11325b8b6d8e4a45ae179fef7fd63aa9 +[11:30:34] Tender patched: + - id c0860f1d60d84a68aa99c16281835122 - status active.tendering -[12:22:36] Skipping complaints creating: bot and reviewer tokens are required +[11:30:34] Skipping complaints creating: bot and reviewer tokens are required -[12:22:36] Creating bids... +[11:30:34] Creating bids... -[12:22:36] Processing data file: bid_document_file.txt +[11:30:34] Processing data file: bid_create_0.json -[12:22:36] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[12:22:36] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 579 -[12:22:36] Response status code: 200 +[11:30:34] Processing data file: bid_document_file.txt -[12:22:36] Processing data file: bid_confidential_document_file.txt +[11:30:34] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[11:30:34] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 575 +[11:30:34] Response status code: 200 -[12:22:36] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[12:22:36] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 594 -[12:22:36] Response status code: 200 +[11:30:34] Processing data file: bid_confidential_document_file.txt -[12:22:36] Processing data file: bid_eligibility_document_file.txt +[11:30:34] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[11:30:34] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 614 +[11:30:34] Response status code: 200 -[12:22:36] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[12:22:37] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 589 -[12:22:37] Response status code: 200 +[11:30:34] Processing data file: bid_eligibility_document_file.txt -[12:22:37] Processing data file: bid_financial_document_file.txt +[11:30:34] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[11:30:35] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 587 +[11:30:35] Response status code: 200 -[12:22:37] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[12:22:37] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 591 -[12:22:37] Response status code: 200 +[11:30:35] Processing data file: bid_financial_document_file.txt -[12:22:37] Processing data file: bid_qualification_document_file.txt +[11:30:35] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[11:30:35] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 601 +[11:30:35] Response status code: 200 -[12:22:37] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload -[12:22:37] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 595 -[12:22:37] Response status code: 200 +[11:30:35] Processing data file: bid_qualification_document_file.txt -[12:22:37] Processing data file: bid_create_0.json +[11:30:35] [POST] https://upload-docs-sandbox-2.prozorro.gov.ua/upload +[11:30:35] https://upload-docs-sandbox-2.prozorro.gov.ua:443 "POST /upload HTTP/11" 200 613 +[11:30:35] Response status code: 200 -[12:22:37] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/bids -[12:22:37] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/11325b8b6d8e4a45ae179fef7fd63aa9/bids HTTP/11" 403 217 -[12:22:37] Response status code: 403 +[11:30:35] [POST] https://lb-api-sandbox-2.prozorro.gov.ua/api/0/tenders/c0860f1d60d84a68aa99c16281835122/bids +[11:30:35] https://lb-api-sandbox-2.prozorro.gov.ua:443 "POST /api/0/tenders/c0860f1d60d84a68aa99c16281835122/bids HTTP/11" 403 217 +[11:30:35] Response status code: 403 -[12:22:37] Response text: +[11:30:35] Response text: -[12:22:37] {"status": "error", "errors": [{"location": "body", "name": "data", "description": "Bid can be added only during the tendering period: from (2024-08-14T12:22:32.731843+03:00) to (2024-08-14T12:22:35.323960+03:00)."}]} +[11:30:35] {"status": "error", "errors": [{"location": "body", "name": "data", "description": "Bid can be added only during the tendering period: from (2024-09-11T11:30:32.279576+03:00) to (2024-09-11T11:30:34.871619+03:00)."}]} ``` diff --git a/README.sh b/README.sh index fbc9cd2..3cbfb30 100755 --- a/README.sh +++ b/README.sh @@ -14,19 +14,71 @@ cat > $FILE <<- EOM ## Install 1. Clone + + \`\`\` + git clone https://github.com/ProzorroUKR/procedure_tools.git + \`\`\` + 2. Navigate to cloned folder: -\`\`\` -cd procedure_tools -\`\`\` + + \`\`\` + cd procedure_tools + \`\`\` + 3. Install with pip -* vanilla: -\`\`\` -pip install -e . -\`\`\` -* colorized output: -\`\`\` -pip install -e .[color] -\`\`\` + + * vanilla: + + \`\`\` + pip install -e . + \`\`\` + + * colorized output: + + \`\`\` + pip install -e .[color] + \`\`\` + +## Update + +1. Pull + + \`\`\` + git pull + \`\`\` + + In case of conflicts: + + * Undo changes in project folder or reset with command + + \`\`\` + git reset --hard + \`\`\` + + * Pull again + + \`\`\` + git pull + \`\`\` + + * If this did not help, clean project folder + + \`\`\` + git clean -fd + \`\`\` + + * Pull again + + \`\`\` + git pull + \`\`\` + +2. Install + + \`\`\` + pip install -e . + \`\`\` + ## Usage \`\`\`