Skip to content
This repository has been archived by the owner on Sep 18, 2023. It is now read-only.

Commit

Permalink
demo fixes (#167)
Browse files Browse the repository at this point in the history
* fixes: mentor-client:1.2.4 fixes one-mentor in guest session bug

* improvement: adds automated tests

* fixes: removes unused package-lock.json

* fix pyenv for test

* fixes: replace 'shit' with 'shift' in transcripts

* fixes: dan-burns fails to answer recommended questions

- what are the most important first steps?
- How do you set the tone?
- What are the most common mistakes?
- What problems can be rooted out early?

* improvement: delete dupe .vtt files for dan burns

* fixes: mentor-pipeline:1.4.1 fixes bugs in noise-reduction

* fixes: offset timing in jd_thomas videos from session 2, part 2
  • Loading branch information
beatthat authored May 16, 2020
1 parent 886374e commit 78c67c8
Show file tree
Hide file tree
Showing 131 changed files with 1,998 additions and 1,628 deletions.
20 changes: 19 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ executors:
python:
docker:
- image: circleci/python:3.6.9
tests-dockerized:
machine:
image: ubuntu-1604:201903-01
docker_layer_caching: true
aliases:
# setup env vars for ebs tools
- &dev-mentorpal-env-init
Expand Down Expand Up @@ -101,15 +105,29 @@ jobs:
- *git-lfs-pull
- run: *prod-mentorpal-env-init
- run: *eb-deploy
test:
executor: tests-dockerized
steps:
- run:
name: "Set Python Version"
command: pyenv global 3.7.0
- *git-lfs-install
- checkout
- run: git submodule init && git submodule update --remote
- *git-lfs-pull
- run: make test
workflows:
version: 2
build-test-deploy:
jobs:
- checkout-revision-setup
- test:
requires:
- checkout-revision-setup
- approve-dev-deploy:
type: approval
requires:
- checkout-revision-setup
- test
- dev-ebs-deploy:
requires:
- approve-dev-deploy
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "behave-restful"]
path = behave-restful
url = https://github.com/beatthat/behave-restful.git
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ venv-create:

.PHONY: run
run: $(VENV)
$(VENV)/bin/docker-compose up
$(VENV)/bin/docker-compose up $(args)

.PHONY: run-local-lrs-%
run-local-lrs-%: $(VENV)
Expand Down Expand Up @@ -84,3 +84,7 @@ endif
env/lrs/%/rebuild: env/%/.env
rm -f env/lrs/$*/.env.enc
$(MAKE) env/lrs/$*/.env.enc

