From 7da902b97af4106122448e522e6b3d0988b5a03d Mon Sep 17 00:00:00 2001 From: saqriphnix Date: Sat, 27 Apr 2024 01:01:46 +0300 Subject: [PATCH 1/5] add sensors --- requirements.txt | 1 + sensors.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 sensors.py diff --git a/requirements.txt b/requirements.txt index 0704b2d..69c8e04 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ +colorama==0.4.6 psutil==5.9.8 diff --git a/sensors.py b/sensors.py new file mode 100644 index 0000000..5ef3767 --- /dev/null +++ b/sensors.py @@ -0,0 +1,54 @@ +from dataclasses import dataclass +from psutil import sensors_temperatures + + +@dataclass +class TemperatureSensor: + sensor_type: str + sensor_label: str + current_temp: float + highest_temp: float | None = None + critical_temp: float | None = None + + +class Sensors: + @staticmethod + def get_temperatures() -> dict[str, list[TemperatureSensor]]: + temp_sens = sensors_temperatures() + + temp_sensors = {} + + for k, v in temp_sens.items(): + if k not in temp_sensors.keys(): + temp_sensors[k] = [] + match(k): + case "nvme": + for i in v: + temp_sensors[k].append(TemperatureSensor( + sensor_type=k, + sensor_label=i.label, + current_temp=i.current, + highest_temp=i.high, + critical_temp=i.critical + )) + case "amdgpu": + temp_sensors[k].append(TemperatureSensor( + sensor_type=k, + sensor_label="Integrated GPU", + current_temp=v[0].current, + )) + case "k10temp": + temp_sensors[k].append(TemperatureSensor( + sensor_type=k, + sensor_label="AMD CPU", + current_temp=v[0].current, + critical_temp=95.0 # hardcoded because we have R9 7900X + )) + + + return temp_sensors + + +if __name__ == "__main__": + for i in Sensors.get_temperatures(): + print(i) From 6472f7fdd6ca8ac024eba040b7624defe3e50963 Mon Sep 17 00:00:00 2001 From: saqriphnix Date: Sat, 27 Apr 2024 15:33:30 +0300 Subject: [PATCH 2/5] simple prettyprint func --- main.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index e62ceb7..b30cfdc 100644 --- a/main.py +++ b/main.py @@ -1,12 +1,15 @@ -import psutil +from sensors import Sensors +from colorama import Fore, Style, Back -def get_temperatures(): - sensors = psutil.sensors_temperatures() +def pretty_print(): + s = Sensors.get_temperatures() - for k in sensors: - print(f"{k}: {sensors[k]}") + for k, v in s.items(): + print(f"{Back.CYAN}{k}{Style.RESET_ALL}") + for sensors in v: + print(f"{sensors.sensor_label}: {sensors.current_temp}°C") if __name__ == "__main__": - get_temperatures() + pretty_print() From 7ab120759de17a935082925d8912275553a928f2 Mon Sep 17 00:00:00 2001 From: saqriphnix Date: Fri, 10 May 2024 01:02:31 +0000 Subject: [PATCH 3/5] clean readme --- README.md | 92 ------------------------------------------------------- 1 file changed, 92 deletions(-) diff --git a/README.md b/README.md index 04177e6..94cbb2d 100644 --- a/README.md +++ b/README.md @@ -1,93 +1 @@ # lego-monitoring - - - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin http://gitlab.altau.su/saqriphnix/lego-monitoring.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](http://gitlab.altau.su/saqriphnix/lego-monitoring/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README - -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. From 00b10f804aeced78b3f7c3fb5ac208c4415b175e Mon Sep 17 00:00:00 2001 From: saqriphnix Date: Tue, 14 May 2024 17:51:40 +0300 Subject: [PATCH 4/5] add warning --- .gitignore | 3 ++- sensors.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b694934..0e5ac79 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.venv \ No newline at end of file +.venv +__pycache__ \ No newline at end of file diff --git a/sensors.py b/sensors.py index 5ef3767..9f766d2 100644 --- a/sensors.py +++ b/sensors.py @@ -12,6 +12,7 @@ class TemperatureSensor: class Sensors: + # !!!WARNING!!! TONS of shit code gonna be below @staticmethod def get_temperatures() -> dict[str, list[TemperatureSensor]]: temp_sens = sensors_temperatures() From fe03aa69ddf263e4e1ce370ce9db49d0b340a829 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 15 May 2024 19:02:55 +0300 Subject: [PATCH 5/5] refactor Sensors a bit --- sensors.py | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/sensors.py b/sensors.py index 9f766d2..ef46f9f 100644 --- a/sensors.py +++ b/sensors.py @@ -12,37 +12,36 @@ class TemperatureSensor: class Sensors: - # !!!WARNING!!! TONS of shit code gonna be below @staticmethod def get_temperatures() -> dict[str, list[TemperatureSensor]]: - temp_sens = sensors_temperatures() + psutil_temp_sensors = sensors_temperatures() temp_sensors = {} - for k, v in temp_sens.items(): - if k not in temp_sensors.keys(): - temp_sensors[k] = [] - match(k): + for s_type, sensors in psutil_temp_sensors.items(): + if s_type not in temp_sensors.keys(): + temp_sensors[s_type] = [] + match(s_type): case "nvme": - for i in v: - temp_sensors[k].append(TemperatureSensor( - sensor_type=k, - sensor_label=i.label, - current_temp=i.current, - highest_temp=i.high, - critical_temp=i.critical + for sensor in sensors: + temp_sensors[s_type].append(TemperatureSensor( + sensor_type=s_type, + sensor_label=sensor.label, + current_temp=sensor.current, + highest_temp=sensor.high, + critical_temp=sensor.critical )) case "amdgpu": - temp_sensors[k].append(TemperatureSensor( - sensor_type=k, + temp_sensors[s_type].append(TemperatureSensor( + sensor_type=s_type, sensor_label="Integrated GPU", - current_temp=v[0].current, + current_temp=sensors[0].current, )) case "k10temp": - temp_sensors[k].append(TemperatureSensor( - sensor_type=k, + temp_sensors[s_type].append(TemperatureSensor( + sensor_type=s_type, sensor_label="AMD CPU", - current_temp=v[0].current, + current_temp=sensors[0].current, critical_temp=95.0 # hardcoded because we have R9 7900X ))