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.

Sign up for GitHub

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

Jump to bottom

Add AFLOW functionality to propnet #237

Merged
merged 67 commits into from
May 15, 2019
Merged

Add AFLOW functionality to propnet #237

merged 67 commits into from
May 15, 2019

Commits on Apr 23, 2019

  1. WIP creating aflow adapter

    @clegaspi
    clegaspi committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    23539cd View commit details
    Browse the repository at this point in the history

  2. Filled out adapter with methods, wrote some custom query code to use … 

    …threading
    @clegaspi
    clegaspi committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    29a495a View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2019

  1. Create ingester, updates to aflow retriever

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    368c26e View commit details
    Browse the repository at this point in the history

  2. updates to ingester

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    149c632 View commit details
    Browse the repository at this point in the history

  3. update bad kw check

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    f82600a View commit details
    Browse the repository at this point in the history

  4. Override aflow library function

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    fce97e9 View commit details
    Browse the repository at this point in the history

  5. Redefine _kpoints casting function

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    ef1ba16 View commit details
    Browse the repository at this point in the history

  6. Move aflow redefs to new file

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    783de6b View commit details
    Browse the repository at this point in the history

  7. Add insert only option to ingester

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    befd2d6 View commit details
    Browse the repository at this point in the history

  8. Switch out urllib for requests library since we're not supporting Pyt… 

    …hon 2
    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    11cde4a View commit details
    Browse the repository at this point in the history

  9. Catch connection error when large numbers of records requested

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    3f9630f View commit details
    Browse the repository at this point in the history

  10. update error msg

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    5f9ac62 View commit details
    Browse the repository at this point in the history

  11. removed redundant code, added back properties that do work

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    b8004ac View commit details
    Browse the repository at this point in the history

  12. Update default batch size

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    ca7b64c View commit details
    Browse the repository at this point in the history

  13. Update aflow redefs for LDAU params

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    c9954d4 View commit details
    Browse the repository at this point in the history

  14. Ensure "lazy loading" doesn't occur by only grabbing kws that we alre… 

    …ady requested
    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    b922f34 View commit details
    Browse the repository at this point in the history

  15. Automatically reduce batch size when errors occur

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    8c65ddf View commit details
    Browse the repository at this point in the history

  16. Add ability to turn off batch size adjustment and throw error instead

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    5123d15 View commit details
    Browse the repository at this point in the history

  17. Filter for extra responses

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    d9a8173 View commit details
    Browse the repository at this point in the history

  18. Add logger info when changing batch size

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    8d4b349 View commit details
    Browse the repository at this point in the history

  19. Rename variable to prevent clash

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    1dbbb16 View commit details
    Browse the repository at this point in the history

  20. Clean up exit conditions for batch reduction

    @clegaspi
    clegaspi committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    1e0d27d View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2019

  1. Rework ingester to use AFLUX to get auids and urls, then grab json fr… 

    …om url
    @clegaspi
    clegaspi committed Apr 26, 2019
    Configuration menu
    Copy the full SHA
    9b47f27 View commit details
    Browse the repository at this point in the history

  2. Add support for specific keywords

    @clegaspi
    clegaspi committed Apr 26, 2019
    Configuration menu
    Copy the full SHA
    faad9b2 View commit details
    Browse the repository at this point in the history

  3. Add tricks to divide up requests

    @clegaspi
    clegaspi committed Apr 26, 2019
    Configuration menu
    Copy the full SHA
    c75ec3e View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2019

  1. Update number of retries

    @clegaspi
    clegaspi committed Apr 27, 2019
    Configuration menu
    Copy the full SHA
    c583d77 View commit details
    Browse the repository at this point in the history

  2. Adjust property chunking

    @clegaspi
    clegaspi committed Apr 27, 2019
    Configuration menu
    Copy the full SHA
    dff4ddd View commit details
    Browse the repository at this point in the history

  3. Adjust retry wait time

    @clegaspi
    clegaspi committed Apr 27, 2019
    Configuration menu
    Copy the full SHA
    a63ab70 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2019

  1. Update redefs to include proper definition for elastic anisotropy

    @clegaspi
    clegaspi committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    2ccde64 View commit details
    Browse the repository at this point in the history

  2. Add feature of doing batch reduction within property reduction, do no… 

    …t retry on ConnectionError
    @clegaspi
    clegaspi committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    d30ca2e View commit details
    Browse the repository at this point in the history

  3. Fix orderby kw search

    @clegaspi
    clegaspi committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    cae0894 View commit details
    Browse the repository at this point in the history

  4. Remove kw from other matchbook sections when used as orderby

    @clegaspi
    clegaspi committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    1b27afd View commit details
    Browse the repository at this point in the history

  5. Update debug message

    @clegaspi
    clegaspi committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    58a96d3 View commit details
    Browse the repository at this point in the history

  6. Rename class

    @clegaspi
    clegaspi committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    16e985d View commit details
    Browse the repository at this point in the history

  7. Fix reference

    @clegaspi
    clegaspi committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    d7eb130 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2019

  1. AFLOWIngester now traverses API in defined chunks which are small eno… 

    …ugh that the API complains infrequently
    @clegaspi
    clegaspi committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    add3b9e View commit details
    Browse the repository at this point in the history

  2. Additional models for converting heat capacity in AFLOW quantities.

    @dmrdjenovich
    dmrdjenovich committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    bbedaee View commit details
    Browse the repository at this point in the history

  3. Merge branch 'aflow-ingester-test' of https://github.com/materialsint… 

    …elligence/propnet into aflow-ingester-test
    @clegaspi
    clegaspi committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    b9f2050 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2019

  1. Updated ingester

    @clegaspi
    clegaspi committed May 3, 2019
    Configuration menu
    Copy the full SHA
    a5ca801 View commit details
    Browse the repository at this point in the history

  2. Further updates to ingester, needs docstrings

    @clegaspi
    clegaspi committed May 3, 2019
    Configuration menu
    Copy the full SHA
    da420f3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'aflow-ingester-test' into aflow_adapter 

    # Conflicts:
