Skip to content

Commit

Permalink
Merge branch 'develop' into docs/athena
Browse files Browse the repository at this point in the history
  • Loading branch information
maximiliansoelch authored Dec 19, 2023
2 parents 08bb529 + e3e7692 commit 3470461
Show file tree
Hide file tree
Showing 10 changed files with 153 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ __pycache__
dist
data/*
!data/.gitkeep
.idea
.idea/*
!.idea/runConfigurations/
.env
**/.env
24 changes: 24 additions & 0 deletions .idea/runConfigurations/assessment_module_manager.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions .idea/runConfigurations/module_example.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions .idea/runConfigurations/module_programming_llm.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions .idea/runConfigurations/module_programming_themisml.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions .idea/runConfigurations/module_text_cofee.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions .idea/runConfigurations/module_text_llm.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions docs/setup/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@ You'll have to do this once in the following folders to set up the project:
- ``athena``
- ``module_*`` (for each module)

.. note::
| The ``psycopg2`` module needs PostgreSQL to be installed on your system. You can find installation instructions on the `PostgreSQL website <https://www.postgresql.org/download/>`_.
| Example to install it on MacOS: ``brew install postgresql``

You can find more information about Poetry in the `Poetry documentation <https://python-poetry.org/docs/>`_.
4 changes: 2 additions & 2 deletions module_text_cofee/module_text_cofee/models/db_text_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


class DBTextBlock(Base):
__tablename__ = "text_blocks"
__tablename__ = "cofee_text_blocks"

id = Column(String, primary_key=True, index=True) # type: ignore
text = Column(String) # type: ignore
Expand All @@ -18,7 +18,7 @@ class DBTextBlock(Base):

# foreign keys
submission_id = Column(Integer, ForeignKey("text_submissions.id")) # FK to athena-native table
cluster_id = Column(Integer, ForeignKey("text_clusters.id")) # FK to custom table
cluster_id = Column(Integer, ForeignKey("cofee_text_clusters.id")) # FK to custom table

submission = relationship("DBTextSubmission")
cluster = relationship("DBTextCluster", back_populates="blocks")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


class DBTextCluster(Base):
__tablename__ = "text_clusters"
__tablename__ = "cofee_text_clusters"

id: int = Column(Integer, primary_key=True, index=True) # type: ignore
probabilities: bytes = Column(LargeBinary) # type: ignore
Expand Down

0 comments on commit 3470461

Please sign in to comment.