Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

46 prep statement fixes #56

Closed
wants to merge 13 commits into from
Closed

46 prep statement fixes #56

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5c49545
bid to request renaming
SK0M0R0H May 10, 2023
0608b9e
ask to proposal renaming
SK0M0R0H May 10, 2023
20fec39
Added statement tags
vitalylativ May 18, 2023
56c33e4
Added retrieval by statement_key
vitalylativ May 18, 2023
00925ff
Fix paths to submodules
NickVolynkin May 30, 2023
9008207
28 update dependencies (#58)
SK0M0R0H Jun 1, 2023
ac0b563
conflicts resolved
g-arakelov Jun 15, 2023
9c653e5
Docker file updated
g-arakelov Jun 15, 2023
992025d
Merge pull request #50 from NilFoundation/49-change-terminology-bidas…
g-arakelov Jun 15, 2023
1d5e6dc
Moved statement prep into tools
vitalylativ Jun 16, 2023
454369e
Added statement tags
vitalylativ May 18, 2023
9f1030f
Moved statement prep into tools
vitalylativ Jun 16, 2023
c163249
Rebase commit
vitalylativ Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions scripts/bid_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ def push(auth, key, file, cost, verbose=False):
return res.json()


def get(auth, key=None, bid_status=None, verbose=False):
def get(auth, key=None, bid_status=None, verbose=False, statement_key=None):
headers = get_headers(auth)
url = URL + f"_db/{DB_NAME}/{MOUNT}/bid/"
if bid_status:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it will be better to have an opportunity to combine bid_status and statement tag.

url += f'?q=[{{"key" : "status", "value" : "{bid_status}"}}]&limit=100'
elif statement_key:
url += f'?q=[{{"key" : "statement_key", "value" : "{statement_key}"}}]&limit=100'
elif key:
url += key
else:
Expand All @@ -50,9 +52,8 @@ def get(auth, key=None, bid_status=None, verbose=False):
return
else:
log_data = res.json()
if not verbose and '_key' in log_data:
left_keys = ["_key", "status", "statement_key", "cost", "sender"]
log_data = {k: v for k, v in log_data.items() if k in left_keys}
if not verbose and 'input' in log_data:
log_data.pop('input')
logging.info(f"Limit bid:\t {json.dumps(log_data, indent=4)}")
return res.json()

Expand All @@ -61,7 +62,7 @@ def push_parser(args):


def get_parser(args):
get(args.auth, args.key, args.bid_status, args.verbose)
get(args.auth, args.key, args.bid_status, args.verbose, args.statement_key)


if __name__ == "__main__":
Expand All @@ -79,6 +80,7 @@ def get_parser(args):
parser_get.set_defaults(func=get_parser)
parser_get.add_argument("--key", type=str, help="bid key")
parser_get.add_argument("--bid_status", type=str, help="bid status")
parser_get.add_argument("--statement_key", type=str, help="statement key")
parser_push.add_argument("--cost", type=float, required=True, help="cost")
parser_push.add_argument(
"--file", type=str, required=True, help="json file with public input"
Expand Down