#	propnet/dbtools/aflow.py
#	requirements.txt
    @clegaspi
    clegaspi committed May 3, 2019
    Configuration menu
    Copy the full SHA
    cd5f4fd View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. WIP testing adapter

    @clegaspi
    clegaspi committed May 7, 2019
    Configuration menu
    Copy the full SHA
    4efa437 View commit details
    Browse the repository at this point in the history

  2. Fixes from tests, docstrings

    @clegaspi
    clegaspi committed May 7, 2019
    Configuration menu
    Copy the full SHA
    79b33bb View commit details
    Browse the repository at this point in the history

  3. More docstrings

    @clegaspi
    clegaspi committed May 7, 2019
    Configuration menu
    Copy the full SHA
    0bc2930 View commit details
    Browse the repository at this point in the history

  4. Remove redefs, update required aflow version

    @clegaspi
    clegaspi committed May 7, 2019
    Configuration menu
    Copy the full SHA
    46d7439 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2019

  1. Update graph to generate input sets more efficiently, update model to… 

    … allow python models to have units_for_evaluation
    @clegaspi
    clegaspi committed May 8, 2019
    Configuration menu
    Copy the full SHA
    fe59254 View commit details
    Browse the repository at this point in the history

  2. AflowAdapter updates, remove properties that cause huge combinatorial… 

    … explosion
    @clegaspi
    clegaspi committed May 8, 2019
    Configuration menu
    Copy the full SHA
    6fa8f27 View commit details
    Browse the repository at this point in the history

  3. Correct errors in models and symbols

    @clegaspi
    clegaspi committed May 8, 2019
    Configuration menu
    Copy the full SHA
    52c96a1 View commit details
    Browse the repository at this point in the history

  4. Update web app to take AFLOW AUID

    @clegaspi
    clegaspi committed May 8, 2019
    Configuration menu
    Copy the full SHA
    61f1a15 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. Add code to redirect numpy warnings

    @clegaspi
    clegaspi committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7a79201 View commit details
    Browse the repository at this point in the history

  2. Add references page

    @clegaspi
    clegaspi committed May 9, 2019
    Configuration menu
    Copy the full SHA
    b60d06d View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. Fix bug where multiple outputs from a model would have the same exact… 

    … provenance object
    @clegaspi
    clegaspi committed May 10, 2019
    Configuration menu
    Copy the full SHA
    e3251c0 View commit details
    Browse the repository at this point in the history

  2. Add ingester tests, update ingester for changes arising from tests

    @clegaspi
    clegaspi committed May 10, 2019
    Configuration menu
    Copy the full SHA
    ef9c10b View commit details
    Browse the repository at this point in the history

  3. Add adapter tests, small changes to adapter for tests

    @clegaspi
    clegaspi committed May 10, 2019
    Configuration menu
    Copy the full SHA
    0cb1098 View commit details
    Browse the repository at this point in the history

  4. Rename ingester to match capitalization

    @clegaspi
    clegaspi committed May 10, 2019
    Configuration menu
    Copy the full SHA
    f4c39b4 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2019

  1. New Combinatorics Algorithm!!!!!!!

    @dmrdjenovich
    dmrdjenovich committed May 11, 2019
    Configuration menu
    Copy the full SHA
    019eea8 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. Add back func to graph for input set generation

    @clegaspi
    clegaspi committed May 13, 2019
    Configuration menu
    Copy the full SHA
    baf27d5 View commit details
    Browse the repository at this point in the history

  2. WIP

    @clegaspi
    clegaspi committed May 13, 2019
    Configuration menu
    Copy the full SHA
    2283fe2 View commit details
    Browse the repository at this point in the history

  3. Finished adding model and symbol caches to provenance for faster chec… 

    …king for cyclic inputs
    @clegaspi
    clegaspi committed May 13, 2019
    Configuration menu
    Copy the full SHA
    e858e12 View commit details
    Browse the repository at this point in the history

  4. Turn input set generation into generator for lazy evaluation to save … 

    …time
    @clegaspi
    clegaspi committed May 13, 2019
    Configuration menu
    Copy the full SHA
    1d1ddfa View commit details
    Browse the repository at this point in the history

  5. Add notes, remove condition symbols from web interactive view

    @clegaspi
    clegaspi committed May 13, 2019
    Configuration menu
    Copy the full SHA
    4cd09dd View commit details
    Browse the repository at this point in the history

  6. Add docs

    @clegaspi
    clegaspi committed May 13, 2019
    Configuration menu
    Copy the full SHA
    81a66fd View commit details
    Browse the repository at this point in the history

  7. Corrections for query config refactor, add test for defaults formatting

    @clegaspi
    clegaspi committed May 13, 2019
    Configuration menu
    Copy the full SHA
    1a92e01 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. Fix numpy warning capturing, codacy improvements

    @web-flow @clegaspi
    web-flow authored and clegaspi committed May 14, 2019
    Configuration menu
    Copy the full SHA
    816b761 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2019

  1. Add AFLOW tests

    @clegaspi
    clegaspi committed May 15, 2019
    Configuration menu
    Copy the full SHA
    3e7bb6d View commit details
    Browse the repository at this point in the history

  2. Replace warning with logger warning

    @clegaspi
    clegaspi committed May 15, 2019
    Configuration menu
    Copy the full SHA
    20ed6d1 View commit details
    Browse the repository at this point in the history

  3. Codacy updates

    @clegaspi
    clegaspi committed May 15, 2019
    Configuration menu
    Copy the full SHA
    00080fb View commit details
    Browse the repository at this point in the history