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.

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

TES import #1

Merged
merged 21 commits into from
Apr 2, 2018
Merged

TES import #1

merged 21 commits into from
Apr 2, 2018

Conversation

buchanae
Copy link
Contributor

@buchanae buchanae commented Feb 5, 2018

Rough draft of pulling Funnel events from Kafka and writing them into Arachne.

@adamstruck
Copy link

Looks good! 👍

Generally, my concern is the proliferation of duplication of code that is starting to occur in these repos:

  • github.com/ohsu-comp-bio/funnel
  • github.com/ohsu-comp-bio/tes
  • github.com/ohsu-comp-bio/mortar

I think we need to start thinking carefully how to split up things conceptually and make sure import things whenever possible.

@buchanae
Copy link
Contributor Author

buchanae commented Feb 5, 2018

I removed the tes package, which was accidentally committed.

As soon as we resolve ohsu-comp-bio/funnel#481 I'll remove some of the events package too.

Makefile Outdated
-I ./ \
-I $$GOPATH/src/github.com/golang/protobuf/ptypes/struct/ \
-I $$GOPATH/src/github.com/golang/protobuf/ptypes/timestamp/ \
--go_out=Mtes/tes.proto=github.com/ohsu-comp-bio/tes:. \

Choose a reason for hiding this comment

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

this command should be updated now that you removed the tes.proto file

@buchanae
Copy link
Contributor Author

buchanae commented Feb 6, 2018

I've added new functionality to this PR, so please review again.

This creates additional vertex types for each task. Still need edges.

@buchanae
Copy link
Contributor Author

buchanae commented Feb 6, 2018

Ok, the latest commit is in decent shape:

  • Added edges from task to tag, file, etc.
  • Cleaned up client, vertex, edge code
  • Cleaned up Kafka event reader
  • Added dev docs to readme and helpers to Makefile

I didn't put a ton of thought into vertex/edge label names, GID formats, etc. I'm pretty sure I'm diverging from BMEG on that so far. Probably cleanup to be done there. Also, we should have a style guide for those things.

@buchanae
Copy link
Contributor Author

buchanae commented Feb 6, 2018

Added a cobra CLI. I'm done adding to this branch now.

@buchanae
Copy link
Contributor Author

buchanae commented Feb 7, 2018

@adamstruck requested tests and the basics of a Go project, so I guess I'm not done yet.

Added tidy/lint in the last commit.

@kellrott kellrott merged commit 8a1a2e1 into master Apr 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants