Skip to content
This repository was archived by the owner on Mar 29, 2022. It is now read-only.

Commit 403aa7b

Browse files
committed
updating agave cli basics sections
1 parent e9a52cd commit 403aa7b

9 files changed

+165
-94
lines changed

docs/systems_basics.md renamed to docs/02.01.systems_basics.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ hostname. They may be public or private, and they may either be **storage** syst
1010

1111
In SD2E, we provide all users with private storage and execution systems attached to
1212
TACC resources. If you would like to create your own systems attached to different
13-
resources, skip ahead to [Create Private Systems](create_systems.md).
13+
resources, skip ahead to [Create Private Systems](02.06.create_systems.md).
1414

1515

1616
<br>
@@ -26,9 +26,10 @@ data-sd2e-projects-users
2626
data-sd2e-projects-etldev
2727
data-sd2e-app-assets
2828
```
29-
Here is a quick summary of the default storage systems:
29+
Here is a quick summary of the default storage systems and how they relate to
30+
the [SD2E portal](https://sd2e.org/):
3031

31-
* `data-tacc-work-username`: Your personal directory on the TACC `$WORK` filesystem. You have +rw and sharing access. This will show up in the portal as **My Data**.
32+
* `data-tacc-work-username`: Your personal directory on the TACC `$WORK` filesystem. You have `+rw` and sharing access. This will show up in the portal as **My Data**.
3233

3334
* `data-sd2e-community`: Project-wide shared data. Unless you are specifically authorized, it is read-only. This will show up in the portal as **Community Data**.
3435

@@ -38,7 +39,7 @@ Here is a quick summary of the default storage systems:
3839

3940
<br>
4041
Systems where you are able to execute commands and run jobs (called execution systems)
41-
can be found with the following command:
42+
can be found with the following command:
4243
```
4344
% systems-list -E
4445
hpc-tacc-maverick-username
@@ -65,7 +66,6 @@ Here is a quick summary of the default execution systems:
6566
* `hpc-tacc-jetstream`: Public CLI execution system for the TACC [Jetstream](https://portal.tacc.utexas.edu/user-guides/jetstream) cloud resource. Most SD2E community members have `USER` access and will be able to run public applications set up to run on these systems.
6667

6768

68-
6969
*Tip: use '`systems-list -h`' to see more usage options*
7070

7171
<br>
@@ -257,10 +257,10 @@ information about queue types and availability.
257257
<br>
258258
#### Set a default system
259259

260-
You may find that most of the [file operations](data_management.md) you perform
261-
are on your private TACC storage system - `data-tacc-work-username`. To avoid
262-
typing the full name of the system with every file command, you may set it as the
263-
default with:
260+
You may find that most of the [file operations](02.02.data_management.md) you
261+
perform are against your private TACC storage system - `data-tacc-work-username`.
262+
To avoid typing the full name of the system with every file command, you may set
263+
it as the default system with:
264264
```
265265
% systems-setdefault data-tacc-work-username
266266
Successfully set data-tacc-work-username as the default storage system for username

docs/data_management.md renamed to docs/02.02.data_management.md

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ tagline:
55
---
66

77
Data is managed using the `files` service of the Agave CLI. With many parallels in
8-
Linux file commands (`ls, mv, cp, rm,` etc.), Agave `files-*` commands can be used to
8+
Linux file commands (`ls, mv, cp, rm,` etc.), Agave `files-*` commands can be used to
99
list files, upload and download data, remotely manage and organize data, and import
1010
external data from the web.
1111

12-
Agave `files-*` commands act on Agave STORAGE `systems`. See the [systems basics](systems_basics.md)
13-
documentation for more details.
12+
Agave `files-*` commands act on Agave storage systems. See the
13+
[systems basics](02.01.systems_basics.md) documentation for more details.
1414

1515
This page is broken down into the following sections:
1616

@@ -23,15 +23,15 @@ This page is broken down into the following sections:
2323
<br>
2424
#### Listing files and navigating
2525

26-
To list the files available to you on a STORAGE system, use:
26+
To list the files available to you on a storage system, use:
2727
```
2828
% files-list -S data-tacc-work-username -L /
2929
drwx------ username 4096 13:07 .
3030
```
3131

3232
The `-L` flag provides a long listing (similar to `ls -l` in Linux), and the
3333
optional forward slash (`/`) at the end of the line indicates the root path -
34-
your `$WORK` directory. From the listing above, we have no files or folders
34+
your `$WORK` directory. From the listing above, we have no files or folders
3535
available to us yet.
3636

3737
To make a new folder, then list the contents of that folder, do:
@@ -49,23 +49,24 @@ drwx------ username 4096 15:49 .
4949

5050
To remove a folder, use the `files-delete` command:
5151
```
52-
% files-delete -S data-tacc-work-username sd2e-data/
52+
% files-delete -S data-tacc-work-username sd2e-data/
5353
Successfully deleted sd2e-data/
5454
```
5555

56-
WARNING: The `files-delete` command will delete folders with or without content.
56+
WARNING: The `files-delete` command will delete folders with or without contents.
5757

58-
*Tip: if you set `data-tacc-work-username` as your default system, then you
59-
do not need to provide it on the command line. More info [here](systems_basics.md).*
58+
*Tip: if you set `data-tacc-work-username` as your default system, then you
59+
do not need to provide it on the command line. More info
60+
[here](02.01.systems_basics.md).*
6061

6162
<br>
6263
#### Uploading and downloading via the CLI
6364

64-
Files can be transferred from your local machine to the remote STORAGE system
65-
using the `files-upload` command, and from the remote STORAGE system to your
65+
Files can be transferred from your local machine to the remote storage system
66+
using the `files-upload` command, and from the remote storage system to your
6667
local machine using the `files-get` command.
6768

68-
First, find or create a local file and upload it to the STORAGE system (recreate
69+
First, find or create a local file and upload it to the storage system (recreate
6970
the sd2e-data folder if you deleted it in the previous example):
7071
```
7172
% touch my_file.txt
@@ -79,7 +80,7 @@ drwx------ username 4096 15:53 .
7980
-rw------- username 0 15:53 my_file.txt
8081
```
8182

82-
Use the `files-copy` command to make a copy of the file on the remote STORAGE system:
83+
Use the `files-copy` command to make a copy of the file on the remote storage system:
8384
```
8485
% files-copy -S data-tacc-work-username -D sd2e-data/my_copy.txt sd2e-data/my_file.txt
8586
Successfully copied sd2e-data/my_file.txt to sd2e-data/my_copy.txt
@@ -91,10 +92,10 @@ drwx------ username 4096 15:57 .
9192
```
9293

9394
The `-D` flag specifies the destination of the copied file, including path and
94-
new file name. Experienced Linux command line users may find the order of options
95+
new file name. Experienced Linux command line users may find the order of options
9596
given to be counterintuitive - first the name of the target is given, then the
9697
name of the original file is given. This is a common convention for many of the
97-
Agave CLI file commands.
98+
Agave CLI file commands.
9899

99100
Then, download the result:
100101
```
@@ -109,7 +110,7 @@ my_copy.txt my_file.txt
109110
#### Other file operations
110111

111112
Using the Agave CLI, files and folders can also be renamed, moved, and deleted remotely on
112-
the STORAGE system. The syntax for these operations is very similar to the
113+
the storage system. The syntax for these operations is very similar to the
113114
`files-copy` command syntax. Here are some common examples:
114115
```
115116
# Rename a file in place
@@ -130,15 +131,16 @@ $ files-move -S data-tacc-work-username -D sd2e-data/subfolder/renamed.txt sd2e-
130131
```
131132

132133
Be cautious with `files-move` and `files-delete` commands. Just like a Linux
133-
filesystem, files inadvertently deleted or written over are probably unrecoverable.
134+
filesystem, files inadvertently deleted or written over are most likely
135+
unrecoverable.
134136

135137

136138
<br>
137139
#### File or folder history
138140

139141
You can list the history of events for a specific file or folder. This will give
140142
more descriptive information (when applicable) related to number of retries, permission
141-
grants and revocations, reasons for failure, and hiccups that may have occurred in
143+
grants and revocations, reasons for failure, and hiccups that may have occurred in
142144
the transfer process.
143145
```
144146
% files-history -S data-tacc-work-username sd2e-data/my_copy.txt
@@ -150,7 +152,7 @@ File item copied from https://api.sd2e.org/files/v2/media/system/data-tacc-work-
150152

151153
Reminder: at any time, you can issue an Agave command with the `-h` flag to
152154
find more information on the function and usage of the command. Extensive Agave
153-
documentation can be found [here](https://tacc.github.io/developer.tacc.cloud/).
155+
documentation can be found [here](http://developer.tacc.cloud/).
154156

155157
---
156158
Return to the [API Documentation Overview](../index.md)

docs/share_import.md renamed to docs/02.03.share_import.md

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ View your own user profile by issuing:
3535
"phone": "",
3636
"mobile_phone": "",
3737
"status": "",
38-
"create_time": "20150223162108Z",
38+
"create_time": "20150223162108Z",
3939
"username": "juser"
4040
}
4141
```
@@ -44,24 +44,19 @@ Each of the fields stored in the JSON object is queryable using the profiles-sea
4444
command. Some more common examples include:
4545
```
4646
# Search for another user by first name
47-
% profiles-search --rich 'first_name=Joe'
47+
% profiles-search --rich --filter first_name,last_name,email,username 'first_name=Joe'
4848
4949
# Search for another user by last name
50-
% profiles-search --rich 'last_name=User'
50+
% profiles-search --rich --filter first_name,last_name,email,username 'last_name=User'
5151
5252
# Search for another user by e-mail address
53-
% profiles-search --rich '[email protected]'
54-
55-
# Search for another user by guessing all or part of their username
56-
% profiles-search --rich 'username.like=*juser*'
53+
% profiles-search --rich --filter first_name,last_name,email,username '[email protected]'
5754
```
5855

59-
The `--rich` flag summarizes part of the JSON response in a human-friendly table.
56+
The `--rich` flag summarizes part of the JSON response in a human-friendly
57+
table, and the `--filter` flag specifies which of the available fields you would
58+
like to see.
6059

61-
Note: There is a file called 'richtext' in the CLI bin directory that needs to
62-
be updated for `profiles-search`. Fields were changed as some point from `firstName`
63-
and `lastName` to `first_name` and `last_name`. Also, `institution` is no longer
64-
a field so it must be removed.
6560

6661
<br>
6762
#### Share files with another user
@@ -79,8 +74,8 @@ username READ WRITE EXECUTE
7974
vaughn READ WRITE EXECUTE
8075
```
8176

82-
To add permissions for another user to view the file, use the `files-pems-update`
83-
command:
77+
To add permissions for another user (in this case with username '`collaborator`')
78+
to view the file, use the `files-pems-update` command:
8479
```
8580
% files-pems-update -U collaborator -P ALL sd2e-data/my_file.txt
8681
% files-pems-list -S data-tacc-work-username sd2e-data/my_file.txt
@@ -107,7 +102,7 @@ username ADMIN
107102

108103
To add your collaborator to your system, use the `systems-roles-addupdate` command:
109104
```
110-
% systems-roles-addupdate -u collaborator -r GUEST data-tacc-work-username
105+
% systems-roles-addupdate -u collaborator -r GUEST data-tacc-work-username
111106
Successfully updated roles for user collaborator on data-tacc-work-username
112107
113108
% systems-roles-list data-tacc-work-username
@@ -118,7 +113,7 @@ username ADMIN
118113
```
119114

120115
Now, a user with username `collaborator` can see files with the appropriate
121-
permissions on your STORAGE system. Valid values for setting a role with the `-r`
116+
permissions on your STORAGE system. Valid values for setting a role with the `-r`
122117
flag are GUEST, USER, PUBLISHER, ADMIN, and OWNER.
123118

124119
Finally, ask your collaborator to download the file with the exact same command
@@ -134,14 +129,15 @@ you use to download the file:
134129
Another convenient way to share data is the Agave postits service. Postits
135130
generate a short URL with a user-specified lifetime and limited number of uses.
136131
Anyone with the URL can paste it into a web browser, or curl against it on the
137-
command line. To create a postit:
132+
command line. To create a postit:
138133
```
139-
% postits-create -m 5 -l 3600 https://api.sd2e.org/files/v2/media/system/data-tacc-work-username/sd2e-data/my_file.txt
134+
% postits-create -m 5 -l 3600 \
135+
https://api.sd2e.org/files/v2/media/system/data-tacc-work-username/sd2e-data/my_file.txt
140136
```
141137

142-
The json response from this command is the URL, e.g.:
138+
The json response from this command is a URL, e.g.:
143139

144-
```
140+
```
145141
https://api.sd2e.org/postits/v2/866d55b36a459e8098173655e916fa15
146142
```
147143

@@ -168,11 +164,11 @@ for that purpose.
168164
```
169165

170166
With the above syntax, the file located at the root directory on the
171-
`data-sd2e-community` STORAGE system will be imported to your private STORAGE
167+
`data-sd2e-community` storage system will be imported to your private storage
172168
system, and placed in your directory `sd2e-data/`.
173169

174170
Please also note that even though you are *able* to import files from other
175-
Agave STORAGE systems, you may not always *need* to import those files. Most
171+
Agave storage systems, you may not always *need* to import those files. Most
176172
applications of Agave will allow you to provide a complete URI path to the file,
177173
e.g. `agave://data-sd2e-community/public_data.dat`. This is useful, for example,
178174
in the case of large reference libraries. Pointing to the remote libraries

docs/find_application.md renamed to docs/02.04.find_application.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Find an Application
44
tagline:
55
---
66

7-
The SD2E catalog has several pre-built public applications (or "apps" for short)
7+
The SD2E catalog has several pre-built public applications (or "apps" for short)
88
that are available to run right now. Each public application is tied to a public
99
HPC system.
1010

@@ -14,6 +14,7 @@ HPC system.
1414
The `apps-list` command can be used to list all applications you have access to:
1515
```
1616
% apps-list
17+
1718
fastqc-0.11.5u2
1819
fcs-etl-0.3.3u3
1920
fcs-tasbe-0.2.0u6
@@ -24,6 +25,7 @@ kallisto-0.43.1u3
2425
lcms-maverick-0.1.0u2
2526
lcms-maverick-0.1.0u3
2627
lcms-pyquant-0.1.0u1
28+
lcms-pyquant-0.1.1u1
2729
lcms-wrangler-0.1.0u2
2830
lcms-wrangler-0.1.0u3
2931
msf-0.1.0u3
@@ -214,9 +216,9 @@ The `inputs` section describe what input data are required for running this app:
214216
],
215217
```
216218

217-
It appears this app is expecting three files as inputs, identified by the `id`
218-
field: `transcripts`, `fastq1`, and `fastq2`. Each has a short description, and
219-
all three are required to run this app.
219+
This app is expecting three files as inputs, identified by the `id` field:
220+
`transcripts`, `fastq1`, and `fastq2`. Each has a short description, and all
221+
three are required (`"required": true`) to run this app.
220222

221223
<br>
222224
#### The `parameters` section
@@ -306,7 +308,7 @@ Next, inspect the `parameters` section of the app json file:
306308
```
307309

308310
It is also expecting three parameters, identified by the `id` field: `bootstrap`,
309-
`seed`, and `output`. This time, only the `output` parameter is requried. The
311+
`seed`, and `output`. This time, only the `output` parameter is requried. The
310312
purpose and acceptable values for each parameter are provided in the description.
311313

312314
<br>
@@ -363,9 +365,9 @@ Here, we see two outputs are created when running this app: `abundance` and
363365
However, this is an important clue (along with the inputs, parameters, and app
364366
description) to indicate what is the function of this app.
365367

366-
Once the appropriate app has been identified, the next steps are to
367-
[stage the input data](data_management.md), and to
368-
[prepare and submit a job](submit_job).
368+
Once the appropriate app has been identified, the next steps are to
369+
[stage the input data](02.02.data_management.md), and to
370+
[prepare and submit a job](02.05.submit_job).
369371

370372
---
371373
Return to the [API Documentation Overview](../index.md)

0 commit comments

Comments
 (0)