X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=a0c1bf12987b526964e03a6a1cb62c1b4d0c4a4c;hp=3c12569a2aa261667687fdfb9ca12da9746ffbe0;hb=de97cece71fe4a5f64a88a807805608c7a289813;hpb=d39bafd9fb4cc0725786ab815bf7dd5fb03ef15e diff --git a/remoteglot.pl b/remoteglot.pl index 3c12569..a0c1bf1 100755 --- a/remoteglot.pl +++ b/remoteglot.pl @@ -15,12 +15,13 @@ use AnyEvent::HTTP; use Chess::PGN::Parse; use EV; use Net::Telnet; -use FileHandle; +use File::Slurp; use IPC::Open2; use Time::HiRes; use JSON::XS; use URI::Escape; -use Tie::Persistent; +use DBI; +use DBD::Pg; require 'Position.pm'; require 'Engine.pm'; require 'config.pm'; @@ -38,9 +39,12 @@ my %tb_cache = (); my $tb_lookup_running = 0; my $last_written_json = undef; -# Persisted so that we can restart. -tie my %clock_info_for_pos, 'Tie::Persistent', 'clock_info.db', 'rw'; -(tied %clock_info_for_pos)->autosync(1); # turn on write back on every modify +# Persisted so we can restart. +# TODO: Figure out an appropriate way to deal with database restarts +# and/or Postgres going away entirely. +my $dbh = DBI->connect($remoteglotconf::dbistr, $remoteglotconf::dbiuser, $remoteglotconf::dbipass) + or die DBI->errstr; +$dbh->{RaiseError} = 1; $| = 1; @@ -285,13 +289,19 @@ sub handle_pgn { my $pos = Position->start_pos($pgn->white, $pgn->black); my $moves = $pgn->moves; my @uci_moves = (); + my @repretty_moves = (); for my $move (@$moves) { - my $uci_move; - ($pos, $uci_move) = $pos->make_pretty_move($move); + my ($npos, $uci_move) = $pos->make_pretty_move($move); push @uci_moves, $uci_move; + + # Re-prettyprint the move. + my ($from_col, $from_row, $to_col, $to_row, $promo) = parse_uci_move($uci_move); + my ($pretty, undef) = $pos->{'board'}->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo); + push @repretty_moves, $pretty; + $pos = $npos; } $pos->{'result'} = $pgn->result; - $pos->{'pretty_history'} = $moves; + $pos->{'pretty_history'} = \@repretty_moves; extract_clock($pgn, $pos); @@ -478,10 +488,9 @@ sub parse_ids { my ($engine, @x) = @_; while (scalar @x > 0) { - if ($x[0] =~ /^(name|author)$/) { - my $key = shift @x; + if ($x[0] eq 'name') { my $value = join(' ', @x); - $engine->{'id'}{$key} = $value; + $engine->{'id'}{'author'} = $value; last; } @@ -734,9 +743,23 @@ sub output_json { my $json = {}; $json->{'position'} = $pos_calculating->to_json_hash(); - $json->{'id'} = $engine->{'id'}; + $json->{'engine'} = $engine->{'id'}; + if (defined($remoteglotconf::engine_url)) { + $json->{'engine'}{'url'} = $remoteglotconf::engine_url; + } + if (defined($remoteglotconf::engine_details)) { + $json->{'engine'}{'details'} = $remoteglotconf::engine_details; + } + if (defined($remoteglotconf::move_source)) { + $json->{'move_source'} = $remoteglotconf::move_source; + } + if (defined($remoteglotconf::move_source_url)) { + $json->{'move_source_url'} = $remoteglotconf::move_source_url; + } $json->{'score'} = long_score($info, $pos_calculating, ''); $json->{'short_score'} = short_score($info, $pos_calculating, ''); + $json->{'plot_score'} = plot_score($info, $pos_calculating, ''); + $json->{'using_lomonosov'} = defined($remoteglotconf::tb_serial_key); $json->{'nodes'} = $info->{'nodes'}; $json->{'nps'} = $info->{'nps'}; @@ -774,6 +797,80 @@ sub output_json { } $json->{'refutation_lines'} = \%refutation_lines; + # Piece together historic score information, to the degree we have it. + if (!$historic_json_only && exists($pos_calculating->{'pretty_history'})) { + my %score_history = (); + + my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?'); + my $pos = Position->start_pos('white', 'black'); + my $halfmove_num = 0; + for my $move (@{$pos_calculating->{'pretty_history'}}) { + my $id = id_for_pos($pos, $halfmove_num); + my $ref = $dbh->selectrow_hashref($q, undef, $id); + if (defined($ref)) { + $score_history{$halfmove_num} = [ + $ref->{'plot_score'}, + $ref->{'short_score'} + ]; + } + ++$halfmove_num; + ($pos) = $pos->make_pretty_move($move); + } + $q->finish; + + # If at any point we are missing 10 consecutive moves, + # truncate the history there. This is so we don't get into + # a situation where we e.g. start analyzing at move 45, + # but we have analysis for 1. e4 from some completely different game + # and thus show a huge hole. + my $consecutive_missing = 0; + my $truncate_until = 0; + for (my $i = $halfmove_num; $i --> 0; ) { + if ($consecutive_missing >= 10) { + delete $score_history{$i}; + next; + } + if (exists($score_history{$i})) { + $consecutive_missing = 0; + } else { + ++$consecutive_missing; + } + } + + $json->{'score_history'} = \%score_history; + } + + # Give out a list of other games going on. (Empty is fine.) + if (!$historic_json_only) { + my @games = (); + + my $q = $dbh->prepare('SELECT * FROM current_games ORDER BY priority DESC, id'); + $q->execute; + while (my $ref = $q->fetchrow_hashref) { + eval { + my $other_game_contents = File::Slurp::read_file($ref->{'json_path'}); + my $other_game_json = JSON::XS::decode_json($other_game_contents); + + die "Missing position" if (!exists($other_game_json->{'position'})); + my $white = $other_game_json->{'position'}{'player_w'} // die 'Missing white'; + my $black = $other_game_json->{'position'}{'player_b'} // die 'Missing black'; + + push @games, { + id => $ref->{'id'}, + name => "$white–$black", + url => $ref->{'url'} + }; + }; + if ($@) { + warn "Could not add external game " . $ref->{'json_path'} . ": $@"; + } + } + + if (scalar @games > 0) { + $json->{'games'} = \@games; + } + } + my $json_enc = JSON::XS->new; $json_enc->canonical(1); my $encoded = $json_enc->encode($json); @@ -785,20 +882,29 @@ sub output_json { if (exists($pos_calculating->{'pretty_history'}) && defined($remoteglotconf::json_history_dir)) { - my $filename = $remoteglotconf::json_history_dir . "/" . id_for_pos($pos_calculating) . ".json"; + my $id = id_for_pos($pos_calculating); + my $filename = $remoteglotconf::json_history_dir . "/" . $id . ".json"; # Overwrite old analysis (assuming it exists at all) if we're # using a different engine, or if we've calculated deeper. # nodes is used as a tiebreaker. Don't bother about Multi-PV # data; it's not that important. - my ($old_engine, $old_depth, $old_nodes) = get_json_analysis_stats($filename); + my ($old_engine, $old_depth, $old_nodes) = get_json_analysis_stats($id); my $new_depth = $json->{'depth'} // 0; my $new_nodes = $json->{'nodes'} // 0; if (!defined($old_engine) || - $old_engine ne $json->{'id'}{'name'} || + $old_engine ne $json->{'engine'}{'name'} || $new_depth > $old_depth || ($new_depth == $old_depth && $new_nodes >= $old_nodes)) { atomic_set_contents($filename, $encoded); + if (defined($json->{'plot_score'})) { + local $dbh->{AutoCommit} = 0; + $dbh->do('DELETE FROM scores WHERE id=?', undef, $id); + $dbh->do('INSERT INTO scores (id, plot_score, short_score, engine, depth, nodes) VALUES (?,?,?,?,?,?)', undef, + $id, $json->{'plot_score'}, $json->{'short_score'}, + $json->{'engine'}{'name'}, $new_depth, $new_nodes); + $dbh->commit; + } } } } @@ -814,33 +920,21 @@ sub atomic_set_contents { } sub id_for_pos { - my $pos = shift; + my ($pos, $halfmove_num) = @_; - my $halfmove_num = scalar @{$pos->{'pretty_history'}}; + $halfmove_num //= scalar @{$pos->{'pretty_history'}}; (my $fen = $pos->fen()) =~ tr,/ ,-_,; return "move$halfmove_num-$fen"; } sub get_json_analysis_stats { - my $filename = shift; - - my ($engine, $depth, $nodes); - - open my $fh, "<", $filename - or return undef; - local $/ = undef; - eval { - my $json = JSON::XS::decode_json(<$fh>); - $engine = $json->{'id'}{'name'} // die; - $depth = $json->{'depth'} // 0; - $nodes = $json->{'nodes'} // 0; - }; - close $fh; - if ($@) { - warn "Error in decoding $filename: $@"; - return undef; + my $id = shift; + my $ref = $dbh->selectrow_hashref('SELECT * FROM scores WHERE id=?', undef, $id); + if (defined($ref)) { + return ($ref->{'engine'}, $ref->{'depth'}, $ref->{'nodes'}); + } else { + return ('', 0, 0); } - return ($engine, $depth, $nodes); } sub uciprint { @@ -942,6 +1036,36 @@ sub long_score { return undef; } +# For graphs; a single number in centipawns, capped at +/- 500. +sub plot_score { + my ($info, $pos, $mpv) = @_; + + my $invert = ($pos->{'toplay'} eq 'B'); + if (defined($info->{'score_mate' . $mpv})) { + my $mate = $info->{'score_mate' . $mpv}; + if ($invert) { + $mate = -$mate; + } + if ($mate > 0) { + return 500; + } else { + return -500; + } + } else { + if (exists($info->{'score_cp' . $mpv})) { + my $score = $info->{'score_cp' . $mpv}; + if ($invert) { + $score = -$score; + } + $score = 500 if ($score > 500); + $score = -500 if ($score < -500); + return int($score); + } + } + + return undef; +} + my %book_cache = (); sub book_info { my ($fen, $board, $toplay) = @_; @@ -1062,13 +1186,14 @@ sub find_clock_start { } my $id = id_for_pos($pos); - if (exists($clock_info_for_pos{$id})) { - $pos->{'white_clock'} //= $clock_info_for_pos{$id}{'white_clock'}; - $pos->{'black_clock'} //= $clock_info_for_pos{$id}{'black_clock'}; + my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=?', undef, $id); + if (defined($clock_info)) { + $pos->{'white_clock'} //= $clock_info->{'white_clock'}; + $pos->{'black_clock'} //= $clock_info->{'black_clock'}; if ($pos->{'toplay'} eq 'W') { - $pos->{'white_clock_target'} = $clock_info_for_pos{$id}->{'white_clock_target'}; + $pos->{'white_clock_target'} = $clock_info->{'white_clock_target'}; } else { - $pos->{'black_clock_target'} = $clock_info_for_pos{$id}->{'black_clock_target'}; + $pos->{'black_clock_target'} = $clock_info->{'black_clock_target'}; } return; } @@ -1098,16 +1223,17 @@ sub find_clock_start { return; } my $time_left = $pos->{$key}; - my $clock_info = { - white_clock => $pos->{'white_clock'}, - black_clock => $pos->{'black_clock'} - }; + my ($white_clock_target, $black_clock_target); if ($pos->{'toplay'} eq 'W') { - $clock_info->{'white_clock_target'} = $pos->{'white_clock_target'} = time + $time_left; + $white_clock_target = $pos->{'white_clock_target'} = time + $time_left; } else { - $clock_info->{'black_clock_target'} = $pos->{'black_clock_target'} = time + $time_left; + $black_clock_target = $pos->{'black_clock_target'} = time + $time_left; } - $clock_info_for_pos{$id} = $clock_info; + local $dbh->{AutoCommit} = 0; + $dbh->do('DELETE FROM clock_info WHERE id=?', undef, $id); + $dbh->do('INSERT INTO clock_info (id, white_clock, black_clock, white_clock_target, black_clock_target) VALUES (?, ?, ?, ?, ?)', undef, + $id, $pos->{'white_clock'}, $pos->{'black_clock'}, $white_clock_target, $black_clock_target); + $dbh->commit; } sub schedule_tb_lookup {