Skip to content

Commit 46727b3

Browse files
authored
Merge pull request #17 from kamangir/literature-review-refactors-2024-08-10-43320
literature review refactors
2 parents d4d7b49 + 2a8004b commit 46727b3

File tree

6 files changed

+27
-12
lines changed

6 files changed

+27
-12
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ pip install notebooks-and-scripts
1717
To use on [AWS SageMaker](https://aws.amazon.com/sagemaker/) replace `<plugin-name>` with `nbs` and follow [these instructions](https://github.com/kamangir/notebooks-and-scripts/blob/main/SageMaker.md).
1818

1919
---
20-
built by [`abcli-9.192.1-current`](https://github.com/kamangir/awesome-bash-cli), based on [`notebooks_and_scripts-4.645.1`](https://github.com/kamangir/notebooks-and-scripts).
20+
built by [`abcli-9.192.1-current`](https://github.com/kamangir/awesome-bash-cli), based on [`notebooks_and_scripts-4.649.1`](https://github.com/kamangir/notebooks-and-scripts).

notebooks_and_scripts/.abcli/workflow/monitor.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ function notebooks_and_scripts_workflow_monitor() {
44
local options=$1
55

66
if [ $(abcli_option_int "$options" help 0) == 1 ]; then
7-
local options="$EOP~download,node=<node>,publish_as=<public-object-name>,~upload"
8-
abcli_show_usage "workflow monitor$ABCUL$options$ABCUL.|<job-name>$EOPE" \
9-
"monitor workflow."
7+
local options="~download,node=<node>,publish_as=<public-object-name>,~upload"
8+
abcli_show_usage "workflow monitor$ABCUL$EOP[$options]$ABCUL[.|<job-name>]$ABCUL[<command-line>]$EOPE" \
9+
"monitor <job-name>/workflow and run <command-line>."
1010
return
1111
fi
1212

@@ -33,5 +33,11 @@ function notebooks_and_scripts_workflow_monitor() {
3333
[[ ! -z "$publish_as" ]] &&
3434
abcli_publish as=$publish_as,~download,suffix=.gif $job_name
3535

36-
return 0
36+
local command_line="${@:3}"
37+
if [[ ! -z "$command_line" ]]; then
38+
abcli_eval - \
39+
"$command_line"
40+
else
41+
return 0
42+
fi
3743
}

notebooks_and_scripts/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
DESCRIPTION = f"{ICON} notebooks and scripts for ai experiments and aws batch jobs."
66

7-
VERSION = "4.645.1"
7+
VERSION = "4.649.1"
88

99
REPO_NAME = "notebooks-and-scripts"
1010

notebooks_and_scripts/workflow/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ example use: [literature review using OpenAI API](https://github.com/kamangir/op
2424
| | | | |
2525
| --- | --- | --- | --- |
2626
| 📜 | [`a-bc-d`](./patterns/a-bc-d.dot) | [`hourglass`](./patterns/hourglass.dot) | [`map-reduce`](./patterns/map-reduce.dot) |
27-
| [aws_batch](./runners/aws_batch.py) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-a-bc-d/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-a-bc-d/workflow.gif?raw=true) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-hourglass/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-hourglass/workflow.gif?raw=true) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-map-reduce/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-map-reduce/workflow.gif?raw=true) |
28-
| [generic](./runners/generic.py) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-a-bc-d/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-a-bc-d/workflow.gif?raw=true) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-hourglass/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-hourglass/workflow.gif?raw=true) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-map-reduce/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-map-reduce/workflow.gif?raw=true) |
29-
| [local](./runners/local.py) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-a-bc-d/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-a-bc-d/workflow.gif?raw=true) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-hourglass/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-hourglass/workflow.gif?raw=true) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-map-reduce/workflow.gif?raw=true)](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-map-reduce/workflow.gif?raw=true) |
27+
| [aws_batch](./runners/aws_batch.py) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-a-bc-d/workflow.gif?raw=true&random=48vRxCWtlxPwXppc)](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-a-bc-d/workflow.gif?raw=true&random=48vRxCWtlxPwXppc) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-hourglass/workflow.gif?raw=true&random=zG1c8Avnf1MqV48H)](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-hourglass/workflow.gif?raw=true&random=zG1c8Avnf1MqV48H) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-map-reduce/workflow.gif?raw=true&random=j2FuGAUEoNIYrZel)](https://kamangir-public.s3.ca-central-1.amazonaws.com/aws_batch-map-reduce/workflow.gif?raw=true&random=j2FuGAUEoNIYrZel) |
28+
| [generic](./runners/generic.py) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-a-bc-d/workflow.gif?raw=true&random=gYEm92XfCLfvKKVy)](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-a-bc-d/workflow.gif?raw=true&random=gYEm92XfCLfvKKVy) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-hourglass/workflow.gif?raw=true&random=D2kwFvPHzU3AvnIA)](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-hourglass/workflow.gif?raw=true&random=D2kwFvPHzU3AvnIA) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-map-reduce/workflow.gif?raw=true&random=K506yapZridmNJ2q)](https://kamangir-public.s3.ca-central-1.amazonaws.com/generic-map-reduce/workflow.gif?raw=true&random=K506yapZridmNJ2q) |
29+
| [local](./runners/local.py) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-a-bc-d/workflow.gif?raw=true&random=sxG8zRM1zGCsPMYr)](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-a-bc-d/workflow.gif?raw=true&random=sxG8zRM1zGCsPMYr) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-hourglass/workflow.gif?raw=true&random=7HoUx3UxowsKM4GA)](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-hourglass/workflow.gif?raw=true&random=7HoUx3UxowsKM4GA) | [![image](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-map-reduce/workflow.gif?raw=true&random=qFMwY24c2W5Uggo0)](https://kamangir-public.s3.ca-central-1.amazonaws.com/local-map-reduce/workflow.gif?raw=true&random=qFMwY24c2W5Uggo0) |
3030

3131

3232
related: [1](https://arash-kamangir.medium.com/%EF%B8%8F-openai-experiments-54-e49117dc69ef)
3333

3434
---
35-
built by [`abcli-9.192.1-current`](https://github.com/kamangir/awesome-bash-cli), based on [`notebooks_and_scripts-4.645.1`](https://github.com/kamangir/notebooks-and-scripts).
35+
built by [`abcli-9.192.1-current`](https://github.com/kamangir/awesome-bash-cli), based on [`notebooks_and_scripts-4.649.1`](https://github.com/kamangir/notebooks-and-scripts).

notebooks_and_scripts/workflow/README.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from functools import reduce
2+
from abcli import string
23
from notebooks_and_scripts.workflow.patterns import list_of_patterns
34
from notebooks_and_scripts.workflow.runners import list_of_runners
45

@@ -21,10 +22,11 @@
2122
+ [
2223
f"[![image]({url})]({url})"
2324
for url in [
24-
"{}/{}-{}/workflow.gif?raw=true".format(
25+
"{}/{}-{}/workflow.gif?raw=true&random={}".format(
2526
prefix,
2627
runner_type,
2728
pattern,
29+
string.random_(),
2830
)
2931
for pattern in list_of_patterns()
3032
]

notebooks_and_scripts/workflow/dot_file.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import copy
2+
import textwrap
23
from typing import Tuple, Dict, List
34
import numpy as np
45
import networkx as nx
@@ -48,6 +49,7 @@ def export_graph_as_image(
4849
hot_node: str = "void",
4950
add_legend: bool = True,
5051
caption: str = "",
52+
text_width: int = 80,
5153
) -> bool:
5254
layout_func = layouts.get(layout, None)
5355
if layout_func is None:
@@ -93,11 +95,16 @@ def export_graph_as_image(
9395
caption_items += [G.nodes[hot_node].get("command_line").replace('"', "")]
9496
caption_items = [item for item in caption_items if item]
9597

98+
caption_wrapped = textwrap.fill(
99+
" | ".join(caption_items),
100+
width=text_width,
101+
)
102+
96103
if caption_items:
97104
plt.text(
98105
0.5,
99106
0.5,
100-
" | ".join(caption_items),
107+
caption_wrapped,
101108
horizontalalignment="center",
102109
verticalalignment="center",
103110
transform=plt.gca().transAxes,

0 commit comments

Comments
 (0)