diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b918a73 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,35 @@ +FROM ubuntu:14.04 + +RUN apt-get update && apt-get install -y \ + pkg-config \ + libpng-dev \ + libjpeg8-dev \ + libfreetype6-dev \ + libblas-dev \ + liblapack-dev \ + libatlas-base-dev \ + gfortran \ + python \ + python-dev \ + python-pip \ + curl && \ + curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash - && \ + apt-get install -y nodejs + +RUN npm install webpack -g + +RUN pip install -U https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.11.0rc2-cp27-none-linux_x86_64.whl && \ + pip install magenta ipython + +COPY ./server/requirements.txt /tmp/ +RUN pip install -r /tmp/requirements.txt + +COPY . /src/ + +WORKDIR /src/static/ +RUN npm install && webpack -p + +WORKDIR /src/server/ + +EXPOSE 8080 +ENTRYPOINT python server.py diff --git a/README.md b/README.md index 39a9a5d..1742dcd 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,15 @@ Built by [Yotam Mann](https://github.com/tambien) with friends on the Magenta an A.I. Duet is composed of two parts, the front-end which is in the 'static' folder and the back-end which is in the 'server' folder. The front-end client creates short midi files using the user's input which is sent to the server. The server takes that midi input and continues it using [Magenta](https://github.com/tensorflow/magenta) which is then returned back to the client. +## DOCKER + +```bash +$ sudo docker build -t ai-duet . +$ sudo docker run -t -p 8080:8080 ai-duet +``` + +You can now play with A.I. Duet at [localhost:8080](http://localhost:8080). + ## FRONT END To build the client-side javascript, first install [node](https://nodejs.org) and [webpack](https://webpack.github.io/). Then you can install of the dependencies of the project by typing the following in the terminal: diff --git a/server/third_party/magenta/BUILD b/server/magenta/BUILD similarity index 100% rename from server/third_party/magenta/BUILD rename to server/magenta/BUILD diff --git a/server/third_party/magenta/LICENSE.txt b/server/magenta/LICENSE.txt similarity index 100% rename from server/third_party/magenta/LICENSE.txt rename to server/magenta/LICENSE.txt diff --git a/server/third_party/magenta/__init__.py b/server/magenta/__init__.py similarity index 100% rename from server/third_party/magenta/__init__.py rename to server/magenta/__init__.py diff --git a/server/third_party/magenta/basic_rnn.mag b/server/magenta/basic_rnn.mag similarity index 100% rename from server/third_party/magenta/basic_rnn.mag rename to server/magenta/basic_rnn.mag diff --git a/server/third_party/magenta/common/BUILD b/server/magenta/common/BUILD similarity index 100% rename from server/third_party/magenta/common/BUILD rename to server/magenta/common/BUILD diff --git a/server/third_party/__init__.py b/server/magenta/common/__init__.py similarity index 100% rename from server/third_party/__init__.py rename to server/magenta/common/__init__.py diff --git a/server/third_party/magenta/common/sequence_example_lib.py b/server/magenta/common/sequence_example_lib.py similarity index 100% rename from server/third_party/magenta/common/sequence_example_lib.py rename to server/magenta/common/sequence_example_lib.py diff --git a/server/third_party/magenta/common/testing_lib.py b/server/magenta/common/testing_lib.py similarity index 100% rename from server/third_party/magenta/common/testing_lib.py rename to server/magenta/common/testing_lib.py diff --git a/server/third_party/magenta/common/tf_lib.py b/server/magenta/common/tf_lib.py similarity index 100% rename from server/third_party/magenta/common/tf_lib.py rename to server/magenta/common/tf_lib.py diff --git a/server/third_party/magenta/interfaces/BUILD b/server/magenta/interfaces/BUILD similarity index 100% rename from server/third_party/magenta/interfaces/BUILD rename to server/magenta/interfaces/BUILD diff --git a/server/third_party/magenta/common/__init__.py b/server/magenta/interfaces/__init__.py similarity index 100% rename from server/third_party/magenta/common/__init__.py rename to server/magenta/interfaces/__init__.py diff --git a/server/third_party/magenta/interfaces/midi/BUILD b/server/magenta/interfaces/midi/BUILD similarity index 100% rename from server/third_party/magenta/interfaces/midi/BUILD rename to server/magenta/interfaces/midi/BUILD diff --git a/server/third_party/magenta/interfaces/midi/README.md b/server/magenta/interfaces/midi/README.md similarity index 100% rename from server/third_party/magenta/interfaces/midi/README.md rename to server/magenta/interfaces/midi/README.md diff --git a/server/third_party/magenta/interfaces/midi/magenta_midi.py b/server/magenta/interfaces/midi/magenta_midi.py similarity index 100% rename from server/third_party/magenta/interfaces/midi/magenta_midi.py rename to server/magenta/interfaces/midi/magenta_midi.py diff --git a/server/third_party/magenta/interfaces/midi/midi.png b/server/magenta/interfaces/midi/midi.png similarity index 100% rename from server/third_party/magenta/interfaces/midi/midi.png rename to server/magenta/interfaces/midi/midi.png diff --git a/server/third_party/magenta/models/README.md b/server/magenta/models/README.md similarity index 100% rename from server/third_party/magenta/models/README.md rename to server/magenta/models/README.md diff --git a/server/third_party/magenta/interfaces/__init__.py b/server/magenta/models/__init__.py similarity index 100% rename from server/third_party/magenta/interfaces/__init__.py rename to server/magenta/models/__init__.py diff --git a/server/third_party/magenta/models/attention_rnn/BUILD b/server/magenta/models/attention_rnn/BUILD similarity index 100% rename from server/third_party/magenta/models/attention_rnn/BUILD rename to server/magenta/models/attention_rnn/BUILD diff --git a/server/third_party/magenta/models/attention_rnn/README.md b/server/magenta/models/attention_rnn/README.md similarity index 100% rename from server/third_party/magenta/models/attention_rnn/README.md rename to server/magenta/models/attention_rnn/README.md diff --git a/server/third_party/magenta/models/__init__.py b/server/magenta/models/attention_rnn/__init__.py similarity index 100% rename from server/third_party/magenta/models/__init__.py rename to server/magenta/models/attention_rnn/__init__.py diff --git a/server/third_party/magenta/models/attention_rnn/attention_rnn_create_dataset.py b/server/magenta/models/attention_rnn/attention_rnn_create_dataset.py similarity index 100% rename from server/third_party/magenta/models/attention_rnn/attention_rnn_create_dataset.py rename to server/magenta/models/attention_rnn/attention_rnn_create_dataset.py diff --git a/server/third_party/magenta/models/attention_rnn/attention_rnn_encoder_decoder.py b/server/magenta/models/attention_rnn/attention_rnn_encoder_decoder.py similarity index 100% rename from server/third_party/magenta/models/attention_rnn/attention_rnn_encoder_decoder.py rename to server/magenta/models/attention_rnn/attention_rnn_encoder_decoder.py diff --git a/server/third_party/magenta/models/attention_rnn/attention_rnn_generate.py b/server/magenta/models/attention_rnn/attention_rnn_generate.py similarity index 100% rename from server/third_party/magenta/models/attention_rnn/attention_rnn_generate.py rename to server/magenta/models/attention_rnn/attention_rnn_generate.py diff --git a/server/third_party/magenta/models/attention_rnn/attention_rnn_generator.py b/server/magenta/models/attention_rnn/attention_rnn_generator.py similarity index 100% rename from server/third_party/magenta/models/attention_rnn/attention_rnn_generator.py rename to server/magenta/models/attention_rnn/attention_rnn_generator.py diff --git a/server/third_party/magenta/models/attention_rnn/attention_rnn_graph.py b/server/magenta/models/attention_rnn/attention_rnn_graph.py similarity index 100% rename from server/third_party/magenta/models/attention_rnn/attention_rnn_graph.py rename to server/magenta/models/attention_rnn/attention_rnn_graph.py diff --git a/server/third_party/magenta/models/attention_rnn/attention_rnn_train.py b/server/magenta/models/attention_rnn/attention_rnn_train.py similarity index 100% rename from server/third_party/magenta/models/attention_rnn/attention_rnn_train.py rename to server/magenta/models/attention_rnn/attention_rnn_train.py diff --git a/server/third_party/magenta/models/basic_rnn/BUILD b/server/magenta/models/basic_rnn/BUILD similarity index 100% rename from server/third_party/magenta/models/basic_rnn/BUILD rename to server/magenta/models/basic_rnn/BUILD diff --git a/server/third_party/magenta/models/basic_rnn/README.md b/server/magenta/models/basic_rnn/README.md similarity index 100% rename from server/third_party/magenta/models/basic_rnn/README.md rename to server/magenta/models/basic_rnn/README.md diff --git a/server/third_party/magenta/models/attention_rnn/__init__.py b/server/magenta/models/basic_rnn/__init__.py similarity index 100% rename from server/third_party/magenta/models/attention_rnn/__init__.py rename to server/magenta/models/basic_rnn/__init__.py diff --git a/server/third_party/magenta/models/basic_rnn/basic_rnn_create_dataset.py b/server/magenta/models/basic_rnn/basic_rnn_create_dataset.py similarity index 100% rename from server/third_party/magenta/models/basic_rnn/basic_rnn_create_dataset.py rename to server/magenta/models/basic_rnn/basic_rnn_create_dataset.py diff --git a/server/third_party/magenta/models/basic_rnn/basic_rnn_encoder_decoder.py b/server/magenta/models/basic_rnn/basic_rnn_encoder_decoder.py similarity index 100% rename from server/third_party/magenta/models/basic_rnn/basic_rnn_encoder_decoder.py rename to server/magenta/models/basic_rnn/basic_rnn_encoder_decoder.py diff --git a/server/third_party/magenta/models/basic_rnn/basic_rnn_generate.py b/server/magenta/models/basic_rnn/basic_rnn_generate.py similarity index 100% rename from server/third_party/magenta/models/basic_rnn/basic_rnn_generate.py rename to server/magenta/models/basic_rnn/basic_rnn_generate.py diff --git a/server/third_party/magenta/models/basic_rnn/basic_rnn_generator.py b/server/magenta/models/basic_rnn/basic_rnn_generator.py similarity index 100% rename from server/third_party/magenta/models/basic_rnn/basic_rnn_generator.py rename to server/magenta/models/basic_rnn/basic_rnn_generator.py diff --git a/server/third_party/magenta/models/basic_rnn/basic_rnn_graph.py b/server/magenta/models/basic_rnn/basic_rnn_graph.py similarity index 100% rename from server/third_party/magenta/models/basic_rnn/basic_rnn_graph.py rename to server/magenta/models/basic_rnn/basic_rnn_graph.py diff --git a/server/third_party/magenta/models/basic_rnn/basic_rnn_train.py b/server/magenta/models/basic_rnn/basic_rnn_train.py similarity index 100% rename from server/third_party/magenta/models/basic_rnn/basic_rnn_train.py rename to server/magenta/models/basic_rnn/basic_rnn_train.py diff --git a/server/third_party/magenta/models/basic_rnn/run_basic_rnn_train.sh b/server/magenta/models/basic_rnn/run_basic_rnn_train.sh similarity index 100% rename from server/third_party/magenta/models/basic_rnn/run_basic_rnn_train.sh rename to server/magenta/models/basic_rnn/run_basic_rnn_train.sh diff --git a/server/third_party/magenta/models/lookback_rnn/BUILD b/server/magenta/models/lookback_rnn/BUILD similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/BUILD rename to server/magenta/models/lookback_rnn/BUILD diff --git a/server/third_party/magenta/models/lookback_rnn/README.md b/server/magenta/models/lookback_rnn/README.md similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/README.md rename to server/magenta/models/lookback_rnn/README.md diff --git a/server/third_party/magenta/models/basic_rnn/__init__.py b/server/magenta/models/lookback_rnn/__init__.py similarity index 100% rename from server/third_party/magenta/models/basic_rnn/__init__.py rename to server/magenta/models/lookback_rnn/__init__.py diff --git a/server/third_party/magenta/models/lookback_rnn/lookback_rnn_create_dataset.py b/server/magenta/models/lookback_rnn/lookback_rnn_create_dataset.py similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/lookback_rnn_create_dataset.py rename to server/magenta/models/lookback_rnn/lookback_rnn_create_dataset.py diff --git a/server/third_party/magenta/models/lookback_rnn/lookback_rnn_encoder_decoder.py b/server/magenta/models/lookback_rnn/lookback_rnn_encoder_decoder.py similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/lookback_rnn_encoder_decoder.py rename to server/magenta/models/lookback_rnn/lookback_rnn_encoder_decoder.py diff --git a/server/third_party/magenta/models/lookback_rnn/lookback_rnn_generate.py b/server/magenta/models/lookback_rnn/lookback_rnn_generate.py similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/lookback_rnn_generate.py rename to server/magenta/models/lookback_rnn/lookback_rnn_generate.py diff --git a/server/third_party/magenta/models/lookback_rnn/lookback_rnn_generator.py b/server/magenta/models/lookback_rnn/lookback_rnn_generator.py similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/lookback_rnn_generator.py rename to server/magenta/models/lookback_rnn/lookback_rnn_generator.py diff --git a/server/third_party/magenta/models/lookback_rnn/lookback_rnn_graph.py b/server/magenta/models/lookback_rnn/lookback_rnn_graph.py similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/lookback_rnn_graph.py rename to server/magenta/models/lookback_rnn/lookback_rnn_graph.py diff --git a/server/third_party/magenta/models/lookback_rnn/lookback_rnn_train.py b/server/magenta/models/lookback_rnn/lookback_rnn_train.py similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/lookback_rnn_train.py rename to server/magenta/models/lookback_rnn/lookback_rnn_train.py diff --git a/server/third_party/magenta/models/shared/BUILD b/server/magenta/models/shared/BUILD similarity index 100% rename from server/third_party/magenta/models/shared/BUILD rename to server/magenta/models/shared/BUILD diff --git a/server/third_party/magenta/models/shared/README.md b/server/magenta/models/shared/README.md similarity index 100% rename from server/third_party/magenta/models/shared/README.md rename to server/magenta/models/shared/README.md diff --git a/server/third_party/magenta/models/lookback_rnn/__init__.py b/server/magenta/models/shared/__init__.py similarity index 100% rename from server/third_party/magenta/models/lookback_rnn/__init__.py rename to server/magenta/models/shared/__init__.py diff --git a/server/third_party/magenta/models/shared/melody_rnn_create_dataset.py b/server/magenta/models/shared/melody_rnn_create_dataset.py similarity index 100% rename from server/third_party/magenta/models/shared/melody_rnn_create_dataset.py rename to server/magenta/models/shared/melody_rnn_create_dataset.py diff --git a/server/third_party/magenta/models/shared/melody_rnn_create_dataset_test.py b/server/magenta/models/shared/melody_rnn_create_dataset_test.py similarity index 100% rename from server/third_party/magenta/models/shared/melody_rnn_create_dataset_test.py rename to server/magenta/models/shared/melody_rnn_create_dataset_test.py diff --git a/server/third_party/magenta/models/shared/melody_rnn_generate.py b/server/magenta/models/shared/melody_rnn_generate.py similarity index 100% rename from server/third_party/magenta/models/shared/melody_rnn_generate.py rename to server/magenta/models/shared/melody_rnn_generate.py diff --git a/server/third_party/magenta/models/shared/melody_rnn_graph.py b/server/magenta/models/shared/melody_rnn_graph.py similarity index 100% rename from server/third_party/magenta/models/shared/melody_rnn_graph.py rename to server/magenta/models/shared/melody_rnn_graph.py diff --git a/server/third_party/magenta/models/shared/melody_rnn_graph_test.py b/server/magenta/models/shared/melody_rnn_graph_test.py similarity index 100% rename from server/third_party/magenta/models/shared/melody_rnn_graph_test.py rename to server/magenta/models/shared/melody_rnn_graph_test.py diff --git a/server/third_party/magenta/models/shared/melody_rnn_sequence_generator.py b/server/magenta/models/shared/melody_rnn_sequence_generator.py similarity index 100% rename from server/third_party/magenta/models/shared/melody_rnn_sequence_generator.py rename to server/magenta/models/shared/melody_rnn_sequence_generator.py diff --git a/server/third_party/magenta/models/shared/melody_rnn_train.py b/server/magenta/models/shared/melody_rnn_train.py similarity index 100% rename from server/third_party/magenta/models/shared/melody_rnn_train.py rename to server/magenta/models/shared/melody_rnn_train.py diff --git a/server/third_party/magenta/models/shared/primer.mid b/server/magenta/models/shared/primer.mid similarity index 100% rename from server/third_party/magenta/models/shared/primer.mid rename to server/magenta/models/shared/primer.mid diff --git a/server/third_party/magenta/music/BUILD b/server/magenta/music/BUILD similarity index 100% rename from server/third_party/magenta/music/BUILD rename to server/magenta/music/BUILD diff --git a/server/third_party/magenta/models/shared/__init__.py b/server/magenta/music/__init__.py similarity index 100% rename from server/third_party/magenta/models/shared/__init__.py rename to server/magenta/music/__init__.py diff --git a/server/third_party/magenta/music/chord_symbols_lib.py b/server/magenta/music/chord_symbols_lib.py similarity index 100% rename from server/third_party/magenta/music/chord_symbols_lib.py rename to server/magenta/music/chord_symbols_lib.py diff --git a/server/third_party/magenta/music/chord_symbols_lib_test.py b/server/magenta/music/chord_symbols_lib_test.py similarity index 100% rename from server/third_party/magenta/music/chord_symbols_lib_test.py rename to server/magenta/music/chord_symbols_lib_test.py diff --git a/server/third_party/magenta/music/chords_lib.py b/server/magenta/music/chords_lib.py similarity index 100% rename from server/third_party/magenta/music/chords_lib.py rename to server/magenta/music/chords_lib.py diff --git a/server/third_party/magenta/music/chords_lib_test.py b/server/magenta/music/chords_lib_test.py similarity index 100% rename from server/third_party/magenta/music/chords_lib_test.py rename to server/magenta/music/chords_lib_test.py diff --git a/server/third_party/magenta/music/constants.py b/server/magenta/music/constants.py similarity index 100% rename from server/third_party/magenta/music/constants.py rename to server/magenta/music/constants.py diff --git a/server/third_party/magenta/music/events_lib.py b/server/magenta/music/events_lib.py similarity index 100% rename from server/third_party/magenta/music/events_lib.py rename to server/magenta/music/events_lib.py diff --git a/server/third_party/magenta/music/events_lib_test.py b/server/magenta/music/events_lib_test.py similarity index 100% rename from server/third_party/magenta/music/events_lib_test.py rename to server/magenta/music/events_lib_test.py diff --git a/server/third_party/magenta/music/lead_sheets_lib.py b/server/magenta/music/lead_sheets_lib.py similarity index 100% rename from server/third_party/magenta/music/lead_sheets_lib.py rename to server/magenta/music/lead_sheets_lib.py diff --git a/server/third_party/magenta/music/lead_sheets_lib_test.py b/server/magenta/music/lead_sheets_lib_test.py similarity index 100% rename from server/third_party/magenta/music/lead_sheets_lib_test.py rename to server/magenta/music/lead_sheets_lib_test.py diff --git a/server/third_party/magenta/music/melodies_lib.py b/server/magenta/music/melodies_lib.py similarity index 100% rename from server/third_party/magenta/music/melodies_lib.py rename to server/magenta/music/melodies_lib.py diff --git a/server/third_party/magenta/music/melodies_lib_test.py b/server/magenta/music/melodies_lib_test.py similarity index 100% rename from server/third_party/magenta/music/melodies_lib_test.py rename to server/magenta/music/melodies_lib_test.py diff --git a/server/third_party/magenta/music/midi_io.py b/server/magenta/music/midi_io.py similarity index 100% rename from server/third_party/magenta/music/midi_io.py rename to server/magenta/music/midi_io.py diff --git a/server/third_party/magenta/music/midi_io_test.py b/server/magenta/music/midi_io_test.py similarity index 100% rename from server/third_party/magenta/music/midi_io_test.py rename to server/magenta/music/midi_io_test.py diff --git a/server/third_party/magenta/music/music21_to_note_sequence_io.py b/server/magenta/music/music21_to_note_sequence_io.py similarity index 100% rename from server/third_party/magenta/music/music21_to_note_sequence_io.py rename to server/magenta/music/music21_to_note_sequence_io.py diff --git a/server/third_party/magenta/music/music21_to_note_sequence_io_test.py b/server/magenta/music/music21_to_note_sequence_io_test.py similarity index 100% rename from server/third_party/magenta/music/music21_to_note_sequence_io_test.py rename to server/magenta/music/music21_to_note_sequence_io_test.py diff --git a/server/third_party/magenta/music/music_xml_io.py b/server/magenta/music/music_xml_io.py similarity index 100% rename from server/third_party/magenta/music/music_xml_io.py rename to server/magenta/music/music_xml_io.py diff --git a/server/third_party/magenta/music/music_xml_io_test.py b/server/magenta/music/music_xml_io_test.py similarity index 100% rename from server/third_party/magenta/music/music_xml_io_test.py rename to server/magenta/music/music_xml_io_test.py diff --git a/server/third_party/magenta/music/note_sequence_io.py b/server/magenta/music/note_sequence_io.py similarity index 100% rename from server/third_party/magenta/music/note_sequence_io.py rename to server/magenta/music/note_sequence_io.py diff --git a/server/third_party/magenta/music/note_sequence_io_test.py b/server/magenta/music/note_sequence_io_test.py similarity index 100% rename from server/third_party/magenta/music/note_sequence_io_test.py rename to server/magenta/music/note_sequence_io_test.py diff --git a/server/third_party/magenta/music/pretty_music21.py b/server/magenta/music/pretty_music21.py similarity index 100% rename from server/third_party/magenta/music/pretty_music21.py rename to server/magenta/music/pretty_music21.py diff --git a/server/third_party/magenta/music/pretty_music21_test.py b/server/magenta/music/pretty_music21_test.py similarity index 100% rename from server/third_party/magenta/music/pretty_music21_test.py rename to server/magenta/music/pretty_music21_test.py diff --git a/server/third_party/magenta/music/sequence_generator.py b/server/magenta/music/sequence_generator.py similarity index 100% rename from server/third_party/magenta/music/sequence_generator.py rename to server/magenta/music/sequence_generator.py diff --git a/server/third_party/magenta/music/sequence_generator_bundle.py b/server/magenta/music/sequence_generator_bundle.py similarity index 100% rename from server/third_party/magenta/music/sequence_generator_bundle.py rename to server/magenta/music/sequence_generator_bundle.py diff --git a/server/third_party/magenta/music/sequence_generator_test.py b/server/magenta/music/sequence_generator_test.py similarity index 100% rename from server/third_party/magenta/music/sequence_generator_test.py rename to server/magenta/music/sequence_generator_test.py diff --git a/server/third_party/magenta/music/sequences_lib.py b/server/magenta/music/sequences_lib.py similarity index 100% rename from server/third_party/magenta/music/sequences_lib.py rename to server/magenta/music/sequences_lib.py diff --git a/server/third_party/magenta/music/sequences_lib_test.py b/server/magenta/music/sequences_lib_test.py similarity index 100% rename from server/third_party/magenta/music/sequences_lib_test.py rename to server/magenta/music/sequences_lib_test.py diff --git a/server/third_party/magenta/music/testdata/README.md b/server/magenta/music/testdata/README.md similarity index 100% rename from server/third_party/magenta/music/testdata/README.md rename to server/magenta/music/testdata/README.md diff --git a/server/third_party/magenta/music/testdata/bach-one_phrase-4_voices.xml b/server/magenta/music/testdata/bach-one_phrase-4_voices.xml similarity index 100% rename from server/third_party/magenta/music/testdata/bach-one_phrase-4_voices.xml rename to server/magenta/music/testdata/bach-one_phrase-4_voices.xml diff --git a/server/third_party/magenta/music/testdata/bach-one_phrase-note_sequence.tfrecord b/server/magenta/music/testdata/bach-one_phrase-note_sequence.tfrecord similarity index 100% rename from server/third_party/magenta/music/testdata/bach-one_phrase-note_sequence.tfrecord rename to server/magenta/music/testdata/bach-one_phrase-note_sequence.tfrecord diff --git a/server/third_party/magenta/music/testing_lib.py b/server/magenta/music/testing_lib.py similarity index 100% rename from server/third_party/magenta/music/testing_lib.py rename to server/magenta/music/testing_lib.py diff --git a/server/third_party/magenta/pipelines/BUILD b/server/magenta/pipelines/BUILD similarity index 100% rename from server/third_party/magenta/pipelines/BUILD rename to server/magenta/pipelines/BUILD diff --git a/server/third_party/magenta/pipelines/README.md b/server/magenta/pipelines/README.md similarity index 100% rename from server/third_party/magenta/pipelines/README.md rename to server/magenta/pipelines/README.md diff --git a/server/third_party/magenta/music/__init__.py b/server/magenta/pipelines/__init__.py similarity index 100% rename from server/third_party/magenta/music/__init__.py rename to server/magenta/pipelines/__init__.py diff --git a/server/third_party/magenta/pipelines/dag_pipeline.py b/server/magenta/pipelines/dag_pipeline.py similarity index 100% rename from server/third_party/magenta/pipelines/dag_pipeline.py rename to server/magenta/pipelines/dag_pipeline.py diff --git a/server/third_party/magenta/pipelines/dag_pipeline_test.py b/server/magenta/pipelines/dag_pipeline_test.py similarity index 100% rename from server/third_party/magenta/pipelines/dag_pipeline_test.py rename to server/magenta/pipelines/dag_pipeline_test.py diff --git a/server/third_party/magenta/pipelines/pipeline.py b/server/magenta/pipelines/pipeline.py similarity index 100% rename from server/third_party/magenta/pipelines/pipeline.py rename to server/magenta/pipelines/pipeline.py diff --git a/server/third_party/magenta/pipelines/pipeline_test.py b/server/magenta/pipelines/pipeline_test.py similarity index 100% rename from server/third_party/magenta/pipelines/pipeline_test.py rename to server/magenta/pipelines/pipeline_test.py diff --git a/server/third_party/magenta/pipelines/pipelines_common.py b/server/magenta/pipelines/pipelines_common.py similarity index 100% rename from server/third_party/magenta/pipelines/pipelines_common.py rename to server/magenta/pipelines/pipelines_common.py diff --git a/server/third_party/magenta/pipelines/pipelines_common_test.py b/server/magenta/pipelines/pipelines_common_test.py similarity index 100% rename from server/third_party/magenta/pipelines/pipelines_common_test.py rename to server/magenta/pipelines/pipelines_common_test.py diff --git a/server/third_party/magenta/pipelines/statistics.py b/server/magenta/pipelines/statistics.py similarity index 100% rename from server/third_party/magenta/pipelines/statistics.py rename to server/magenta/pipelines/statistics.py diff --git a/server/third_party/magenta/pipelines/statistics_test.py b/server/magenta/pipelines/statistics_test.py similarity index 100% rename from server/third_party/magenta/pipelines/statistics_test.py rename to server/magenta/pipelines/statistics_test.py diff --git a/server/third_party/magenta/protobuf/BUILD b/server/magenta/protobuf/BUILD similarity index 100% rename from server/third_party/magenta/protobuf/BUILD rename to server/magenta/protobuf/BUILD diff --git a/server/third_party/magenta/pipelines/__init__.py b/server/magenta/protobuf/__init__.py similarity index 100% rename from server/third_party/magenta/pipelines/__init__.py rename to server/magenta/protobuf/__init__.py diff --git a/server/third_party/magenta/protobuf/generator.proto b/server/magenta/protobuf/generator.proto similarity index 100% rename from server/third_party/magenta/protobuf/generator.proto rename to server/magenta/protobuf/generator.proto diff --git a/server/third_party/magenta/protobuf/generator_pb2.py b/server/magenta/protobuf/generator_pb2.py similarity index 100% rename from server/third_party/magenta/protobuf/generator_pb2.py rename to server/magenta/protobuf/generator_pb2.py diff --git a/server/third_party/magenta/protobuf/music.proto b/server/magenta/protobuf/music.proto similarity index 100% rename from server/third_party/magenta/protobuf/music.proto rename to server/magenta/protobuf/music.proto diff --git a/server/third_party/magenta/protobuf/music_pb2.py b/server/magenta/protobuf/music_pb2.py similarity index 100% rename from server/third_party/magenta/protobuf/music_pb2.py rename to server/magenta/protobuf/music_pb2.py diff --git a/server/third_party/magenta/reviews/GAN.md b/server/magenta/reviews/GAN.md similarity index 100% rename from server/third_party/magenta/reviews/GAN.md rename to server/magenta/reviews/GAN.md diff --git a/server/third_party/magenta/reviews/README.md b/server/magenta/reviews/README.md similarity index 100% rename from server/third_party/magenta/reviews/README.md rename to server/magenta/reviews/README.md diff --git a/server/third_party/magenta/protobuf/__init__.py b/server/magenta/reviews/__init__.py similarity index 100% rename from server/third_party/magenta/protobuf/__init__.py rename to server/magenta/reviews/__init__.py diff --git a/server/third_party/magenta/reviews/assets/Nottingham_Piano_Roll.png b/server/magenta/reviews/assets/Nottingham_Piano_Roll.png similarity index 100% rename from server/third_party/magenta/reviews/assets/Nottingham_Piano_Roll.png rename to server/magenta/reviews/assets/Nottingham_Piano_Roll.png diff --git a/server/third_party/magenta/reviews/assets/Pop_Music_Piano_Roll.png b/server/magenta/reviews/assets/Pop_Music_Piano_Roll.png similarity index 100% rename from server/third_party/magenta/reviews/assets/Pop_Music_Piano_Roll.png rename to server/magenta/reviews/assets/Pop_Music_Piano_Roll.png diff --git a/server/third_party/magenta/reviews/assets/RNN_RBM_Piano_Roll.png b/server/magenta/reviews/assets/RNN_RBM_Piano_Roll.png similarity index 100% rename from server/third_party/magenta/reviews/assets/RNN_RBM_Piano_Roll.png rename to server/magenta/reviews/assets/RNN_RBM_Piano_Roll.png diff --git a/server/third_party/magenta/reviews/assets/RNN_RBM_Piano_Roll_2.png b/server/magenta/reviews/assets/RNN_RBM_Piano_Roll_2.png similarity index 100% rename from server/third_party/magenta/reviews/assets/RNN_RBM_Piano_Roll_2.png rename to server/magenta/reviews/assets/RNN_RBM_Piano_Roll_2.png diff --git a/server/third_party/magenta/reviews/assets/attention_interpolation.png b/server/magenta/reviews/assets/attention_interpolation.png similarity index 100% rename from server/third_party/magenta/reviews/assets/attention_interpolation.png rename to server/magenta/reviews/assets/attention_interpolation.png diff --git a/server/third_party/magenta/reviews/assets/attention_parameterization.png b/server/magenta/reviews/assets/attention_parameterization.png similarity index 100% rename from server/third_party/magenta/reviews/assets/attention_parameterization.png rename to server/magenta/reviews/assets/attention_parameterization.png diff --git a/server/third_party/magenta/reviews/assets/color-preserving-ny.jpg b/server/magenta/reviews/assets/color-preserving-ny.jpg similarity index 100% rename from server/third_party/magenta/reviews/assets/color-preserving-ny.jpg rename to server/magenta/reviews/assets/color-preserving-ny.jpg diff --git a/server/third_party/magenta/reviews/assets/diagram.png b/server/magenta/reviews/assets/diagram.png similarity index 100% rename from server/third_party/magenta/reviews/assets/diagram.png rename to server/magenta/reviews/assets/diagram.png diff --git a/server/third_party/magenta/reviews/assets/gan/image00.gif b/server/magenta/reviews/assets/gan/image00.gif similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image00.gif rename to server/magenta/reviews/assets/gan/image00.gif diff --git a/server/third_party/magenta/reviews/assets/gan/image01.png b/server/magenta/reviews/assets/gan/image01.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image01.png rename to server/magenta/reviews/assets/gan/image01.png diff --git a/server/third_party/magenta/reviews/assets/gan/image02.png b/server/magenta/reviews/assets/gan/image02.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image02.png rename to server/magenta/reviews/assets/gan/image02.png diff --git a/server/third_party/magenta/reviews/assets/gan/image03.png b/server/magenta/reviews/assets/gan/image03.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image03.png rename to server/magenta/reviews/assets/gan/image03.png diff --git a/server/third_party/magenta/reviews/assets/gan/image04.png b/server/magenta/reviews/assets/gan/image04.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image04.png rename to server/magenta/reviews/assets/gan/image04.png diff --git a/server/third_party/magenta/reviews/assets/gan/image05.png b/server/magenta/reviews/assets/gan/image05.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image05.png rename to server/magenta/reviews/assets/gan/image05.png diff --git a/server/third_party/magenta/reviews/assets/gan/image06.png b/server/magenta/reviews/assets/gan/image06.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image06.png rename to server/magenta/reviews/assets/gan/image06.png diff --git a/server/third_party/magenta/reviews/assets/gan/image07.png b/server/magenta/reviews/assets/gan/image07.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image07.png rename to server/magenta/reviews/assets/gan/image07.png diff --git a/server/third_party/magenta/reviews/assets/gan/image08.png b/server/magenta/reviews/assets/gan/image08.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image08.png rename to server/magenta/reviews/assets/gan/image08.png diff --git a/server/third_party/magenta/reviews/assets/gan/image09.png b/server/magenta/reviews/assets/gan/image09.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image09.png rename to server/magenta/reviews/assets/gan/image09.png diff --git a/server/third_party/magenta/reviews/assets/gan/image10.png b/server/magenta/reviews/assets/gan/image10.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image10.png rename to server/magenta/reviews/assets/gan/image10.png diff --git a/server/third_party/magenta/reviews/assets/gan/image11.png b/server/magenta/reviews/assets/gan/image11.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image11.png rename to server/magenta/reviews/assets/gan/image11.png diff --git a/server/third_party/magenta/reviews/assets/gan/image12.png b/server/magenta/reviews/assets/gan/image12.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image12.png rename to server/magenta/reviews/assets/gan/image12.png diff --git a/server/third_party/magenta/reviews/assets/gan/image13.png b/server/magenta/reviews/assets/gan/image13.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image13.png rename to server/magenta/reviews/assets/gan/image13.png diff --git a/server/third_party/magenta/reviews/assets/gan/image14.png b/server/magenta/reviews/assets/gan/image14.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gan/image14.png rename to server/magenta/reviews/assets/gan/image14.png diff --git a/server/third_party/magenta/reviews/assets/generation.gif b/server/magenta/reviews/assets/generation.gif similarity index 100% rename from server/third_party/magenta/reviews/assets/generation.gif rename to server/magenta/reviews/assets/generation.gif diff --git a/server/third_party/magenta/reviews/assets/get_bias.png b/server/magenta/reviews/assets/get_bias.png similarity index 100% rename from server/third_party/magenta/reviews/assets/get_bias.png rename to server/magenta/reviews/assets/get_bias.png diff --git a/server/third_party/magenta/reviews/assets/get_hidden.png b/server/magenta/reviews/assets/get_hidden.png similarity index 100% rename from server/third_party/magenta/reviews/assets/get_hidden.png rename to server/magenta/reviews/assets/get_hidden.png diff --git a/server/third_party/magenta/reviews/assets/gibbs.png b/server/magenta/reviews/assets/gibbs.png similarity index 100% rename from server/third_party/magenta/reviews/assets/gibbs.png rename to server/magenta/reviews/assets/gibbs.png diff --git a/server/third_party/magenta/reviews/assets/grad_loss.png b/server/magenta/reviews/assets/grad_loss.png similarity index 100% rename from server/third_party/magenta/reviews/assets/grad_loss.png rename to server/magenta/reviews/assets/grad_loss.png diff --git a/server/third_party/magenta/reviews/assets/mnist_generation.png b/server/magenta/reviews/assets/mnist_generation.png similarity index 100% rename from server/third_party/magenta/reviews/assets/mnist_generation.png rename to server/magenta/reviews/assets/mnist_generation.png diff --git a/server/third_party/magenta/reviews/assets/pixelrnn_figure6.png b/server/magenta/reviews/assets/pixelrnn_figure6.png similarity index 100% rename from server/third_party/magenta/reviews/assets/pixelrnn_figure6.png rename to server/magenta/reviews/assets/pixelrnn_figure6.png diff --git a/server/third_party/magenta/reviews/assets/pixelrnn_full_context.png b/server/magenta/reviews/assets/pixelrnn_full_context.png similarity index 100% rename from server/third_party/magenta/reviews/assets/pixelrnn_full_context.png rename to server/magenta/reviews/assets/pixelrnn_full_context.png diff --git a/server/third_party/magenta/reviews/assets/pixelrnn_masks_A.png b/server/magenta/reviews/assets/pixelrnn_masks_A.png similarity index 100% rename from server/third_party/magenta/reviews/assets/pixelrnn_masks_A.png rename to server/magenta/reviews/assets/pixelrnn_masks_A.png diff --git a/server/third_party/magenta/reviews/assets/pixelrnn_masks_B.png b/server/magenta/reviews/assets/pixelrnn_masks_B.png similarity index 100% rename from server/third_party/magenta/reviews/assets/pixelrnn_masks_B.png rename to server/magenta/reviews/assets/pixelrnn_masks_B.png diff --git a/server/third_party/magenta/reviews/assets/pixelrnn_masks_highlevel.png b/server/magenta/reviews/assets/pixelrnn_masks_highlevel.png similarity index 100% rename from server/third_party/magenta/reviews/assets/pixelrnn_masks_highlevel.png rename to server/magenta/reviews/assets/pixelrnn_masks_highlevel.png diff --git a/server/third_party/magenta/reviews/assets/rnnrbm_color.png b/server/magenta/reviews/assets/rnnrbm_color.png similarity index 100% rename from server/third_party/magenta/reviews/assets/rnnrbm_color.png rename to server/magenta/reviews/assets/rnnrbm_color.png diff --git a/server/third_party/magenta/reviews/assets/rnnrbm_figure.png b/server/magenta/reviews/assets/rnnrbm_figure.png similarity index 100% rename from server/third_party/magenta/reviews/assets/rnnrbm_figure.png rename to server/magenta/reviews/assets/rnnrbm_figure.png diff --git a/server/third_party/magenta/reviews/assets/svhn_generation.png b/server/magenta/reviews/assets/svhn_generation.png similarity index 100% rename from server/third_party/magenta/reviews/assets/svhn_generation.png rename to server/magenta/reviews/assets/svhn_generation.png diff --git a/server/third_party/magenta/reviews/assets/tubingen-starry-night.jpg b/server/magenta/reviews/assets/tubingen-starry-night.jpg similarity index 100% rename from server/third_party/magenta/reviews/assets/tubingen-starry-night.jpg rename to server/magenta/reviews/assets/tubingen-starry-night.jpg diff --git a/server/third_party/magenta/reviews/draw.md b/server/magenta/reviews/draw.md similarity index 100% rename from server/third_party/magenta/reviews/draw.md rename to server/magenta/reviews/draw.md diff --git a/server/third_party/magenta/reviews/pixelrnn.md b/server/magenta/reviews/pixelrnn.md similarity index 100% rename from server/third_party/magenta/reviews/pixelrnn.md rename to server/magenta/reviews/pixelrnn.md diff --git a/server/third_party/magenta/reviews/rnnrbm.md b/server/magenta/reviews/rnnrbm.md similarity index 100% rename from server/third_party/magenta/reviews/rnnrbm.md rename to server/magenta/reviews/rnnrbm.md diff --git a/server/third_party/magenta/reviews/styletransfer.md b/server/magenta/reviews/styletransfer.md similarity index 100% rename from server/third_party/magenta/reviews/styletransfer.md rename to server/magenta/reviews/styletransfer.md diff --git a/server/third_party/magenta/reviews/summary_generation_sequences.md b/server/magenta/reviews/summary_generation_sequences.md similarity index 100% rename from server/third_party/magenta/reviews/summary_generation_sequences.md rename to server/magenta/reviews/summary_generation_sequences.md diff --git a/server/third_party/magenta/scripts/BUILD b/server/magenta/scripts/BUILD similarity index 100% rename from server/third_party/magenta/scripts/BUILD rename to server/magenta/scripts/BUILD diff --git a/server/third_party/magenta/scripts/README.md b/server/magenta/scripts/README.md similarity index 100% rename from server/third_party/magenta/scripts/README.md rename to server/magenta/scripts/README.md diff --git a/server/third_party/magenta/reviews/__init__.py b/server/magenta/scripts/__init__.py similarity index 100% rename from server/third_party/magenta/reviews/__init__.py rename to server/magenta/scripts/__init__.py diff --git a/server/third_party/magenta/scripts/convert_midi_dir_to_note_sequences.py b/server/magenta/scripts/convert_midi_dir_to_note_sequences.py similarity index 100% rename from server/third_party/magenta/scripts/convert_midi_dir_to_note_sequences.py rename to server/magenta/scripts/convert_midi_dir_to_note_sequences.py diff --git a/server/third_party/magenta/scripts/convert_midi_dir_to_note_sequences_test.py b/server/magenta/scripts/convert_midi_dir_to_note_sequences_test.py similarity index 100% rename from server/third_party/magenta/scripts/convert_midi_dir_to_note_sequences_test.py rename to server/magenta/scripts/convert_midi_dir_to_note_sequences_test.py diff --git a/server/third_party/magenta/testdata/BUILD b/server/magenta/testdata/BUILD similarity index 100% rename from server/third_party/magenta/testdata/BUILD rename to server/magenta/testdata/BUILD diff --git a/server/third_party/magenta/scripts/__init__.py b/server/magenta/testdata/__init__.py similarity index 100% rename from server/third_party/magenta/scripts/__init__.py rename to server/magenta/testdata/__init__.py diff --git a/server/third_party/magenta/testdata/example.mid b/server/magenta/testdata/example.mid similarity index 100% rename from server/third_party/magenta/testdata/example.mid rename to server/magenta/testdata/example.mid diff --git a/server/third_party/magenta/testdata/example_complex.mid b/server/magenta/testdata/example_complex.mid similarity index 100% rename from server/third_party/magenta/testdata/example_complex.mid rename to server/magenta/testdata/example_complex.mid diff --git a/server/third_party/magenta/testdata/example_event_order.mid b/server/magenta/testdata/example_event_order.mid similarity index 100% rename from server/third_party/magenta/testdata/example_event_order.mid rename to server/magenta/testdata/example_event_order.mid diff --git a/server/third_party/magenta/testdata/example_is_drum.mid b/server/magenta/testdata/example_is_drum.mid similarity index 100% rename from server/third_party/magenta/testdata/example_is_drum.mid rename to server/magenta/testdata/example_is_drum.mid diff --git a/server/third_party/magenta/testdata/notesequences.tfrecord b/server/magenta/testdata/notesequences.tfrecord similarity index 100% rename from server/third_party/magenta/testdata/notesequences.tfrecord rename to server/magenta/testdata/notesequences.tfrecord diff --git a/server/third_party/magenta/testdata/tfrecord_iterator_test.tfrecord b/server/magenta/testdata/tfrecord_iterator_test.tfrecord similarity index 100% rename from server/third_party/magenta/testdata/tfrecord_iterator_test.tfrecord rename to server/magenta/testdata/tfrecord_iterator_test.tfrecord diff --git a/server/third_party/magenta/testdata/__init__.py b/server/magenta/tools/__init__.py similarity index 100% rename from server/third_party/magenta/testdata/__init__.py rename to server/magenta/tools/__init__.py diff --git a/server/third_party/magenta/tools/docker/Dockerfile b/server/magenta/tools/docker/Dockerfile similarity index 100% rename from server/third_party/magenta/tools/docker/Dockerfile rename to server/magenta/tools/docker/Dockerfile diff --git a/server/third_party/magenta/tools/pip/BUILD b/server/magenta/tools/pip/BUILD similarity index 100% rename from server/third_party/magenta/tools/pip/BUILD rename to server/magenta/tools/pip/BUILD diff --git a/server/third_party/magenta/tools/pip/README.md b/server/magenta/tools/pip/README.md similarity index 100% rename from server/third_party/magenta/tools/pip/README.md rename to server/magenta/tools/pip/README.md diff --git a/server/third_party/magenta/tools/pip/build_pip_package.sh b/server/magenta/tools/pip/build_pip_package.sh similarity index 100% rename from server/third_party/magenta/tools/pip/build_pip_package.sh rename to server/magenta/tools/pip/build_pip_package.sh diff --git a/server/third_party/magenta/tools/pip/setup.py b/server/magenta/tools/pip/setup.py similarity index 100% rename from server/third_party/magenta/tools/pip/setup.py rename to server/magenta/tools/pip/setup.py diff --git a/server/predict.py b/server/predict.py index 3c7ce45..c17d685 100644 --- a/server/predict.py +++ b/server/predict.py @@ -14,20 +14,18 @@ # limitations under the License. # -import sys -sys.path.append('./third_party') -import third_party.magenta.models.basic_rnn.basic_rnn_generator as basic_rnn_generator -from third_party.magenta.music import sequence_generator_bundle -from third_party.magenta.protobuf import generator_pb2 -from third_party.magenta.music import midi_io -from third_party.magenta.models.shared.melody_rnn_generate import _steps_to_seconds +import magenta.models.basic_rnn.basic_rnn_generator as basic_rnn_generator +from magenta.music import sequence_generator_bundle +from magenta.protobuf import generator_pb2 +from magenta.music import midi_io +from magenta.models.shared.melody_rnn_generate import _steps_to_seconds import os import tempfile basic_generator = basic_rnn_generator.create_generator( None, - sequence_generator_bundle.read_bundle_file(os.path.abspath('./third_party/magenta/basic_rnn.mag')), + sequence_generator_bundle.read_bundle_file(os.path.abspath('./magenta/basic_rnn.mag')), 4) def generate_midi(midi_data, total_seconds=10): diff --git a/server/server.py b/server/server.py index 5d62707..a975b5a 100644 --- a/server/server.py +++ b/server/server.py @@ -48,4 +48,4 @@ def index(): if __name__ == '__main__': - app.run(host='127.0.0.1', port=8080) \ No newline at end of file + app.run(host='0.0.0.0', port=8080) diff --git a/server/third_party/magenta/tools/__init__.py b/server/third_party/magenta/tools/__init__.py deleted file mode 100644 index e69de29..0000000