Skip to content

Amy/website#270

Merged
xehu merged 0 commit intoinitial_package_versionfrom
amy/website
Aug 7, 2024
Merged

Amy/website#270
xehu merged 0 commit intoinitial_package_versionfrom
amy/website

Conversation

@amytangzheng
Copy link
Copy Markdown
Contributor

Pull Request Template:
If you are merging in a feature or other major change, use this template to check your pull request!

Basic Info

What's this pull request about?

Merging in website folder into main

My PR Adds or Improves Documentation

If your feature is about documentation, ensure that you check the boxes relevant to you.

Docstrings

  • Docstrings: I have followed the proper documentation format (https://www.sphinx-doc.org/en/master/usage/extensions/napoleon.html; Google Format recommended).
  • Docstrings: Every function in the file has a block quote comment with a description of the feature.
  • Docstrings: Every input argument is documented.
  • Docstrings: The output type is documented, along with a description of what the output is for.
  • Docstrings: I have linked the feature under the Table of Contents (docs/source/features/index.rst)

Feature Wiki

  • Conceptual Wiki: I made a copy of the TEMPLATE (docs/source/features_conceptual/TEMPLATE.rst)
  • Conceptual Wiki: I replaced the word TEMPLATE at the top of the file with the name of the feature (.. _TEMPLATE:) Please do NOT delete any of the punctuation (the .._ and :) in the header, as this is important for referencing the feature in the Table of Contents!
  • Conceptual Wiki: I have answered the six sections of the template to the best of my ability.
  • Conceptual Wiki: I have linked the feature under the Table of Contents (docs/source/features_conceptual/index.rst).

General Documentation

  • My documentation is linked in a toctree.
  • I have confirmed that make clean and make html do not generate breaking errors.

My PR is About Adding a New Feature to the Code Repository

Adding Feature to the Feature Dictionary

  • I have edited the feature_dictionary.py file with an appropriate entry for my feature. Below is a sample entry; I confirm that all fields are accurately filled out.
  "Function Word Accommodation": {
    "columns": ["function_word_accommodation"],
    "file": "./features/word_mimicry.py",
    "level": "Chat",
    "semantic_grouping": "Variance",
    "description": "The total number of function words used in a given turn that were also used in the previous turn. Function words are defined as a list of 190 words from the source paper.",
    "references": "(Ranganath et al., 2013)",
    "wiki_link": "https://github.com/Watts-Lab/team-process-map/wiki/C.9-Mimicry:-Function-word,-Content-word,-BERT,-Moving",
    "function": ChatLevelFeaturesCalculator.calculate_word_mimicry,
    "dependencies": [],
    "preprocess": [],
    "vect_data": False,
    "bert_sentiment_data": False
  }
  • If my feature is at the chat level, my dictionary entry is in the top half of the file; if my feature is at the conversation level, my dictionary entry is in the bottom half of the file (below the comment that says, ### Conversation Level).

Documentation

Did you document your feature? You should follow the same requirements as above:

  • Docstrings: I have followed the proper documentation format (https://www.sphinx-doc.org/en/master/usage/extensions/napoleon.html; Google Format recommended).
  • Docstrings: Every function in the file has a block quote comment with a description of the feature.
  • Docstrings: Every input argument is documented.
  • Docstrings: The output type is documented, along with a description of what the output is for.
  • Docstrings: I have linked the feature under the Table of Contents (docs/source/features/index.rst)

Code Basics

  • My feature is a .py file.
  • My feature uses snake case in the name. That means the name of the format is my_feature, NOT myFeature (camel case).
  • My feature has the name, NAME_features.py, where NAME is the name of my feature.
  • My feature is located in src/features/.

Testing

  • I have thought about test cases for my features, with inputs and expected outputs.
  • I have added test cases for my feature under the tests/ folder.
  • My feature passes the automated testing suite.

The location of my tests are here:

[PASTE LINK HERE]

If you check all the boxes above, then you ready to merge!

@amytangzheng amytangzheng requested a review from xehu August 7, 2024 00:51
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hi Amy, AMAZING work on the website!! I was just wondering whether it's possible to consolidate the build/ file under the website/ directory, so that we only have one folder related to the website instead of 2?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Just moved build/ file under the website/ directory!

@xehu xehu changed the base branch from main to initial_package_version August 7, 2024 16:17
@xehu xehu linked an issue Aug 7, 2024 that may be closed by this pull request
2 tasks
@xehu xehu merged this pull request into initial_package_version Aug 7, 2024
@xehu xehu deleted the amy/website branch August 7, 2024 21:36
xehu added a commit that referenced this pull request Aug 7, 2024
* add pyproject.toml

* Update README.md with team-comm-tools rather than team-process-map

* Update README.md to remove outdated requirement (#264)

* delete junit

* move preprocessing notebooks to tests

* remove unnecessary deps

* update requirements

* more slimming of reqs

* remove packaging related deps

* get rid of requests and xgboost deps

* addressing #267

* edit src paths

* test with python 3.7

* test  python 3.7

* test 3.8

* test 3.8 pt. 2

* test 3.9

* test 3.10

* restore to 3.11; play with docs

* Update README.md with new path names.

* standardize package structure and solve path issues

* update requirement.txt path in workflow

* update workflow file

* updating test workflow

* update test workflow

* update test workflow

* update test workflow

* update test workflow

* update imports in example

* fix bugs

* move lexiconx_dict.pkl to features/assets

* update dependencies

* delete legacy files and remove constant nltk import

* clean up package structure and warnings

* resolve relative imports issue in sphinx

* create single installation script

* commit setup script

* update setup script and documentationZ

* update README to point to setup script

* add linkes to website and Rtd to readme

* disable tokenizer parallelism to avoid error

* add badges to home page

* Named Entity Recognition + Valence Tests (#226)

* valence testing

* rearranging files

* intermediate ner testing

* NER testing

* fix featurizer

* fix featurize bug

* updating test dataset + function

* code coverage

* burstiness

* move testing FB's into run_tests.py

* move NER dataframe to test file

* adding complex tests back to run_tests.py

* add chat_complex_df and conv_complex_df to run_tests.py

* correct dataset paths

* rebase

* changing references as part of rebase

* correcting FB calls based on latest interface updates

* correct run_tests.py

* add dd tests

* burstiness fix

* dd tests add

* forward flow tests

* src changes

* testing timestamp variations

* src changes

* update test ds

* fix formatting

* fix formatting

---------

Co-authored-by: Xinlan Emily Hu <xehu@wharton.upenn.edu>
Co-authored-by: Xinlan Emily Hu <xehu@cs.stanford.edu>

* Amy/website (#270)

* website updates

* renaming tpm-website to website

* deploying via gh-pages

* changed from tpm-website to website

* deployed website

* copyright and team

* team headshots and footer

* edits to the pages

* website updates

* updated links

* updated homepage

* link updates

* mobile compatibility

* mobile adjustments

* navbar mobile updates

* whitespace edits

* homepage updates

* feature table

* website updates

* renaming tpm-website to website

* deploying via gh-pages

* changed from tpm-website to website

* edits to the pages

* website updates

* updated links

* updated homepage

* link updates

* mobile compatibility

* mobile adjustments

* navbar mobile updates

* homepage updates

* add table of features

* updated team page titles

* include flask in requirements.txt

* updates to table of features

* load pages from top

* fix to 404 issues

* moved build under website folder

* add flask back into requirements

---------

Co-authored-by: Xinlan Emily Hu <xehu@cs.stanford.edu>
Co-authored-by: Xinlan Emily Hu <xehu@wharton.upenn.edu>

---------

Co-authored-by: sundy1994 <yuxuanzh@seas.upenn.edu>
Co-authored-by: Shruti Agarwal <46203852+agshruti12@users.noreply.github.com>
Co-authored-by: amytangzheng <145236844+amytangzheng@users.noreply.github.com>
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.

Public-Facing Website

2 participants