.PHONY: test
test:
cd tests && $(MAKE) test
1 change: 1 addition & 0 deletions behave-restful
Submodule behave-restful added at 9df737
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.7'
services:
web-app:
image: "uscictdocker/mentor-client:1.2.3"
image: "uscictdocker/mentor-client:1.2.4"
expose:
- "3000"
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion ebs/bundle/Dockerrun.aws.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"containerDefinitions": [
{
"name": "web-app",
"image": "uscictdocker/mentor-client:1.2.3",
"image": "uscictdocker/mentor-client:1.2.4",
"portMappings": [
{
"hostPort": 3000,
Expand Down
2 changes: 1 addition & 1 deletion mentors/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
PWD=$(shell pwd)
AWS_ACCESS_KEY_ID?=required_if_using_aws_transcribe
AWS_SECRET_ACCESS_KEY?=required_if_using_aws_transcribe
DOCKER_IMAGE?=uscictdocker/mentor-pipeline:1.4.0
DOCKER_IMAGE?=uscictdocker/mentor-pipeline:1.4.1
DOCKER_CONTAINER=mentor-pipeline
PROJECT_ROOT?=$(shell git rev-parse --show-toplevel 2> /dev/null)
AWS_REGION?=us-east-1
Expand Down
34 changes: 17 additions & 17 deletions mentors/data/mentors/dan-burns/.mentor/utterances.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ utterances:
- Relocating
transcript: So I moved 17 times in my baby seventies. It's a lot of ghosts. Frankly,
before I was married, I I didn't have a care I would move anywhere to do to get
the job. I wanted to be in California, all the shit those born and raised in Brooklyn.
the job. I wanted to be in California, all the shift those born and raised in Brooklyn.
So I took the first ship I could find out of the West Coast. After that, the detailers
would call me and say, You've done a bang up job and now we've got a tour for
you on the USS Fife on the life was coming out of the yards. San Diego and going
Expand Down Expand Up @@ -1093,7 +1093,7 @@ utterances:
things is when you do come in from being out at sea. Hey, there's a tendency to
goto four. Go to the four winds. And you know what? You really want to try to
go to some of the command functions and try to go and see. Talk about Hey, what
is that? What is that squadron doing? What is that shit? Do it. Where? What? What
is that? What is that squadron doing? What is that shift? Do it. Where? What? What
is that? And that frigates And that, Um do A L. C. S ships coming out. You want
to find out as much so they can tell you and shape where you'd like to go with
you.
Expand All @@ -1120,7 +1120,7 @@ utterances:
dunmore scuba to prepare for being a seal for to prepare them to be buds. Um,
eight years, there was some time at the academy that would've been available to
me to go the flying club and a couple private pilot's license. Now, I didn't do
that for some of the shit driver recommend something like that. There are flying
that for some of the shift driver recommend something like that. There are flying
skills, if you could understand flying an aircraft, and that would be important
also, because in this this day of drones Okay, we're gonna be using drones in
every aspect of naval warfare. So if you can learn to pilot a drone and have that
Expand Down Expand Up @@ -1256,7 +1256,7 @@ utterances:
there to be differences. You've got the skills to go ahead and perform. So remember,
for the most part, all ships go all planes go for we'll go for so you might be
tempted. Do you think I didn't do that on my last ship. You know, your last ship,
You do shit. And that's the way you're gonna perform on your new ship going forward
You do shift. And that's the way you're gonna perform on your new ship going forward
on the journey, protecting the nation on the mission.
utteranceAudio: build/utterance_audio/s001p006s00075947e00094043.mp3
utteranceType: _ANSWER_
Expand Down Expand Up @@ -1325,7 +1325,7 @@ utterances:
mentor: dan-burns
paraphrases: []
part: 6
question: What is critical to review when you start on a new ship?
question: What are the most important first steps?
session: 1
sessionAudio: build/recordings/sessions/s1_p003.mp3
sessionTimestamps: build/recordings/sessions/s1_p003.csv
Expand Down Expand Up @@ -1625,7 +1625,7 @@ utterances:
mentor: dan-burns
paraphrases: []
part: 8
question: What things do you always make sure to lead by example on?
question: How do you set the tone?
session: 1
sessionAudio: build/recordings/sessions/s2_p002.mp3
sessionTimestamps: build/recordings/sessions/s2_p002.csv
Expand Down Expand Up @@ -1707,9 +1707,9 @@ utterances:
engineers win. I didn't score one. Most amazing. So I was a farmer. I do, but
just there's gonna be a lot of examples. Where? Mushroom walking a while. You
won't find these examples. If you stay in your state grow if you stay in the water.
Okay. You're not gonna want your shit. You're not gonna learn that. It is not
Okay. You're not gonna want your shift. You're not gonna learn that. It is not
a good way to start your career. You want to walk around, You want to know your
shit, You want you.
shift, You want you.
utteranceAudio: build/utterance_audio/s001p008s00063590e00101387.mp3
utteranceType: _ANSWER_
utteranceVideo: build/utterance_video/s001p008s00063590e00101387.mp4
Expand Down Expand Up @@ -2053,7 +2053,7 @@ utterances:
on. That was a long slog. It was a very long to do that. I can tell you that at
the end of the day should earn the engineering feat that 12 years, I believe the
only trophy that was in the days when only one ship this water was a fleet of
shit. So that was the situation. If you're more than a situation where Dean is
shift. So that was the situation. If you're more than a situation where Dean is
right, you have a copy on just past Raftery. Everything's great. They built with
centered Sam. Just stay up on that razor's edge. Stay tight. Stay sharp. Don't
slack off
Expand Down Expand Up @@ -2317,7 +2317,7 @@ utterances:
commanding also don't want responsible? The ship was responsible, of course, but
technically, you know the dry dock. Captain Holden's ship that point and the contractors
are charge of breaking down kids cutting up the ship. It's stalling new equipment
and making that shit better. So at that point, the contractors become important.
and making that shift better. So at that point, the contractors become important.
Very. During intubated intermediate maintenance of Elba lose the I am a.
utteranceAudio: build/utterance_audio/s001p011s00144466e00163647.mp3
utteranceType: _ANSWER_
Expand Down Expand Up @@ -2426,7 +2426,7 @@ utterances:
you know, football games or help the group Go do something. Yeah, they will get
to go to this is gonna be all kinds of things. Getting award out is the most,
of course, because people just wanted to try to plan their lives a little bit.
Have all shit a lot. You can't help that.
Have all shift a lot. You can't help that.
utteranceAudio: build/utterance_audio/s001p011s00233517e00252500.mp3
utteranceType: _ANSWER_
utteranceVideo: build/utterance_video/s001p011s00233517e00252500.mp4
Expand Down Expand Up @@ -3674,7 +3674,7 @@ utterances:
timeStart: 2449.9
topics: []
transcript: his way is high favorite movie of all time, so unwilling it's about
going out shit drivers, more war in harm's way
going out shift drivers, more war in harm's way
utteranceAudio: build/utterance_audio/s001p013s00404990e00410510.mp3
utteranceType: _ANSWER_
utteranceVideo: build/utterance_video/s001p013s00404990e00410510.mp4
Expand Down Expand Up @@ -3963,7 +3963,7 @@ utterances:
mission. We'll see what we'll do, says it's about three months or so before you're
totally comfortable. You say if I got a glass and watches per se unless you off
ship second called with the ins and outs of your ship Morning, I just get around
your shit. That's always you could do.
your shift. That's always you could do.
utteranceAudio: build/utterance_audio/s001p014s00043066e00052680.mp3
utteranceType: _ANSWER_
utteranceVideo: build/utterance_video/s001p014s00043066e00052680.mp4
Expand Down Expand Up @@ -4223,7 +4223,7 @@ utterances:
to know what it's gonna take to know how long I could take it. Something turned
up there was going to do that. That's about anything that was physically dangerous.
Um, those times when I had one of the aircraft crash on deck when I had a crash
explosion on deck without operation was a lot of shit on the last example. Physically
explosion on deck without operation was a lot of shift on the last example. Physically
dangerous. Naoto, our connection from our to the ship blew up on the second ship
on that far had to be put out. Obviously it's Charlie Fire Wade, isolate our fire
out. So you see here normally also bomb. It's exciting. Every now and again, it
Expand Down Expand Up @@ -4339,7 +4339,7 @@ utterances:
transcript: so fatigued work. It does happen. You know, uh, it's they say, that
the navy runs on coffee. Saw lot smaller, that war to control the nineties on.
Personally, I was always a great judge of bad coffee because we didn't have a
Starbucks on for my shit actual form our ships weeding out Starbucks. You could
Starbucks on for my shift actual form our ships weeding out Starbucks. You could
maybe go to a start. But we didn't have Starbucks. That stuff on fancy electrolytes
and all that good stuff. So we'll handle fatigue. Goes back to the old phrase
of our many wooden ships. You have to be in shape. You after your coffee, you
Expand Down Expand Up @@ -4759,7 +4759,7 @@ utterances:
transcript: much free time did I have during my career? That much is, if underway
your other way? Obviously, that's 24 7365 And you're always on board the ship
on, then import as bad. But you're principally important. You're tied to your
shit. You're always there. And then, well, short duty. That was the most free
shift. You're always there. And then, well, short duty. That was the most free
time I've had. But I was pretty much longer My job or I was a student at the Naval
Force Graduate School.
utteranceAudio: build/utterance_audio/s001p016s00021000e00025333.mp3
Expand Down Expand Up @@ -5575,7 +5575,7 @@ utterances:
- Relocating
transcript: benefits can you take advantage of as a junior officer of the education
One, Go get your master's degree on the Navy That the Navy pay for that. Um, you
want a little, You know, I am a shit driver. I did have an opportunity early on.
want a little, You know, I am a shift driver. I did have an opportunity early on.
Was that moderate? I could have changed Group Pass. They were looking for nuclear.
Dr. Officers, at that point, I did not want to go to a carrier. That was all it
was. A lot of junior class cruisers were gone that for So I did not want to go
Expand Down
Loading

0 comments on commit 78c67c8

Please sign in to comment.